Skip to content

Commit 202ccc5

Browse files
GuillaumeGomezGuillaumeGomez
committed
Migrate highlight style to CSS variables
1 parent 0265a3e commit 202ccc5

File tree

4 files changed

+89
-54
lines changed

4 files changed

+89
-54
lines changed

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

+47-5
Original file line numberDiff line numberDiff line change
@@ -1096,8 +1096,55 @@ so that we can apply CSS-filters to change the arrow color in themes */
10961096
color: var(--right-side-color);
10971097
}
10981098

1099+
pre.rust {
1100+
tab-size: 4;
1101+
-moz-tab-size: 4;
1102+
}
1103+
1104+
/* Code highlighting */
1105+
pre.rust .kw {
1106+
color: var(--code-highlight-kw-color);
1107+
}
1108+
pre.rust .kw-2 {
1109+
color: var(--code-highlight-kw-2-color);
1110+
}
1111+
pre.rust .lifetime {
1112+
color: var(--code-highlight-lifetime-color);
1113+
}
1114+
pre.rust .prelude-ty {
1115+
color: var(--code-highlight-prelude-color);
1116+
}
1117+
pre.rust .prelude-val {
1118+
color: var(--code-highlight-prelude-val-color);
1119+
}
1120+
pre.rust .string {
1121+
color: var(--code-highlight-string-color);
1122+
}
1123+
pre.rust .number {
1124+
color: var(--code-highlight-number-color);
1125+
}
1126+
pre.rust .bool-val {
1127+
color: var(--code-highlight-literal-color);
1128+
}
1129+
pre.rust .self {
1130+
color: var(--code-highlight-self-color);
1131+
}
1132+
pre.rust .attribute {
1133+
color: var(--code-highlight-attribute-color);
1134+
}
1135+
pre.rust .macro,
1136+
pre.rust .macro-nonterminal {
1137+
color: var(--code-highlight-macro-color);
1138+
}
10991139
pre.rust .question-mark {
11001140
font-weight: bold;
1141+
color: var(--code-highlight-question-mark-color);
1142+
}
1143+
pre.rust .comment {
1144+
color: var(--code-highlight-comment-color);
1145+
}
1146+
pre.rust .doccomment {
1147+
color: var(--code-highlight-doc-comment-color);
11011148
}
11021149

11031150
.example-wrap.compile_fail,
@@ -1303,11 +1350,6 @@ h3.variant {
13031350
font-size: 1.25rem;
13041351
}
13051352

1306-
pre.rust {
1307-
tab-size: 4;
1308-
-moz-tab-size: 4;
1309-
}
1310-
13111353
.search-failed {
13121354
text-align: center;
13131355
margin-top: 20px;

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

+14-20
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,20 @@ Original by Dempfi (https://github.com/dempfi/ayu)
4141
--stab-background-color: #314559;
4242
--stab-code-color: #e6e1cf;
4343
--search-color: #fff;
44+
--code-highlight-kw-color: #ff7733;
45+
--code-highlight-kw-2-color: #ff7733;
46+
--code-highlight-lifetime-color: #ff7733;
47+
--code-highlight-prelude-color: #69f2df;
48+
--code-highlight-prelude-val-color: #ff7733;
49+
--code-highlight-number-color: #b8cc52;
50+
--code-highlight-string-color: #b8cc52;
51+
--code-highlight-literal-color: #ff7733;
52+
--code-highlight-attribute-color: #e6e1cf;
53+
--code-highlight-self-color: #36a3d9;
54+
--code-highlight-macro-color: #a37acc;
55+
--code-highlight-question-mark-color: #ff9011;
56+
--code-highlight-comment-color: #788797;
57+
--code-highlight-doc-comment-color: #a1ac88;
4458
}
4559

4660
.slider {
@@ -124,9 +138,6 @@ pre, .rustdoc.source .example-wrap {
124138

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

127-
pre.rust .comment { color: #788797; }
128-
pre.rust .doccomment { color: #a1ac88; }
129-
130141
.sidebar h2 a,
131142
.sidebar h3 a {
132143
color: white;
@@ -161,23 +172,6 @@ details.rustdoc-toggle > summary::before {
161172

162173
.src-line-numbers :target { background-color: transparent; }
163174

164-
/* Code highlighting */
165-
pre.rust .number, pre.rust .string { color: #b8cc52; }
166-
pre.rust .kw, pre.rust .kw-2, pre.rust .prelude-ty,
167-
pre.rust .bool-val, pre.rust .prelude-val,
168-
pre.rust .lifetime { color: #ff7733; }
169-
pre.rust .macro, pre.rust .macro-nonterminal { color: #a37acc; }
170-
pre.rust .question-mark {
171-
color: #ff9011;
172-
}
173-
pre.rust .self {
174-
color: #36a3d9;
175-
font-style: italic;
176-
}
177-
pre.rust .attribute {
178-
color: #e6e1cf;
179-
}
180-
181175
pre.example-line-numbers {
182176
color: #5c67736e;
183177
border: none;

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

+14-15
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,20 @@
3636
--stab-background-color: #314559;
3737
--stab-code-color: #e6e1cf;
3838
--search-color: #111;
39+
--code-highlight-kw-color: #ab8ac1;
40+
--code-highlight-kw-2-color: #769acb;
41+
--code-highlight-lifetime-color: #d97f26;
42+
--code-highlight-prelude-color: #769acb;
43+
--code-highlight-prelude-val-color: #ee6868;
44+
--code-highlight-number-color: #83a300;
45+
--code-highlight-string-color: #83a300;
46+
--code-highlight-literal-color: #ee6868;
47+
--code-highlight-attribute-color: #ee6868;
48+
--code-highlight-self-color: #ee6868;
49+
--code-highlight-macro-color: #3e999f;
50+
--code-highlight-question-mark-color: #ff9011;
51+
--code-highlight-comment-color: #8d8d8b;
52+
--code-highlight-doc-comment-color: #8ca375;
3953
}
4054

4155
.slider {
@@ -62,9 +76,6 @@ input:focus + .slider {
6276

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

65-
pre.rust .comment { color: #8d8d8b; }
66-
pre.rust .doccomment { color: #8ca375; }
67-
6879
body.source .example-wrap pre.rust a {
6980
background: #333;
7081
}
@@ -86,18 +97,6 @@ details.rustdoc-toggle > summary::before {
8697

8798
.src-line-numbers :target { background-color: transparent; }
8899

89-
/* Code highlighting */
90-
pre.rust .kw { color: #ab8ac1; }
91-
pre.rust .kw-2, pre.rust .prelude-ty { color: #769acb; }
92-
pre.rust .number, pre.rust .string { color: #83a300; }
93-
pre.rust .self, pre.rust .bool-val, pre.rust .prelude-val,
94-
pre.rust .attribute { color: #ee6868; }
95-
pre.rust .macro, pre.rust .macro-nonterminal { color: #3E999F; }
96-
pre.rust .lifetime { color: #d97f26; }
97-
pre.rust .question-mark {
98-
color: #ff9011;
99-
}
100-
101100
pre.example-line-numbers {
102101
border-color: #4a4949;
103102
}

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

+14-14
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,20 @@
3636
--stab-background-color: #fff5d6;
3737
--stab-code-color: #000;
3838
--search-color: #000;
39+
--code-highlight-kw-color: #8959a8;
40+
--code-highlight-kw-2-color: #4271ae;
41+
--code-highlight-lifetime-color: #b76514;
42+
--code-highlight-prelude-color: #4271ae;
43+
--code-highlight-prelude-val-color: #c82829;
44+
--code-highlight-number-color: #718c00;
45+
--code-highlight-string-color: #718c00;
46+
--code-highlight-literal-color: #c82829;
47+
--code-highlight-attribute-color: #c82829;
48+
--code-highlight-self-color: #c82829;
49+
--code-highlight-macro-color: #3e999f;
50+
--code-highlight-question-mark-color: #ff9011;
51+
--code-highlight-comment-color: #8e908c;
52+
--code-highlight-doc-comment-color: #4d4d4c;
3953
}
4054

4155
.slider {
@@ -78,20 +92,6 @@ body.source .example-wrap pre.rust a {
7892

7993
.src-line-numbers :target { background-color: transparent; }
8094

81-
/* Code highlighting */
82-
pre.rust .kw { color: #8959A8; }
83-
pre.rust .kw-2, pre.rust .prelude-ty { color: #4271AE; }
84-
pre.rust .number, pre.rust .string { color: #718C00; }
85-
pre.rust .self, pre.rust .bool-val, pre.rust .prelude-val,
86-
pre.rust .attribute { color: #C82829; }
87-
pre.rust .comment { color: #8E908C; }
88-
pre.rust .doccomment { color: #4D4D4C; }
89-
pre.rust .macro, pre.rust .macro-nonterminal { color: #3E999F; }
90-
pre.rust .lifetime { color: #B76514; }
91-
pre.rust .question-mark {
92-
color: #ff9011;
93-
}
94-
9595
pre.example-line-numbers {
9696
border-color: #c7c7c7;
9797
}

0 commit comments

Comments
 (0)