Skip to content

Commit

Permalink
Rollup merge of rust-lang#55563 - GuillaumeGomez:doc-search-sentence,…
Browse files Browse the repository at this point in the history
… r=QuietMisdreavus

Improve no result found sentence in doc search

Fixes rust-lang#55531.

Look:

<img width="1440" alt="screenshot 2018-11-01 at 02 21 56" src="https://user-images.githubusercontent.com/3050060/47827257-f6236c80-dd7c-11e8-9ea9-99c8cb4b2de5.png">

r? @QuietMisdreavus
  • Loading branch information
kennytm authored Dec 4, 2018
2 parents 7ffd99e + c209ed8 commit 1bca455
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 3 deletions.
11 changes: 10 additions & 1 deletion src/librustdoc/html/static/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -1300,7 +1300,16 @@ if (!String.prototype.endsWith) {
output = '<div class="search-failed"' + extraStyle + '>No results :(<br/>' +
'Try on <a href="https://duckduckgo.com/?q=' +
encodeURIComponent('rust ' + query.query) +
'">DuckDuckGo</a>?</div>';
'">DuckDuckGo</a>?<br/><br/>' +
'Or try looking in one of these:<ul><li>The <a ' +
'href="https://doc.rust-lang.org/reference/index.html">Rust Reference</a> for' +
' technical details about the language.</li><li><a ' +
'href="https://doc.rust-lang.org/rust-by-example/index.html">Rust By Example' +
'</a> for expository code examples.</a></li><li>The <a ' +
'href="https://doc.rust-lang.org/book/index.html">Rust Book</a> for ' +
'introductions to language features and the language itself.</li><li><a ' +
'href="https://docs.rs">Docs.rs</a> for documentation of crates released on ' +
'<a href="https://crates.io/">crates.io</a>.</li></ul></div>';
}
return [output, length];
}
Expand Down
7 changes: 7 additions & 0 deletions src/librustdoc/html/static/rustdoc.css
Original file line number Diff line number Diff line change
Expand Up @@ -1132,6 +1132,13 @@ pre.rust {
margin-top: 20px;
}

.search-failed > ul {
text-align: left;
max-width: 570px;
margin-left: auto;
margin-right: auto;
}

#titles {
height: 35px;
}
Expand Down
2 changes: 1 addition & 1 deletion src/librustdoc/html/static/themes/dark.css
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ pre.ignore:hover, .information:hover + pre.ignore {
color: rgba(255,142,0,1);
}

.search-failed > a {
.search-failed a {
color: #0089ff;
}

Expand Down
2 changes: 1 addition & 1 deletion src/librustdoc/html/static/themes/light.css
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ pre.ignore:hover, .information:hover + pre.ignore {
color: rgba(255,142,0,1);
}

.search-failed > a {
.search-failed a {
color: #0089ff;
}

Expand Down

0 comments on commit 1bca455

Please sign in to comment.