Skip to content

Commit 2a7ee21

Browse files
committed
Use fewer colors in rustdoc UI
This reduces visual distractions when reading method signatures.
1 parent d2c24aa commit 2a7ee21

File tree

4 files changed

+56
-58
lines changed

4 files changed

+56
-58
lines changed

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

+9-9
Original file line numberDiff line numberDiff line change
@@ -167,28 +167,28 @@ pre, .rustdoc.source .example-wrap {
167167

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

170-
.content span.foreigntype, .content a.foreigntype { color: #ef57ff; }
171-
.content span.union, .content a.union { color: #98a01c; }
170+
.content span.foreigntype, .content a.foreigntype { color: #ffa0a5; }
171+
.content span.union, .content a.union { color: #ffa0a5; }
172172
.content span.constant, .content a.constant,
173-
.content span.static, .content a.static { color: #6380a0; }
174-
.content span.primitive, .content a.primitive { color: #32889b; }
175-
.content span.traitalias, .content a.traitalias { color: #57d399; }
176-
.content span.keyword, .content a.keyword { color: #de5249; }
173+
.content span.static, .content a.static { color: #39AFD7; }
174+
.content span.primitive, .content a.primitive { color: #ffa0a5; }
175+
.content span.traitalias, .content a.traitalias { color: #39AFD7; }
176+
.content span.keyword, .content a.keyword { color: #39AFD7; }
177177

178178
.content span.externcrate, .content span.mod, .content a.mod {
179-
color: #acccf9;
179+
color: #39AFD7;
180180
}
181181
.content span.struct, .content a.struct {
182182
color: #ffa0a5;
183183
}
184184
.content span.enum, .content a.enum {
185-
color: #99e0c9;
185+
color: #ffa0a5;
186186
}
187187
.content span.trait, .content a.trait {
188188
color: #39AFD7;
189189
}
190190
.content span.type, .content a.type {
191-
color: #cfbcf5;
191+
color: #e6e1cf;
192192
}
193193
.content span.fn, .content a.fn, .content span.method,
194194
.content a.method, .content span.tymethod,

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

+16-18
Original file line numberDiff line numberDiff line change
@@ -119,47 +119,45 @@ pre, .rustdoc.source .example-wrap {
119119
a.result-trait:focus { background-color: #013191; }
120120
a.result-traitalias:focus { background-color: #013191; }
121121
a.result-mod:focus,
122-
a.result-externcrate:focus { background-color: #afc6e4; }
123-
a.result-mod:focus { background-color: #803a1b; }
124-
a.result-externcrate:focus { background-color: #396bac; }
125-
a.result-enum:focus { background-color: #5b4e68; }
122+
a.result-externcrate:focus { background-color: #884719; }
123+
a.result-enum:focus { background-color: #194e9f; }
126124
a.result-struct:focus { background-color: #194e9f; }
127-
a.result-union:focus { background-color: #b7bd49; }
125+
a.result-union:focus { background-color: #194e9f; }
128126
a.result-fn:focus,
129127
a.result-method:focus,
130128
a.result-tymethod:focus { background-color: #4950ed; }
131-
a.result-type:focus { background-color: #38902c; }
132-
a.result-foreigntype:focus { background-color: #b200d6; }
129+
a.result-type:focus { background-color: #eee; }
130+
a.result-foreigntype:focus { background-color: #194e9f; }
133131
a.result-attr:focus,
134132
a.result-derive:focus,
135133
a.result-macro:focus { background-color: #217d1c; }
136134
a.result-constant:focus,
137-
a.result-static:focus { background-color: #0063cc; }
138-
a.result-primitive:focus { background-color: #00708a; }
135+
a.result-static:focus { background-color: #884719; }
136+
a.result-primitive:focus { background-color: #194e9f; }
139137
a.result-keyword:focus { background-color: #884719; }
140138

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

143-
.content span.enum, .content a.enum, .block a.current.enum { color: #82b089; }
141+
.content span.enum, .content a.enum, .block a.current.enum { color: #2dbfb8; }
144142
.content span.struct, .content a.struct, .block a.current.struct { color: #2dbfb8; }
145-
.content span.type, .content a.type, .block a.current.type { color: #ff7f00; }
146-
.content span.foreigntype, .content a.foreigntype, .block a.current.foreigntype { color: #dd7de8; }
143+
.content span.type, .content a.type, .block a.current.type { color: #ddd; }
144+
.content span.foreigntype, .content a.foreigntype, .block a.current.foreigntype { color: #2dbfb8; }
147145
.content span.attr, .content a.attr, .block a.current.attr,
148146
.content span.derive, .content a.derive, .block a.current.derive,
149147
.content span.macro, .content a.macro, .block a.current.macro { color: #09bd00; }
150-
.content span.union, .content a.union, .block a.current.union { color: #a6ae37; }
148+
.content span.union, .content a.union, .block a.current.union { color: #2dbfb8; }
151149
.content span.constant, .content a.constant, .block a.current.constant,
152-
.content span.static, .content a.static, .block a.current.static { color: #82a5c9; }
153-
.content span.primitive, .content a.primitive, .block a.current.primitive { color: #43aec7; }
150+
.content span.static, .content a.static, .block a.current.static { color: #D2991D; }
151+
.content span.primitive, .content a.primitive, .block a.current.primitive { color: #2dbfb8; }
154152
.content span.externcrate,
155-
.content span.mod, .content a.mod, .block a.current.mod { color: #bda000; }
153+
.content span.mod, .content a.mod, .block a.current.mod { color: #D2991D; }
156154
.content span.trait, .content a.trait, .block a.current.trait { color: #b78cf2; }
157-
.content span.traitalias, .content a.traitalias, .block a.current.traitalias { color: #b397da; }
155+
.content span.traitalias, .content a.traitalias, .block a.current.traitalias { color: #b78cf2; }
158156
.content span.fn, .content a.fn, .block a.current.fn,
159157
.content span.method, .content a.method, .block a.current.method,
160158
.content span.tymethod, .content a.tymethod, .block a.current.tymethod,
161159
.content .fnname{ color: #2BAB63; }
162-
.content span.keyword, .content a.keyword, .block a.current.keyword { color: #de5249; }
160+
.content span.keyword, .content a.keyword, .block a.current.keyword { color: #D2991D; }
163161

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

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

+30-30
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ h1, h2, h3, h4 {
99
color: black;
1010
}
1111
h1.fqn {
12-
border-bottom-color: #D5D5D5;
12+
border-bottom-color: #DDDDDD;
1313
}
1414
h2, h3, h4 {
1515
border-bottom-color: #DDDDDD;
@@ -31,7 +31,7 @@ pre, .rustdoc.source .example-wrap {
3131
}
3232

3333
.sidebar {
34-
background-color: #F1F1F1;
34+
background-color: #F5F5F5;
3535
}
3636

3737
/* Improve the scrollbar display on firefox */
@@ -90,7 +90,7 @@ pre, .rustdoc.source .example-wrap {
9090

9191
.line-numbers span { color: #c67e2d; }
9292
.line-numbers .line-highlighted {
93-
background-color: #f6fdb0 !important;
93+
background-color: #FDFFD3 !important;
9494
}
9595

9696
.docblock h1, .docblock h2, .docblock h3, .docblock h4, .docblock h5, .docblock h6 {
@@ -120,44 +120,44 @@ a.result-trait:focus { background-color: #c7b6ff; }
120120
a.result-traitalias:focus { background-color: #c7b6ff; }
121121
a.result-mod:focus,
122122
a.result-externcrate:focus { background-color: #afc6e4; }
123-
a.result-enum:focus { background-color: #b4d1b9; }
123+
a.result-enum:focus { background-color: #e7b1a0; }
124124
a.result-struct:focus { background-color: #e7b1a0; }
125-
a.result-union:focus { background-color: #b7bd49; }
125+
a.result-union:focus { background-color: #e7b1a0; }
126126
a.result-fn:focus,
127127
a.result-method:focus,
128128
a.result-tymethod:focus { background-color: #c6afb3; }
129-
a.result-type:focus { background-color: #ffc891; }
130-
a.result-foreigntype:focus { background-color: #f5c4ff; }
129+
a.result-type:focus { background-color: #ccc; }
130+
a.result-foreigntype:focus { background-color: #e7b1a0; }
131131
a.result-attr:focus,
132132
a.result-derive:focus,
133133
a.result-macro:focus { background-color: #8ce488; }
134134
a.result-constant:focus,
135-
a.result-static:focus { background-color: #c3e0ff; }
136-
a.result-primitive:focus { background-color: #9aecff; }
137-
a.result-keyword:focus { background-color: #f99650; }
135+
a.result-static:focus { background-color: #afc6e4; }
136+
a.result-primitive:focus { background-color: #e7b1a0; }
137+
a.result-keyword:focus { background-color: #afc6e4; }
138138

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

141-
.content span.enum, .content a.enum, .block a.current.enum { color: #508157; }
142-
.content span.struct, .content a.struct, .block a.current.struct { color: #ad448e; }
143-
.content span.type, .content a.type, .block a.current.type { color: #ba5d00; }
144-
.content span.foreigntype, .content a.foreigntype, .block a.current.foreigntype { color: #cd00e2; }
141+
.content span.enum, .content a.enum, .block a.current.enum { color: #AD378A; }
142+
.content span.struct, .content a.struct, .block a.current.struct { color: #AD378A; }
143+
.content span.type, .content a.type, .block a.current.type { color: black; }
144+
.content span.foreigntype, .content a.foreigntype, .block a.current.foreigntype { color: #AD378A; }
145145
.content span.attr, .content a.attr, .block a.current.attr,
146146
.content span.derive, .content a.derive, .block a.current.derive,
147147
.content span.macro, .content a.macro, .block a.current.macro { color: #068000; }
148-
.content span.union, .content a.union, .block a.current.union { color: #767b27; }
148+
.content span.union, .content a.union, .block a.current.union { color: #AD378A; }
149149
.content span.constant, .content a.constant, .block a.current.constant,
150-
.content span.static, .content a.static, .block a.current.static { color: #546e8a; }
151-
.content span.primitive, .content a.primitive, .block a.current.primitive { color: #2c8093; }
150+
.content span.static, .content a.static, .block a.current.static { color: #3873AD; }
151+
.content span.primitive, .content a.primitive, .block a.current.primitive { color: #AD378A; }
152152
.content span.externcrate,
153-
.content span.mod, .content a.mod, .block a.current.mod { color: #4d76ae; }
154-
.content span.trait, .content a.trait, .block a.current.trait { color: #7c5af3; }
155-
.content span.traitalias, .content a.traitalias, .block a.current.traitalias { color: #6841f1; }
153+
.content span.mod, .content a.mod, .block a.current.mod { color: #3873AD; }
154+
.content span.trait, .content a.trait, .block a.current.trait { color: #6E4FC9; }
155+
.content span.traitalias, .content a.traitalias, .block a.current.traitalias { color: #5137AD; }
156156
.content span.fn, .content a.fn, .block a.current.fn,
157157
.content span.method, .content a.method, .block a.current.method,
158158
.content span.tymethod, .content a.tymethod, .block a.current.tymethod,
159-
.content .fnname { color: #9a6e31; }
160-
.content span.keyword, .content a.keyword, .block a.current.keyword { color: #de5249; }
159+
.content .fnname { color: #AD7C37; }
160+
.content span.keyword, .content a.keyword, .block a.current.keyword { color: #3873AD; }
161161

162162
nav:not(.sidebar) {
163163
border-bottom-color: #e0e0e0;
@@ -268,7 +268,7 @@ pre.rust .question-mark {
268268
}
269269

270270
a.test-arrow {
271-
background-color: rgba(78, 139, 202, 0.2);
271+
background-color: rgb(78, 139, 202, 0.2);
272272
}
273273

274274
a.test-arrow:hover{
@@ -285,7 +285,7 @@ a.test-arrow:hover{
285285
}
286286

287287
:target {
288-
border-right: 3px solid #ffb44c;
288+
border-right: 3px solid #AD7C37;
289289
}
290290

291291
pre.compile_fail {
@@ -337,7 +337,7 @@ pre.ignore:hover, .information:hover + pre.ignore {
337337
}
338338

339339
.search-failed a {
340-
color: #0089ff;
340+
color: #3873AD;
341341
}
342342

343343
.tooltip::after {
@@ -374,18 +374,18 @@ pre.ignore:hover, .information:hover + pre.ignore {
374374

375375
@media (max-width: 700px) {
376376
.sidebar-menu {
377-
background-color: #F1F1F1;
377+
background-color: #F5F5F5;
378378
border-bottom-color: #e0e0e0;
379379
border-right-color: #e0e0e0;
380380
}
381381

382382
.sidebar-elems {
383-
background-color: #F1F1F1;
383+
background-color: #F5F5F5;
384384
border-right-color: #000;
385385
}
386386

387387
#sidebar-filler {
388-
background-color: #F1F1F1;
388+
background-color: #F5F5F5;
389389
border-bottom-color: #e0e0e0;
390390
}
391391
}
@@ -453,13 +453,13 @@ kbd {
453453
}
454454

455455
#sidebar-toggle {
456-
background-color: #F1F1F1;
456+
background-color: #F5F5F5;
457457
}
458458
#sidebar-toggle:hover {
459459
background-color: #E0E0E0;
460460
}
461461
#source-sidebar {
462-
background-color: #F1F1F1;
462+
background-color: #F5F5F5;
463463
}
464464
#source-sidebar > .title {
465465
border-bottom-color: #ccc;

src/test/rustdoc-gui/anchors.goml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ reload:
1111

1212
assert-css: ("#toggle-all-docs", {"color": "rgb(0, 0, 0)"})
1313
assert-css: (".fqn .in-band a:nth-of-type(1)", {"color": "rgb(0, 0, 0)"})
14-
assert-css: (".fqn .in-band a:nth-of-type(2)", {"color": "rgb(173, 68, 142)"})
14+
assert-css: (".fqn .in-band a:nth-of-type(2)", {"color": "rgb(173, 55, 138)"})
1515
assert-css: (".srclink", {"color": "rgb(0, 0, 0)"})
1616
assert-css: (".srclink", {"color": "rgb(0, 0, 0)"})
1717

0 commit comments

Comments
 (0)