Skip to content

Migrate sidebar links color to CSS variables and unify themes with ayu #102237

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 2 commits into from
Oct 1, 2022
Merged

Migrate sidebar links color to CSS variables and unify themes with ayu #102237

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98f05a0
* Migrate sidebar links color to new CSS theme handling
GuillaumeGomez Sep 24, 2022
461c316
Add GUI test for sidebar links color
GuillaumeGomez Sep 24, 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
Next Next commit
* Migrate sidebar links color to new CSS theme handling 
* Remove specific color handling for ".current" items in the sidebar.
  • Loading branch information
@GuillaumeGomez
GuillaumeGomez committed Sep 30, 2022
commit 98f05a0282625a5fda6e90ebf3b05a4bd7608f65
8 changes: 8 additions & 0 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 @@ -547,6 +547,14 @@ h2.location a {
margin: 0;
}

.sidebar a, .sidebar .current {
color: var(--sidebar-link-color);
}
.sidebar .current,
.sidebar a:hover {
background-color: var(--sidebar-current-link-background-color);
}

.sidebar-elems .block {
margin-bottom: 2em;
}
Expand Down
21 changes: 2 additions & 19 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 @@ -35,6 +35,8 @@ Original by Dempfi (https://github.com/dempfi/ayu)
--keyword-link-color: #39afd7;
--mod-link-color: #39afd7;
--link-color: #39afd7;
--sidebar-link-color: #53b1db;
--sidebar-current-link-background-color: transparent;
}

.slider {
Expand Down Expand Up @@ -85,7 +87,6 @@ pre, .rustdoc.source .example-wrap {

.sidebar .current,
.sidebar a:hover {
background-color: transparent;
color: #ffb44c;
}

Expand Down Expand Up @@ -119,9 +120,6 @@ pre, .rustdoc.source .example-wrap {

.content .item-info::before { color: #ccc; }

.sidebar a { color: #53b1db; }
.sidebar a.current.type { color: #53b1db; }

pre.rust .comment { color: #788797; }
pre.rust .doccomment { color: #a1ac88; }

Expand Down Expand Up @@ -284,21 +282,6 @@ a.result-static:focus {}
a.result-primitive:focus {}
a.result-keyword:focus {}

.sidebar a.current.enum {}
.sidebar a.current.struct {}
.sidebar a.current.foreigntype {}
.sidebar a.current.attr,
.sidebar a.current.derive,
.sidebar a.current.macro {}
.sidebar a.current.union {}
.sidebar a.current.constant
.sidebar a.current.static {}
.sidebar a.current.primitive {}
.sidebar a.current.trait {}
.sidebar a.current.traitalias {}
.sidebar a.current.fn {}
.sidebar a.current.keyword {}

kbd {
color: #c5c5c5;
background-color: #314559;
Expand Down
24 changes: 2 additions & 22 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 @@ -30,6 +30,8 @@
--keyword-link-color: #d2991d;
--mod-link-color: #d2991d;
--link-color: #d2991d;
--sidebar-link-color: #fdbf35;
--sidebar-current-link-background-color: #444;
}

.slider {
Expand All @@ -49,11 +51,6 @@ input:focus + .slider {
drop-shadow(0 -1px 0 #fff)
}

.sidebar .current,
.sidebar a:hover {
background: #444;
}

.src-line-numbers span { color: #3B91E2; }
.src-line-numbers .line-highlighted {
background-color: #0a042f !important;
Expand Down Expand Up @@ -91,23 +88,6 @@ a.result-keyword:focus { background-color: #884719; }

.content .item-info::before { color: #ccc; }

.sidebar a { color: #fdbf35; }
.sidebar a.current.enum { color: #12ece2; }
.sidebar a.current.struct { color: #12ece2; }
.sidebar a.current.type { color: #12ece2; }
.sidebar a.current.foreigntype { color: #12ece2; }
.sidebar a.current.attr,
.sidebar a.current.derive,
.sidebar a.current.macro { color: #0be900; }
.sidebar a.current.union { color: #12ece2; }
.sidebar a.current.constant
.sidebar a.current.static { color: #fdbf35; }
.sidebar a.current.primitive { color: #12ece2; }
.sidebar a.current.trait { color: #cca7ff; }
.sidebar a.current.traitalias { color: #cca7ff; }
.sidebar a.current.fn { color: #32d479; }
.sidebar a.current.keyword { color: #fdbf35; }

pre.rust .comment { color: #8d8d8b; }
pre.rust .doccomment { color: #8ca375; }

Expand Down
24 changes: 2 additions & 22 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 @@ -30,6 +30,8 @@
--keyword-link-color: #3873ad;
--mod-link-color: #3873ad;
--link-color: #3873ad;
--sidebar-link-color: #356da4;
--sidebar-current-link-background-color: #fff;
}

.slider {
Expand All @@ -48,11 +50,6 @@ input:focus + .slider {
*/
}

.sidebar .current,
.sidebar a:hover {
background-color: #fff;
}

.src-line-numbers span { color: #c67e2d; }
.src-line-numbers .line-highlighted {
background-color: #FDFFD3 !important;
Expand Down Expand Up @@ -90,23 +87,6 @@ a.result-keyword:focus { background-color: #afc6e4; }

.content .item-info::before { color: #ccc; }

.sidebar a { color: #356da4; }
.sidebar a.current.enum { color: #a63283; }
.sidebar a.current.struct { color: #a63283; }
.sidebar a.current.type { color: #a63283; }
.sidebar a.current.foreigntype { color: #356da4; }
.sidebar a.current.attr,
.sidebar a.current.derive,
.sidebar a.current.macro { color: #067901; }
.sidebar a.current.union { color: #a63283; }
.sidebar a.current.constant
.sidebar a.current.static { color: #356da4; }
.sidebar a.current.primitive { color: #a63283; }
.sidebar a.current.trait { color: #6849c3; }
.sidebar a.current.traitalias { color: #4b349e; }
.sidebar a.current.fn { color: #a67736; }
.sidebar a.current.keyword { color: #356da4; }

body.source .example-wrap pre.rust a {
background: #eee;
}
Expand Down