diff options
| author | Samy Pesse <samypesse@gmail.com> | 2016-10-13 19:19:54 +0200 |
|---|---|---|
| committer | Samy Pesse <samypesse@gmail.com> | 2016-10-13 19:19:54 +0200 |
| commit | 4db57fe5c57555c30f318159ee0301828d7e3980 (patch) | |
| tree | c87dcca1bb976703aa497ce54f7b529502919c8d /packages | |
| parent | 2a78bcebababf70fb32b6a75469decf099a7cebd (diff) | |
| download | gitbook-4db57fe5c57555c30f318159ee0301828d7e3980.zip gitbook-4db57fe5c57555c30f318159ee0301828d7e3980.tar.gz gitbook-4db57fe5c57555c30f318159ee0301828d7e3980.tar.bz2 | |
Fix rendering of search
Diffstat (limited to 'packages')
4 files changed, 20 insertions, 13 deletions
diff --git a/packages/gitbook-core/src/components/InjectedComponent.js b/packages/gitbook-core/src/components/InjectedComponent.js index f02516c..216d83f 100644 --- a/packages/gitbook-core/src/components/InjectedComponent.js +++ b/packages/gitbook-core/src/components/InjectedComponent.js @@ -82,6 +82,8 @@ const InjectedComponent = React.createClass({ if (!children) { children = null; + } else { + children = React.Children.only(children); } return components.reduce((inner, Comp) => { diff --git a/packages/gitbook-plugin-search/package.json b/packages/gitbook-plugin-search/package.json index a57596a..3914a2a 100644 --- a/packages/gitbook-plugin-search/package.json +++ b/packages/gitbook-plugin-search/package.json @@ -8,7 +8,8 @@ "gitbook-core": "4.0.0" }, "devDependencies": { - "gitbook-plugin": "4.0.0" + "gitbook-plugin": "4.0.0", + "react-highlighter": "^0.3.3" }, "engines": { "gitbook": ">=3.0.0" @@ -26,4 +27,4 @@ "bugs": { "url": "https://github.com/GitbookIO/gitbook/issues" } -}
\ No newline at end of file +} diff --git a/packages/gitbook-plugin-search/src/components/Results.js b/packages/gitbook-plugin-search/src/components/Results.js index cccc501..647528a 100644 --- a/packages/gitbook-plugin-search/src/components/Results.js +++ b/packages/gitbook-plugin-search/src/components/Results.js @@ -10,12 +10,14 @@ const Result = React.createClass({ const { result } = this.props; return ( - <div className="Search-Result"> + <div className="Search-ResultContainer"> <GitBook.InjectedComponent matching={{ role: 'search:result' }} props={{ result }}> - <h3> - <GitBook.Link to={result.url}>{result.title}</GitBook.Link> - </h3> - <p>{result.body}</p> + <div className="Search-Result"> + <h3> + <GitBook.Link to={result.url}>{result.title}</GitBook.Link> + </h3> + <p>{result.body}</p> + </div> </GitBook.InjectedComponent> </div> ); @@ -40,11 +42,13 @@ const SearchResults = React.createClass({ return ( <div className="Search-ResultsContainer"> <GitBook.InjectedComponent matching={{ role: 'search:results' }} props={{ results, query }}> - <h1>{i18n.t('SEARCH_RESULTS_TITLE', { query, count: results.size })}</h1> <div className="Search-Results"> - {results.map((result, i) => { - return <Result key={i} result={result} />; - })} + <h1>{i18n.t('SEARCH_RESULTS_TITLE', { query, count: results.size })}</h1> + <div className="Search-Results"> + {results.map((result, i) => { + return <Result key={i} result={result} />; + })} + </div> </div> </GitBook.InjectedComponent> </div> diff --git a/packages/gitbook-plugin-theme-default/less/variables.less b/packages/gitbook-plugin-theme-default/less/variables.less index 56cfa48..7cd444e 100644 --- a/packages/gitbook-plugin-theme-default/less/variables.less +++ b/packages/gitbook-plugin-theme-default/less/variables.less @@ -29,8 +29,8 @@ // Button @button-padding: 19px; @button-background: transparent; -@button-color: #ddd; -@button-hover-color: #bbb; +@button-color: #bbb; +@button-hover-color: #a1a1a1; // Dropdown @dropdown-padding-v: 10px; @dropdown-padding-h: 15px; |