Skip to content

rustdoc: combine common sidebar background color CSS rules #106194

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

Merged
merged 1 commit into from
Dec 28, 2022
Merged

rustdoc: combine common sidebar background color CSS rules #106194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 2 additions & 5 deletions src/librustdoc/html/static/css/rustdoc.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,10 +378,6 @@ img {
filter: var(--rust-logo-filter);
}

.sidebar, .mobile-topbar, .sidebar-menu-toggle {
background-color: var(--sidebar-background-color);
}

.sidebar {
font-size: 0.875rem;
flex: 0 0 200px;
Expand All @@ -400,7 +396,8 @@ img {
overflow-y: hidden;
}

.source .sidebar, #src-sidebar-toggle, #source-sidebar {
.sidebar, .mobile-topbar, .sidebar-menu-toggle,
#src-sidebar-toggle, #source-sidebar {
background-color: var(--sidebar-background-color);
}

Expand Down
47 changes: 46 additions & 1 deletion src/test/rustdoc-gui/sidebar-source-code.goml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,52 @@
// The goal of this test is to ensure that the sidebar is working as expected in the source
// code pages.
goto: "file://" + |DOC_PATH| + "/src/test_docs/lib.rs.html"
// First: desktop mode.
show-text: true

// First, check the sidebar colors.
define-function: (
"check-colors",
(theme, color, background_color),
[
("local-storage", {
"rustdoc-theme": |theme|,
"rustdoc-use-system-theme": "false",
}),
("reload"),
// Checking results colors.
("assert-css", (".source .sidebar", {
"color": |color|,
"background-color": |background_color|
}, ALL)),
],
)

call-function: (
"check-colors",
{
"theme": "ayu",
"color": "rgb(197, 197, 197)",
"background_color": "rgb(20, 25, 31)",
}
)
call-function: (
"check-colors",
{
"theme": "dark",
"color": "rgb(221, 221, 221)",
"background_color": "rgb(80, 80, 80)",
}
)
call-function: (
"check-colors",
{
"theme": "light",
"color": "rgb(0, 0, 0)",
"background_color": "rgb(245, 245, 245)",
}
)

// Next, desktop mode layout.
size: (1100, 800)
// We check that the sidebar isn't expanded and has the expected width.
assert-css: ("nav.sidebar", {"width": "50px"})
Expand Down
44 changes: 44 additions & 0 deletions src/test/rustdoc-gui/sidebar.goml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,50 @@
goto: "file://" + |DOC_PATH| + "/test_docs/index.html"
assert-property: (".sidebar", {"clientWidth": "200"})
show-text: true

// First, check the sidebar colors.
define-function: (
"check-colors",
(theme, color, background_color),
[
("local-storage", {
"rustdoc-theme": |theme|,
"rustdoc-use-system-theme": "false",
}),
("reload"),
// Checking results colors.
("assert-css", (".sidebar", {
"color": |color|,
"background-color": |background_color|
}, ALL)),
],
)

call-function: (
"check-colors",
{
"theme": "ayu",
"color": "rgb(197, 197, 197)",
"background_color": "rgb(20, 25, 31)",
}
)
call-function: (
"check-colors",
{
"theme": "dark",
"color": "rgb(221, 221, 221)",
"background_color": "rgb(80, 80, 80)",
}
)
call-function: (
"check-colors",
{
"theme": "light",
"color": "rgb(0, 0, 0)",
"background_color": "rgb(245, 245, 245)",
}
)

local-storage: {"rustdoc-theme": "light"}
// We reload the page so the local storage settings are being used.
reload:
Expand Down