Rollup merge of #87085 - GuillaumeGomez:search-result-colors, r=notriddle

Search result colors

Part of  #87072 (fixes the first and fourth regressions and add tests to prevent it from happening again).

cc ````@Nemo157````

r? ````@camelid````
This commit is contained in:
Yuki Okushi 2021-07-14 09:35:22 +09:00 committed by GitHub
commit fc488d4165
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 46 additions and 4 deletions

View file

@ -161,7 +161,7 @@ pre, .rustdoc.source .example-wrap {
.search-results a {
color: #0096cf;
}
.search-results a span.desc {
.search-results a div.desc {
color: #c5c5c5;
}
@ -286,7 +286,7 @@ details.undocumented > summary::before {
color: grey;
}
tr.result span.primitive::after, tr.result span.keyword::after {
.result-name .primitive > i, .result-name .keyword > i {
color: #788797;
}

View file

@ -247,7 +247,7 @@ details.undocumented > summary::before {
color: grey;
}
tr.result span.primitive::after, tr.result span.keyword::after {
.result-name .primitive > i, .result-name .keyword > i {
color: #ddd;
}

View file

@ -237,7 +237,7 @@ details.undocumented > summary::before {
color: grey;
}
tr.result span.primitive::after, tr.result span.keyword::after {
.result-name .primitive > i, .result-name .keyword > i {
color: black;
}

View file

@ -0,0 +1,41 @@
// The goal of this test is to ensure the color of the text is the one expected.
goto: file://|DOC_PATH|/test_docs/index.html?search=coo
// This is needed so that the text color is computed.
show-text: true
// Ayu theme
local-storage: {"rustdoc-theme": "ayu", "rustdoc-preferred-dark-theme": "ayu", "rustdoc-use-system-theme": "false"}
reload:
// Waiting for the search results to appear...
wait-for: "#titles"
assert-css: ("//*[@class='desc']//*[text()='Just a normal struct.']", {"color": "rgb(197, 197, 197)"})
assert-css: ("//*[@class='result-name']/*[text()='test_docs::']", {"color": "rgb(0, 150, 207)"})
// Checking the color for "keyword".
assert-css: ("//*[@class='result-name']//*[text()='(keyword)']", {"color": "rgb(120, 135, 151)"})
// Dark theme
local-storage: {"rustdoc-theme": "dark", "rustdoc-preferred-dark-theme": "dark", "rustdoc-use-system-theme": "false"}
reload:
// Waiting for the search results to appear...
wait-for: "#titles"
assert-css: ("//*[@class='desc']//*[text()='Just a normal struct.']", {"color": "rgb(221, 221, 221)"})
assert-css: ("//*[@class='result-name']/*[text()='test_docs::']", {"color": "rgb(221, 221, 221)"})
// Checking the color for "keyword".
assert-css: ("//*[@class='result-name']//*[text()='(keyword)']", {"color": "rgb(221, 221, 221)"})
// Light theme
local-storage: {"rustdoc-theme": "light", "rustdoc-use-system-theme": "false"}
reload:
// Waiting for the search results to appear...
wait-for: "#titles"
assert-css: ("//*[@class='desc']//*[text()='Just a normal struct.']", {"color": "rgb(0, 0, 0)"})
assert-css: ("//*[@class='result-name']/*[text()='test_docs::']", {"color": "rgb(0, 0, 0)"})
// Checking the color for "keyword".
assert-css: ("//*[@class='result-name']//*[text()='(keyword)']", {"color": "rgb(0, 0, 0)"})

View file

@ -101,6 +101,7 @@ pub enum AnEnum {
}
#[doc(keyword = "CookieMonster")]
/// Some keyword.
pub mod keyword {}
/// Just some type alias.