Skip to content

Commit ff95ae2

Browse files
authored
Merge pull request #723 from craftcms/a11y/more-color-contrast-updates
Color updates for code blocks (including dark mode colors)
2 parents 04097d2 + 41178c1 commit ff95ae2

File tree

6 files changed

+79
-8
lines changed

6 files changed

+79
-8
lines changed

docs/.vuepress/theme/components/ToggleSidebarGroup.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ export default {
8585
8686
.toggle {
8787
@apply text-xs tracking-wide uppercase font-bold;
88-
color: #a0aec0;
88+
color: var(--text-color-muted);
8989
}
9090
9191
.toggle-arrow {

docs/.vuepress/theme/styles/base.pcss

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
--medium-zoom-overlay-color: theme("colors.soft");
1010
--heading-color: theme("colors.slate");
1111
--link-color-default: theme("colors.blue.default");
12+
--code-link-color: theme("colors.blue.darker");
1213
--link-underline-color: #5E8BF7;
1314
--sidebar-link-color: theme("colors.slate");
1415
--sidebar-active-link-color: theme("colors.blue.default");
@@ -22,6 +23,15 @@
2223
--custom-block-bg-color: theme("colors.softer");
2324
--custom-block-border-color: theme("colors.soft");
2425
--craft-red: #e5422b;
26+
27+
/* Code */
28+
--code-color-default: #476582;
29+
--code-color-gold: #8A6700;
30+
--code-color-green: #1F7A74;
31+
--code-color-blue: #2075B1;
32+
--code-color-orange: #C14915;
33+
--code-color-olive: #667500;
34+
--code-color-gray: #6A707C;
2535
}
2636

2737
html {

docs/.vuepress/theme/styles/code.pcss

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
@apply py-1 px-2 m-0 rounded;
88
font-size: 0.8rem;
99
background-color: var(--code-bg-color);
10-
color: #476582;
10+
color: var(--code-color-default);
1111

1212
.token {
1313
&.deleted {
@@ -17,6 +17,50 @@
1717
&.inserted {
1818
color: #27ab83;
1919
}
20+
21+
&.comment,
22+
&.prolog,
23+
&.doctype,
24+
&.cdata {
25+
color: var(--code-color-gray);
26+
}
27+
28+
&.function,
29+
&.class-name {
30+
color: var(--code-color-gold);
31+
}
32+
33+
&.selector,
34+
&.attr-name,
35+
&.string,
36+
&.char,
37+
&.builtin,
38+
&.url,
39+
&.inserted {
40+
color: var(--code-color-green);
41+
}
42+
43+
&.property,
44+
&.tag,
45+
&.boolean,
46+
&.number,
47+
&.constant,
48+
&.symbol,
49+
&.deleted {
50+
color: var(--code-color-blue);
51+
}
52+
53+
&.regex,
54+
&.important,
55+
&.variable {
56+
color: var(--code-color-orange);
57+
}
58+
59+
&.atrule,
60+
&.attr-value,
61+
&.keyword {
62+
color: var(--code-color-olive);
63+
}
2064
}
2165
}
2266

docs/.vuepress/theme/styles/color-mode.pcss

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,16 @@
2727
--link-underline-color: var(--link-color-default);
2828
--sidebar-link-color: theme("colors.gray.400");
2929
--sidebar-active-link-color: var(--link-color-default);
30+
--code-link-color: theme("colors.blue.lighter");
31+
32+
/* Code */
33+
--code-color-default: #7F9CB8;
34+
--code-color-gold: #BD8E00;
35+
--code-color-green: #29A39B;
36+
--code-color-blue: #3093D9;
37+
--code-color-orange: #E96E3A;
38+
--code-color-olive: #778A00;
39+
--code-color-gray: #7C8F00;
3040
}
3141
}
3242

@@ -55,6 +65,16 @@
5565
--link-underline-color: var(--link-color-default);
5666
--sidebar-link-color: theme("colors.gray.400");
5767
--sidebar-active-link-color: var(--link-color-default);
68+
--code-link-color: theme("colors.blue.lighter");
69+
70+
/* Code */
71+
--code-color-default: #7F9CB8;
72+
--code-color-gold: #BD8E00;
73+
--code-color-green: #29A39B;
74+
--code-color-blue: #3093D9;
75+
--code-color-orange: #E96E3A;
76+
--code-color-olive: #778A00;
77+
--code-color-gray: #7C8F00;
5878

5979
.link-panel {
6080
background-color: var(--border-color);
@@ -160,7 +180,7 @@
160180

161181
kbd {
162182
background-color: rgba(0, 0, 0, 0.4);
163-
color: #476582;
183+
color: var(--code-color-default);
164184
border: 1px solid rgba(0, 0, 0, 0.3);
165185
border-bottom: 3px solid #111;
166186
}
@@ -184,10 +204,6 @@
184204
}
185205
}
186206

187-
.token.comment {
188-
@apply opacity-50;
189-
}
190-
191207
.token.treeview-part .line-h:before,
192208
.token.treeview-part .line-v:before {
193209
border-left: 1px solid var(--border-color);

docs/.vuepress/theme/styles/typography.pcss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@
212212
}
213213

214214
p a code {
215-
@apply font-normal text-blue;
215+
@apply font-normal;
216216
}
217217

218218
blockquote {

tailwind.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ module.exports = {
2020
blue: {
2121
"lighter": "#86A7F9",
2222
"default": "#2E68F5",
23+
"darker": "#1554F4",
2324
},
2425
red: "#da5a47",
2526
cinder: "#131119",

0 commit comments

Comments
 (0)