nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-28 02:57:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #98502 - GuillaumeGomez:source-sidebar-hover, r=notriddle

Browse Source 
Fix source sidebar hover in ayu theme

In the screenshot below, `rc.rs` should be orange:

![Screenshot from 2022-06-25 22-24-06](https://user-images.githubusercontent.com/3050060/175789532-99e8781d-2e62-43f7-bbd9-1b1151e1f8c1.png)

It's because the CSS selector was not precise enough and was "overloaded" with another one. This PR fixes it and adds a test for the colors in the source sidebar.

cc `@jsha`
r? `@notriddle`
This commit is contained in:
Yuki Okushi 2022-06-26 13:15:01 +09:00 committed by GitHub
commit d774bc39e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 105 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/librustdoc/html/static/css/themes/ayu.css
View File

@ -629,11 +629,11 @@ kbd {
color: #fff;
border-bottom-color: #5c6773;
}
div.files > a:hover, div.name:hover {
#source-sidebar div.files > a:hover, div.name:hover {
background-color: #14191f;
color: #ffb44c;
}
div.files > .selected {
#source-sidebar div.files > .selected {
background-color: #14191f;
color: #ffb44c;
}

4
src/librustdoc/html/static/css/themes/dark.css
View File

@ -499,10 +499,10 @@ kbd {
#source-sidebar > .title {
border-bottom-color: #ccc;
}
div.files > a:hover, div.name:hover {
#source-sidebar div.files > a:hover, div.name:hover {
background-color: #444;
}
div.files > .selected {
#source-sidebar div.files > .selected {
background-color: #333;
}

4
src/librustdoc/html/static/css/themes/light.css
View File

@ -483,10 +483,10 @@ kbd {
#source-sidebar > .title {
border-bottom-color: #ccc;
}
div.files > a:hover, div.name:hover {
#source-sidebar div.files > a:hover, div.name:hover {
background-color: #E0E0E0;
}
div.files > .selected {
#source-sidebar div.files > .selected {
background-color: #fff;
}

99
src/test/rustdoc-gui/sidebar-source-code-display.goml
View File

@ -17,3 +17,102 @@ assert-css: (".sidebar > *:not(#sidebar-toggle)", {"visibility": "hidden", "opac
click: "#sidebar-toggle"
// Because of the transition CSS, we check by using `wait-for-css` instead of `assert-css`.
wait-for-css: ("#sidebar-toggle", {"visibility": "visible", "opacity": 1})
// Now we check the display of the sidebar items.
show-text: true
// First we start with the light theme.
local-storage: {"rustdoc-theme": "light", "rustdoc-use-system-theme": "false"}
reload:
// Waiting for the sidebar to be displayed...
wait-for-css: ("#sidebar-toggle", {"visibility": "visible", "opacity": 1})
assert-css: (
"#source-sidebar .expand + .children a.selected",
{"color": "rgb(0, 0, 0)", "background-color": "rgb(255, 255, 255)"},
)
// Without hover.
assert-css: (
"#source-sidebar .expand + .children > .files a:not(.selected)",
{"color": "rgb(0, 0, 0)", "background-color": "rgba(0, 0, 0, 0)"},
)
// With hover.
move-cursor-to: "#source-sidebar .expand + .children > .files a:not(.selected)"
assert-css: (
"#source-sidebar .expand + .children > .files a:not(.selected)",
{"color": "rgb(0, 0, 0)", "background-color": "rgb(224, 224, 224)"},
)
// Without hover.
assert-css: (
"#source-sidebar .expand + .children .folders .name",
{"color": "rgb(0, 0, 0)", "background-color": "rgba(0, 0, 0, 0)"},
)
// With hover.
move-cursor-to: "#source-sidebar .expand + .children .folders .name"
assert-css: (
"#source-sidebar .expand + .children .folders .name",
{"color": "rgb(0, 0, 0)", "background-color": "rgb(224, 224, 224)"},
)
// Now with the dark theme.
local-storage: {"rustdoc-theme": "dark", "rustdoc-use-system-theme": "false"}
reload:
// Waiting for the sidebar to be displayed...
wait-for-css: ("#sidebar-toggle", {"visibility": "visible", "opacity": 1})
assert-css: (
"#source-sidebar .expand + .children a.selected",
{"color": "rgb(221, 221, 221)", "background-color": "rgb(51, 51, 51)"},
)
// Without hover.
assert-css: (
"#source-sidebar .expand + .children > .files a:not(.selected)",
{"color": "rgb(221, 221, 221)", "background-color": "rgba(0, 0, 0, 0)"},
)
// With hover.
move-cursor-to: "#source-sidebar .expand + .children > .files a:not(.selected)"
assert-css: (
"#source-sidebar .expand + .children > .files a:not(.selected)",
{"color": "rgb(221, 221, 221)", "background-color": "rgb(68, 68, 68)"},
)
// Without hover.
assert-css: (
"#source-sidebar .expand + .children .folders .name",
{"color": "rgb(221, 221, 221)", "background-color": "rgba(0, 0, 0, 0)"},
)
// With hover.
move-cursor-to: "#source-sidebar .expand + .children .folders .name"
assert-css: (
"#source-sidebar .expand + .children .folders .name",
{"color": "rgb(221, 221, 221)", "background-color": "rgb(68, 68, 68)"},
)
// And finally with the ayu theme.
local-storage: {"rustdoc-theme": "ayu", "rustdoc-use-system-theme": "false"}
reload:
// Waiting for the sidebar to be displayed...
wait-for-css: ("#sidebar-toggle", {"visibility": "visible", "opacity": 1})
assert-css: (
"#source-sidebar .expand + .children a.selected",
{"color": "rgb(255, 180, 76)", "background-color": "rgb(20, 25, 31)"},
)
// Without hover.
assert-css: (
"#source-sidebar .expand + .children > .files a:not(.selected)",
{"color": "rgb(197, 197, 197)", "background-color": "rgba(0, 0, 0, 0)"},
)
// With hover.
move-cursor-to: "#source-sidebar .expand + .children > .files a:not(.selected)"
assert-css: (
"#source-sidebar .expand + .children > .files a:not(.selected)",
{"color": "rgb(255, 180, 76)", "background-color": "rgb(20, 25, 31)"},
)
// Without hover.
assert-css: (
"#source-sidebar .expand + .children .folders .name",
{"color": "rgb(197, 197, 197)", "background-color": "rgba(0, 0, 0, 0)"},
)
// With hover.
move-cursor-to: "#source-sidebar .expand + .children .folders .name"
assert-css: (
"#source-sidebar .expand + .children .folders .name",
{"color": "rgb(255, 180, 76)", "background-color": "rgb(20, 25, 31)"},
)