Skip to content

Commit 0188ec6

Browse files
committed
Auto merge of #43558 - GuillaumeGomez:union-const-colors, r=QuietMisdreavus
Union const colors Fixes #43523 What do you think of these colors: <img width="1440" alt="screen shot 2017-07-30 at 15 10 57" src="https://user-images.githubusercontent.com/3050060/28753752-6b175a22-7539-11e7-978e-949f3a947d18.png"> ?
2 parents 2bb6d3d + 00b362e commit 0188ec6

File tree

2 files changed

+31
-23
lines changed

2 files changed

+31
-23
lines changed

src/librustdoc/html/static/rustdoc.css

-4
Original file line numberDiff line numberDiff line change
@@ -442,10 +442,6 @@ a {
442442
text-decoration: underline;
443443
}
444444

445-
.content span.enum, .content a.enum, .block a.current.enum { color: #5e9766; }
446-
.content span.struct, .content a.struct, .block a.current.struct { color: #df3600; }
447-
.content span.type, .content a.type, .block a.current.type { color: #e57300; }
448-
.content span.macro, .content a.macro, .block a.current.macro { color: #068000; }
449445
.block a.current.crate { font-weight: 500; }
450446

451447
.search-input {

src/librustdoc/html/static/styles/main.css

+31-19
Original file line numberDiff line numberDiff line change
@@ -64,21 +64,6 @@ pre {
6464
background-color: #f6fdb0 !important;
6565
}
6666

67-
:target { background: #FDFFD3; }
68-
.content .highlighted {
69-
color: #000 !important;
70-
background-color: #ccc;
71-
}
72-
.content .highlighted a, .content .highlighted span { color: #000 !important; }
73-
.content .highlighted.trait { background-color: #fece7e; }
74-
.content .highlighted.mod { background-color: #afc6e4; }
75-
.content .highlighted.enum { background-color: #b4d1b9; }
76-
.content .highlighted.struct { background-color: #e7b1a0; }
77-
.content .highlighted.fn { background-color: #c6afb3; }
78-
.content .highlighted.method { background-color: #c6afb3; }
79-
.content .highlighted.tymethod { background-color: #c6afb3; }
80-
.content .highlighted.type { background-color: #c6afb3; }
81-
8267
.docblock h1, .docblock h2, .docblock h3, .docblock h4, .docblock h5 {
8368
border-bottom-color: #DDD;
8469
}
@@ -97,13 +82,42 @@ pre {
9782
border-bottom-color: #ddd;
9883
}
9984

100-
.content span.primitive, .content a.primitive, .block a.current.primitive { color: #39a7bf; }
85+
:target { background: #FDFFD3; }
86+
.content .highlighted {
87+
color: #000 !important;
88+
background-color: #ccc;
89+
}
90+
.content .highlighted a, .content .highlighted span { color: #000 !important; }
91+
.content .highlighted.trait { background-color: #c7b6ff; }
92+
.content .highlighted.mod,
93+
.content .highlighted.externcrate { background-color: #afc6e4; }
94+
.content .highlighted.enum { background-color: #b4d1b9; }
95+
.content .highlighted.struct { background-color: #e7b1a0; }
96+
.content .highlighted.union { background-color: #b7bd49; }
97+
.content .highlighted.fn,
98+
.content .highlighted.method,
99+
.content .highlighted.tymethod { background-color: #c6afb3; }
100+
.content .highlighted.type { background-color: #ffc891; }
101+
.content .highlighted.macro { background-color: #8ce488; }
102+
.content .highlighted.constant,
103+
.content .highlighted.static { background-color: #c3e0ff; }
104+
.content .highlighted.primitive { background-color: #9aecff; }
105+
106+
.content span.enum, .content a.enum, .block a.current.enum { color: #508157; }
107+
.content span.struct, .content a.struct, .block a.current.struct { color: #df3600; }
108+
.content span.type, .content a.type, .block a.current.type { color: #ba5d00; }
109+
.content span.macro, .content a.macro, .block a.current.macro { color: #068000; }
110+
.content span.union, .content a.union, .block a.current.union { color: #767b27; }
111+
.content span.constant, .content a.constant, .block a.current.constant,
112+
.content span.static, .content a.static, .block a.current.static { color: #546e8a; }
113+
.content span.primitive, .content a.primitive, .block a.current.primitive { color: #2c8093; }
101114
.content span.externcrate,
102115
.content span.mod, .content a.mod, .block a.current.mod { color: #4d76ae; }
116+
.content span.trait, .content a.trait, .block a.current.trait { color: #7c5af3; }
103117
.content span.fn, .content a.fn, .block a.current.fn,
104118
.content span.method, .content a.method, .block a.current.method,
105119
.content span.tymethod, .content a.tymethod, .block a.current.tymethod,
106-
.content .fnname { color: #8c6067; }
120+
.content .fnname { color: #9a6e31; }
107121

108122
pre.rust .comment { color: #8E908C; }
109123
pre.rust .doccomment { color: #4D4D4C; }
@@ -130,8 +144,6 @@ a.test-arrow {
130144
color: #f5f5f5;
131145
}
132146

133-
.content span.trait, .content a.trait, .block a.current.trait { color: #7c5af3; }
134-
135147
.search-input {
136148
color: #555;
137149
box-shadow: 0 0 0 1px #e0e0e0, 0 0 0 2px transparent;

0 commit comments

Comments
 (0)