Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix missing renaming for #titles into #search-tabs #106153

Merged
merged 2 commits into from
Dec 26, 2022
Merged

Fix missing renaming for #titles into #search-tabs #106153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ade755d
Fix missing renaming for #titles into #search-tabs
GuillaumeGomez Dec 26, 2022
caa201f
Add GUI test for search tab headers
GuillaumeGomez Dec 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/librustdoc/html/static/css/themes/ayu.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,18 +162,18 @@ pre, .rustdoc.source .example-wrap {
color: #788797;
}

#titles > button.selected {
#search-tabs > button.selected {
background-color: #141920 !important;
border-bottom: 1px solid #ffb44c !important;
border-top: none;
}

#titles > button:not(.selected) {
#search-tabs > button:not(.selected) {
background-color: transparent !important;
border: none;
}

#titles > button:hover {
#search-tabs > button:hover {
border-bottom: 1px solid rgba(242, 151, 24, 0.3);
}

Expand All @@ -185,7 +185,7 @@ above the `@media (max-width: 700px)` rules due to a bug in the css checker */
/* see https://github.com/rust-lang/rust/pull/71237#issuecomment-618170143 */
pre.rust .lifetime {}
pre.rust .kw {}
#titles > button:hover, #titles > button.selected {}
#search-tabs > button:hover, #search-tabs > button.selected {}
pre.rust .self, pre.rust .bool-val, pre.rust .prelude-val, pre.rust .attribute {}
pre.rust .kw-2, pre.rust .prelude-ty {}

Expand Down
4 changes: 2 additions & 2 deletions src/librustdoc/html/static/css/themes/dark.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,12 @@
--scrape-example-toggle-line-hover-background: #c5c5c5;
}

#titles > button:not(.selected) {
#search-tabs > button:not(.selected) {
background-color: #252525;
border-top-color: #252525;
}

#titles > button:hover, #titles > button.selected {
#search-tabs > button:hover, #search-tabs > button.selected {
border-top-color: #0089ff;
background-color: #353535;
}
Expand Down
4 changes: 2 additions & 2 deletions src/librustdoc/html/static/css/themes/light.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,12 @@
--scrape-example-toggle-line-hover-background: #999;
}

#titles > button:not(.selected) {
#search-tabs > button:not(.selected) {
background-color: #e6e6e6;
border-top-color: #e6e6e6;
}

#titles > button:hover, #titles > button.selected {
#search-tabs > button:hover, #search-tabs > button.selected {
background-color: #ffffff;
border-top-color: #0089ff;
}
Expand Down
76 changes: 76 additions & 0 deletions src/test/rustdoc-gui/search-tab.goml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
// Checking the colors of the search tab headers.
goto: "file://" + |DOC_PATH| + "/test_docs/fn.foo.html?search=something"
show-text: true

define-function: (
"check-colors",
(theme, background, background_selected, background_hover, border_bottom,
border_bottom_selected, border_bottom_hover, border_top, border_top_selected,
border_top_hover),
[
// Setting the theme.
("local-storage", {"rustdoc-theme": |theme|, "rustdoc-use-system-theme": "false"}),
("reload"),

// These two commands are used to be sure the search will be run.
("focus", ".search-input"),
("press-key", "Enter"),

("wait-for", "#search-tabs"),
("assert-css", ("#search-tabs > button:not(.selected)", {
"background-color": |background|,
"border-bottom": |border_bottom|,
"border-top": |border_top|,
})),
("assert-css", ("#search-tabs > button.selected", {
"background-color": |background_selected|,
"border-bottom": |border_bottom_selected|,
"border-top": |border_top_selected|,
})),
("move-cursor-to", "#search-tabs > button:not(.selected)"),
("assert-css", ("#search-tabs > button:not(.selected):hover", {
"background-color": |background_hover|,
"border-bottom": |border_bottom_hover|,
"border-top": |border_top_hover|,
})),
// To prevent disrupting next run of this function.
("move-cursor-to", ".search-input"),
],
)

call-function: ("check-colors", {
"theme": "ayu",
"background": "rgba(0, 0, 0, 0)",
"background_selected": "rgb(20, 25, 32)",
"background_hover": "rgba(0, 0, 0, 0)",
"border_bottom": "0px none rgb(197, 197, 197)",
"border_bottom_selected": "1px solid rgb(255, 180, 76)",
"border_bottom_hover": "1px solid rgba(242, 151, 24, 0.3)",
"border_top": "0px none rgb(197, 197, 197)",
"border_top_selected": "0px none rgb(197, 197, 197)",
"border_top_hover": "0px none rgb(197, 197, 197)",
})
call-function: ("check-colors", {
"theme": "dark",
"background": "rgb(37, 37, 37)",
"background_selected": "rgb(53, 53, 53)",
"background_hover": "rgb(53, 53, 53)",
"border_bottom": "0px none rgb(221, 221, 221)",
"border_bottom_selected": "0px none rgb(221, 221, 221)",
"border_bottom_hover": "0px none rgb(221, 221, 221)",
"border_top": "2px solid rgb(37, 37, 37)",
"border_top_selected": "2px solid rgb(0, 137, 255)",
"border_top_hover": "2px solid rgb(0, 137, 255)",
})
call-function: ("check-colors", {
"theme": "light",
"background": "rgb(230, 230, 230)",
"background_selected": "rgb(255, 255, 255)",
"background_hover": "rgb(255, 255, 255)",
"border_bottom": "0px none rgb(0, 0, 0)",
"border_bottom_selected": "0px none rgb(0, 0, 0)",
"border_bottom_hover": "0px none rgb(0, 0, 0)",
"border_top": "2px solid rgb(230, 230, 230)",
"border_top_selected": "2px solid rgb(0, 137, 255)",
"border_top_hover": "2px solid rgb(0, 137, 255)",
})