Removes #content from sidebar links and from within pages (#170)

This commit is contained in:
Eric Nakagawa 2017-10-24 15:15:52 -07:00 committed by Joel Marcey
parent c2243a3c20
commit 867a49dd1c
3 changed files with 21 additions and 30 deletions

View file

@ -19,18 +19,14 @@ const BlogPageLayout = React.createClass({
if (page > 0) {
url += "page" + (page + 1) + "/";
}
return url + "#content";
return url;
},
render() {
const perPage = this.props.metadata.perPage;
const page = this.props.metadata.page;
return (
<Site
title="Blog"
language="en"
config={this.props.config}
>
<Site title="Blog" language="en" config={this.props.config}>
<div className="docMainWrapper wrapper">
<BlogSidebar
language={this.props.language}
@ -53,14 +49,16 @@ const BlogPageLayout = React.createClass({
);
})}
<div className="docs-prevnext">
{page > 0 &&
{page > 0 && (
<a className="docs-prev" href={this.getPageURL(page - 1)}>
Prev
</a>}
{MetadataBlog.length > (page + 1) * perPage &&
</a>
)}
{MetadataBlog.length > (page + 1) * perPage && (
<a className="docs-next" href={this.getPageURL(page + 1)}>
Next
</a>}
</a>
)}
</div>
</div>
</Container>

View file

@ -35,8 +35,7 @@ class DocsLayout extends React.Component {
}
description={content.trim().split("\n")[0]}
language={metadata.language}
version={metadata.version}
>
version={metadata.version}>
<div className="docMainWrapper wrapper">
<DocsSidebar metadata={metadata} />
<Container className="mainContainer">
@ -56,30 +55,30 @@ class DocsLayout extends React.Component {
language={metadata.language}
/>
<div className="docs-prevnext">
{metadata.previous_id &&
{metadata.previous_id && (
<a
className="docs-prev button"
href={metadata.previous_id + ".html#content"}
>
href={metadata.previous_id + ".html"}>
{" "}
{i18n
? translation[this.props.metadata.language][
"localized-strings"
]["previous"] || "Previous"
: "Previous"}
</a>}
{metadata.next_id &&
</a>
)}
{metadata.next_id && (
<a
className="docs-next button"
href={metadata.next_id + ".html#content"}
>
href={metadata.next_id + ".html"}>
{i18n
? translation[this.props.metadata.language][
"localized-strings"
]["next"] || "Next"
: "Next"}{" "}
</a>}
</a>
)}
</div>
</Container>
</div>

View file

@ -23,9 +23,7 @@ class SideNav extends React.Component {
</div>
<h2>
<i></i>
<span>
{this.props.current.category}
</span>
<span>{this.props.current.category}</span>
</h2>
</div>
<div className="navGroups">
@ -50,12 +48,8 @@ class SideNav extends React.Component {
renderCategory(category) {
return (
<div className="navGroup navGroupActive" key={category.name}>
<h3>
{this.getLocalizedCategoryString(category.name)}
</h3>
<ul>
{category.links.map(this.renderItemLink, this)}
</ul>
<h3>{this.getLocalizedCategoryString(category.name)}</h3>
<ul>{category.links.map(this.renderItemLink, this)}</ul>
</div>
);
}
@ -91,7 +85,7 @@ class SideNav extends React.Component {
if (metadata.permalink.match(/^https?:/)) {
return metadata.permalink;
}
return siteConfig.baseUrl + metadata.permalink + "#content";
return siteConfig.baseUrl + metadata.permalink;
}
if (metadata.path) {
return siteConfig.baseUrl + "blog/" + metadata.path;