Merge branch 'source' into fix-cli-options-formatting

This commit is contained in:
Oleg Proskurin 2017-05-16 22:01:27 +07:00 committed by GitHub
commit 3266c8b4a2
4 changed files with 17 additions and 13 deletions

View File

@ -1,5 +1,6 @@
import PropTypes from 'prop-types';
import React from 'react';
import { Link } from 'react-router';
import './style.css';
class Nav extends React.Component {
@ -13,7 +14,7 @@ class Nav extends React.Component {
return (
<li key={item.id}>
<a className={cssClass} href={url}>{item.title}</a>
<Link className={cssClass} to={url}>{item.title}</Link>
</li>
);
}

View File

@ -1,4 +1,5 @@
import React from 'react';
import { Link } from 'react-router';
import slackIcon from './images/slack-icon.png';
import githubIcon from './images/github-icon.png';
import './style.css';
@ -11,18 +12,18 @@ const Footer = () => (
<center>
Maintained by the
{' '}
<a href="/docs/react-storybook/basics/community/">
<Link to="/docs/react-storybook/basics/community/">
Storybook Community
</a>
</Link>
.
</center>
<center>
<a href="https://storybooks-slackin.herokuapp.com/" target="_blank">
<Link to="https://storybooks-slackin.herokuapp.com/" target="_blank">
<img src={slackIcon} alt="Storybook Slack" />
</a>
<a href="https://github.com/storybooks/storybook" target="_blank">
</Link>
<Link to="https://github.com/storybooks/storybook" target="_blank">
<img src={githubIcon} alt="Storybook GitHub" style={{ padding: '7px' }} />
</a>
</Link>
</center>
</div>
</div>

View File

@ -1,5 +1,6 @@
import PropTypes from 'prop-types';
import React from 'react';
import { Link } from 'react-router';
import './style.css';
import storybookLogo from '../../design/homepage/storybook-logo.png';
@ -16,9 +17,9 @@ class Header extends React.Component {
const className = currentSection === section.id ? 'selected' : '';
return (
<a className={className} key={section.href} href={section.href}>
<Link className={className} key={section.href} to={section.href}>
{section.caption}
</a>
</Link>
);
});
}
@ -34,9 +35,9 @@ class Header extends React.Component {
<div id="header" className="row">
<div className="col-xs-12">
<div id="header-title" className={titleClassname}>
<a href="/">
<Link to="/">
<img className="sb-title" src={storybookLogo} alt="Storybook Logo" />
</a>
</Link>
</div>
<div id="header-links" className="pull-right">
{this.renderSections()}

View File

@ -1,4 +1,5 @@
import React from 'react';
import { Link } from 'react-router';
import './style.css';
const MainLinks = () => (
@ -20,9 +21,9 @@ const MainLinks = () => (
<div className="col-xs-6 read-docs">
<h2>Read Docs</h2>
<center>
<a href="/docs/react-storybook/basics/introduction/">
<Link to="/docs/react-storybook/basics/introduction/">
<div className="docs-img" />
</a>
</Link>
</center>
</div>
</div>