Skip to content

Commit

Permalink
Rollup merge of #100804 - GuillaumeGomez:search-results-color-ayu, r=…
Browse files Browse the repository at this point in the history
  • Loading branch information
JohnTitor authored Aug 30, 2022
2 parents 02654a0 + f7cce2f commit 6826442
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 3 deletions.
7 changes: 4 additions & 3 deletions src/librustdoc/html/static/css/themes/ayu.css
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,13 @@ pre, .rustdoc.source .example-wrap {
}

.search-results a:hover {
background-color: #777;
color: #fff !important;
background-color: #3c3c3c;
}

.search-results a:focus {
color: #000 !important;
background-color: #c6afb3;
color: #fff !important;
background-color: #3c3c3c;
}
.search-results a {
color: #0096cf;
Expand Down
51 changes: 51 additions & 0 deletions src/test/rustdoc-gui/search-result-color.goml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,23 @@ assert-css: (
{"color": "rgb(120, 135, 151)"},
)

// Checking the `<a>` container.
assert-css: (
"//*[@class='result-name']/*[text()='test_docs::']/ancestor::a",
{"color": "rgb(0, 150, 207)", "background-color": "rgba(0, 0, 0, 0)"},
)

// Checking color and background on hover.
move-cursor-to: "//*[@class='desc']//*[text()='Just a normal struct.']"
assert-css: (
"//*[@class='result-name']/*[text()='test_docs::']",
{"color": "rgb(255, 255, 255)"},
)
assert-css: (
"//*[@class='result-name']/*[text()='test_docs::']/ancestor::a",
{"color": "rgb(255, 255, 255)", "background-color": "rgb(60, 60, 60)"},
)

// Dark theme
local-storage: {
"rustdoc-theme": "dark",
Expand All @@ -54,6 +71,23 @@ assert-css: (
{"color": "rgb(221, 221, 221)"},
)

// Checking the `<a>` container.
assert-css: (
"//*[@class='result-name']/*[text()='test_docs::']/ancestor::a",
{"color": "rgb(221, 221, 221)", "background-color": "rgba(0, 0, 0, 0)"},
)

// Checking color and background on hover.
move-cursor-to: "//*[@class='desc']//*[text()='Just a normal struct.']"
assert-css: (
"//*[@class='result-name']/*[text()='test_docs::']",
{"color": "rgb(221, 221, 221)"},
)
assert-css: (
"//*[@class='result-name']/*[text()='test_docs::']/ancestor::a",
{"color": "rgb(221, 221, 221)", "background-color": "rgb(119, 119, 119)"},
)

// Light theme
local-storage: {"rustdoc-theme": "light", "rustdoc-use-system-theme": "false"}
reload:
Expand All @@ -75,6 +109,23 @@ assert-css: (
{"color": "rgb(0, 0, 0)"},
)

// Checking the `<a>` container.
assert-css: (
"//*[@class='result-name']/*[text()='test_docs::']/ancestor::a",
{"color": "rgb(0, 0, 0)", "background-color": "rgba(0, 0, 0, 0)"},
)

// Checking color and background on hover.
move-cursor-to: "//*[@class='desc']//*[text()='Just a normal struct.']"
assert-css: (
"//*[@class='result-name']/*[text()='test_docs::']",
{"color": "rgb(0, 0, 0)"},
)
assert-css: (
"//*[@class='result-name']/*[text()='test_docs::']/ancestor::a",
{"color": "rgb(0, 0, 0)", "background-color": "rgb(221, 221, 221)"},
)

// Check the alias more specifically in the dark theme.
goto: file://|DOC_PATH|/test_docs/index.html
// We set the theme so we're sure that the correct values will be used, whatever the computer
Expand Down

0 comments on commit 6826442

Please sign in to comment.