diff options
author | Samy Pessé <samypesse@gmail.com> | 2017-01-06 17:15:30 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-06 17:15:30 +0100 |
commit | 7029c01806781f5ed74f175545ea154aa17cc6fd (patch) | |
tree | d87189690b5acc78acbd3d9688edc37b251541f3 /packages/gitbook-plugin-theme-default/src/components/Theme.js | |
parent | 11893255d1167382b16871d2ca831c90a40af57d (diff) | |
download | gitbook-7029c01806781f5ed74f175545ea154aa17cc6fd.zip gitbook-7029c01806781f5ed74f175545ea154aa17cc6fd.tar.gz gitbook-7029c01806781f5ed74f175545ea154aa17cc6fd.tar.bz2 |
Switch to markup-it for parsing (#1659)
* Start new parsers in gitbook itself
* Update markup-it
* Fix eslint errors
* Adapt basic parsing for summary
* Start tests for summaryFromDocument
* Continue
* Add parsing of glossary
* Add back languages parsing
* Adapt most tests for parsing
* Adapt all tests 🙌
* Adapt travis tests
* Bootstrap lerna before running tests
* Fix lowercase in require (linux)
* Fix command gitbook init
* Fix generation of ready by init command
* Fix generation of summary
* Fix watch after serve
* Add trademark to sidebar
* Add back favicon to default theme
* Open trademark in new tab
Diffstat (limited to 'packages/gitbook-plugin-theme-default/src/components/Theme.js')
-rw-r--r-- | packages/gitbook-plugin-theme-default/src/components/Theme.js | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/packages/gitbook-plugin-theme-default/src/components/Theme.js b/packages/gitbook-plugin-theme-default/src/components/Theme.js index b323fc4..884c862 100644 --- a/packages/gitbook-plugin-theme-default/src/components/Theme.js +++ b/packages/gitbook-plugin-theme-default/src/components/Theme.js @@ -8,6 +8,7 @@ const LoadingBar = require('./LoadingBar'); const Theme = React.createClass({ propTypes: { // State + file: GitBook.PropTypes.File, page: GitBook.PropTypes.Page, summary: GitBook.PropTypes.Summary, readme: GitBook.PropTypes.Readme, @@ -18,14 +19,18 @@ const Theme = React.createClass({ }, render() { - const { page, summary, children, sidebar, readme, history } = this.props; + const { file, page, summary, children, sidebar, readme, history } = this.props; return ( <GitBook.FlexLayout column className="GitBook book"> <LoadingBar show={history.loading} /> <GitBook.Head title={page.title} - titleTemplate="%s - GitBook" /> + titleTemplate="%s - GitBook" + link={[ + {rel: 'shortcut icon', href: file.relative('gitbook/theme-default/images/favicon.ico')} + ]} + /> <GitBook.ImportCSS href="gitbook/theme-default/theme.css" /> <GitBook.FlexBox> @@ -52,6 +57,6 @@ const Theme = React.createClass({ } }); -module.exports = GitBook.connect(Theme, ({page, summary, sidebar, readme, history}) => { - return { page, summary, sidebar, readme, history }; +module.exports = GitBook.connect(Theme, ({file, page, summary, sidebar, readme, history}) => { + return { file, page, summary, sidebar, readme, history }; }); |