Rollup merge of rust-lang#55563 - GuillaumeGomez:doc-search-sentence, r=QuietMisdreavus

GuillaumeGomez · web-flow · commit 822127513957 · 2018-12-05T11:17:57.000+01:00
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
diff --git a/src/librustdoc/html/static/main.js b/src/librustdoc/html/static/main.js
@@ -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];
         }
diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css
@@ -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;
 }
diff --git a/src/librustdoc/html/static/themes/dark.css b/src/librustdoc/html/static/themes/dark.css
@@ -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;
 }
 
diff --git a/src/librustdoc/html/static/themes/light.css b/src/librustdoc/html/static/themes/light.css
@@ -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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1132,6 +1132,13 @@ pre.rust {`
`1132`	`1132`	`margin-top: 20px;`
`1133`	`1133`	`}`
`1134`	`1134`
	`1135`	`+.search-failed > ul {`
	`1136`	`+ text-align: left;`
	`1137`	`+ max-width: 570px;`
	`1138`	`+ margin-left: auto;`
	`1139`	`+ margin-right: auto;`
	`1140`	`+}`
	`1141`	`+`
`1135`	`1142`	`#titles {`
`1136`	`1143`	`height: 35px;`
`1137`	`1144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,7 @@ pre.ignore:hover, .information:hover + pre.ignore {`
`285`	`285`	`color: rgba(255,142,0,1);`
`286`	`286`	`}`
`287`	`287`
`288`		`-.search-failed > a {`
	`288`	`+.search-failed a {`
`289`	`289`	`color: #0089ff;`
`290`	`290`	`}`
`291`	`291`
Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ pre.ignore:hover, .information:hover + pre.ignore {`
`279`	`279`	`color: rgba(255,142,0,1);`
`280`	`280`	`}`
`281`	`281`
`282`		`-.search-failed > a {`
	`282`	`+.search-failed a {`
`283`	`283`	`color: #0089ff;`
`284`	`284`	`}`
`285`	`285`