Skip to content

Commit 98f05a0

Browse files
committedSep 30, 2022
* Migrate sidebar links color to new CSS theme handling
* Remove specific color handling for ".current" items in the sidebar.
1 parent 4a0ee3c commit 98f05a0

File tree

4 files changed

+14
-63
lines changed

4 files changed

+14
-63
lines changed
 

‎src/librustdoc/html/static/css/rustdoc.css

+8
Original file line numberDiff line numberDiff line change
@@ -547,6 +547,14 @@ h2.location a {
547547
margin: 0;
548548
}
549549

550+
.sidebar a, .sidebar .current {
551+
color: var(--sidebar-link-color);
552+
}
553+
.sidebar .current,
554+
.sidebar a:hover {
555+
background-color: var(--sidebar-current-link-background-color);
556+
}
557+
550558
.sidebar-elems .block {
551559
margin-bottom: 2em;
552560
}

‎src/librustdoc/html/static/css/themes/ayu.css

+2-19
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ Original by Dempfi (https://github.com/dempfi/ayu)
3535
--keyword-link-color: #39afd7;
3636
--mod-link-color: #39afd7;
3737
--link-color: #39afd7;
38+
--sidebar-link-color: #53b1db;
39+
--sidebar-current-link-background-color: transparent;
3840
}
3941

4042
.slider {
@@ -85,7 +87,6 @@ pre, .rustdoc.source .example-wrap {
8587

8688
.sidebar .current,
8789
.sidebar a:hover {
88-
background-color: transparent;
8990
color: #ffb44c;
9091
}
9192

@@ -119,9 +120,6 @@ pre, .rustdoc.source .example-wrap {
119120

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

122-
.sidebar a { color: #53b1db; }
123-
.sidebar a.current.type { color: #53b1db; }
124-
125123
pre.rust .comment { color: #788797; }
126124
pre.rust .doccomment { color: #a1ac88; }
127125

@@ -284,21 +282,6 @@ a.result-static:focus {}
284282
a.result-primitive:focus {}
285283
a.result-keyword:focus {}
286284

287-
.sidebar a.current.enum {}
288-
.sidebar a.current.struct {}
289-
.sidebar a.current.foreigntype {}
290-
.sidebar a.current.attr,
291-
.sidebar a.current.derive,
292-
.sidebar a.current.macro {}
293-
.sidebar a.current.union {}
294-
.sidebar a.current.constant
295-
.sidebar a.current.static {}
296-
.sidebar a.current.primitive {}
297-
.sidebar a.current.trait {}
298-
.sidebar a.current.traitalias {}
299-
.sidebar a.current.fn {}
300-
.sidebar a.current.keyword {}
301-
302285
kbd {
303286
color: #c5c5c5;
304287
background-color: #314559;

‎src/librustdoc/html/static/css/themes/dark.css

+2-22
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
--keyword-link-color: #d2991d;
3131
--mod-link-color: #d2991d;
3232
--link-color: #d2991d;
33+
--sidebar-link-color: #fdbf35;
34+
--sidebar-current-link-background-color: #444;
3335
}
3436

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

52-
.sidebar .current,
53-
.sidebar a:hover {
54-
background: #444;
55-
}
56-
5754
.src-line-numbers span { color: #3B91E2; }
5855
.src-line-numbers .line-highlighted {
5956
background-color: #0a042f !important;
@@ -91,23 +88,6 @@ a.result-keyword:focus { background-color: #884719; }
9188

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

94-
.sidebar a { color: #fdbf35; }
95-
.sidebar a.current.enum { color: #12ece2; }
96-
.sidebar a.current.struct { color: #12ece2; }
97-
.sidebar a.current.type { color: #12ece2; }
98-
.sidebar a.current.foreigntype { color: #12ece2; }
99-
.sidebar a.current.attr,
100-
.sidebar a.current.derive,
101-
.sidebar a.current.macro { color: #0be900; }
102-
.sidebar a.current.union { color: #12ece2; }
103-
.sidebar a.current.constant
104-
.sidebar a.current.static { color: #fdbf35; }
105-
.sidebar a.current.primitive { color: #12ece2; }
106-
.sidebar a.current.trait { color: #cca7ff; }
107-
.sidebar a.current.traitalias { color: #cca7ff; }
108-
.sidebar a.current.fn { color: #32d479; }
109-
.sidebar a.current.keyword { color: #fdbf35; }
110-
11191
pre.rust .comment { color: #8d8d8b; }
11292
pre.rust .doccomment { color: #8ca375; }
11393

‎src/librustdoc/html/static/css/themes/light.css

+2-22
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
--keyword-link-color: #3873ad;
3131
--mod-link-color: #3873ad;
3232
--link-color: #3873ad;
33+
--sidebar-link-color: #356da4;
34+
--sidebar-current-link-background-color: #fff;
3335
}
3436

3537
.slider {
@@ -48,11 +50,6 @@ input:focus + .slider {
4850
*/
4951
}
5052

51-
.sidebar .current,
52-
.sidebar a:hover {
53-
background-color: #fff;
54-
}
55-
5653
.src-line-numbers span { color: #c67e2d; }
5754
.src-line-numbers .line-highlighted {
5855
background-color: #FDFFD3 !important;
@@ -90,23 +87,6 @@ a.result-keyword:focus { background-color: #afc6e4; }
9087

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

93-
.sidebar a { color: #356da4; }
94-
.sidebar a.current.enum { color: #a63283; }
95-
.sidebar a.current.struct { color: #a63283; }
96-
.sidebar a.current.type { color: #a63283; }
97-
.sidebar a.current.foreigntype { color: #356da4; }
98-
.sidebar a.current.attr,
99-
.sidebar a.current.derive,
100-
.sidebar a.current.macro { color: #067901; }
101-
.sidebar a.current.union { color: #a63283; }
102-
.sidebar a.current.constant
103-
.sidebar a.current.static { color: #356da4; }
104-
.sidebar a.current.primitive { color: #a63283; }
105-
.sidebar a.current.trait { color: #6849c3; }
106-
.sidebar a.current.traitalias { color: #4b349e; }
107-
.sidebar a.current.fn { color: #a67736; }
108-
.sidebar a.current.keyword { color: #356da4; }
109-
11090
body.source .example-wrap pre.rust a {
11191
background: #eee;
11292
}

0 commit comments

Comments
 (0)
Please sign in to comment.