Skip to content

Commit 2aac741

Browse files
authored
Merge pull request #1360 from elit-altum/updating-theme
fix(contrast-theme): fixed failing WCAG-AAA checks
2 parents 01855f3 + 6088783 commit 2aac741

File tree

2 files changed

+25
-24
lines changed

2 files changed

+25
-24
lines changed

client/styles/abstracts/_variables.scss

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ $dodgerblue: #1E90FF;
1212
$icon-color: #8b8b8b;
1313
$icon-hover-color: #333;
1414
$p5-contrast-pink: #FFA9D9;
15+
$p5-contrast-lightgray: #f0f0f0;
1516

1617
// Grays
1718
$dark: #333;
@@ -186,29 +187,29 @@ $themes: (
186187
modal-button-color: #333,
187188
heading-text-color: #e1e1e1,
188189
secondary-text-color: #e1e1e1,
189-
inactive-text-color: #c1c1c1,
190+
inactive-text-color: $p5-contrast-lightgray,
190191
background-color: #333,
191192
button-background-color: $white,
192193
button-color: $black,
193194
button-border-color: #979797,
194195
toolbar-button-color: #333333,
195-
toolbar-button-background-color: #C1C1C1,
196+
toolbar-button-background-color: $p5-contrast-lightgray,
196197
button-background-hover-color: $yellow,
197198
button-background-active-color: $yellow,
198199
button-nav-inactive-color: #a0a0a0,
199200
button-hover-color: #333333,
200201
button-active-color: #333333,
201202
modal-background-color: #444,
202-
modal-button-background-color: #C1C1C1,
203+
modal-button-background-color: $p5-contrast-lightgray,
203204
modal-border-color: #949494,
204-
icon-color: #a9a9a9,
205+
icon-color: #d9d9d9,
205206
icon-hover-color: $yellow,
206207
icon-toast-hover-color: $yellow,
207208
shadow-color: rgba(0, 0, 0, 0.16),
208209
console-background-color: #4f4f4f,
209210
console-color: $black,
210211
console-header-background-color: #3f3f3f,
211-
console-header-color: #b5b5b5,
212+
console-header-color: #d9d9d9,
212213
console-info-background-color: $lightsteelblue,
213214
console-warn-background-color: $orange,
214215
console-debug-background-color: $dodgerblue,
@@ -235,7 +236,7 @@ $themes: (
235236
primary-button-background-color: $p5js-pink,
236237

237238
table-button-color: #333,
238-
table-button-background-color: #C1C1C1,
239+
table-button-background-color: $p5-contrast-lightgray,
239240
table-button-active-color: #333,
240241
table-button-background-active-color: #00FFFF,
241242
table-button-hover-color: #333,

client/styles/components/_p5-contrast-codemirror-theme.scss

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ $p5-contrast-black: #333;
1414
$p5-contrast-gray: #A0A0A0;
1515
$p5-contrast-white: #FDFDFD;
1616
$p5-contrast-darkgray: #333333;
17-
$p5-contrast-lightgray: #C1C1C1;
17+
$p5-contrast-lightgray: #f2f2f2;
1818
$p5-contrast-blue: #00FFFF;
1919
$p5-contrast-green: #2DE9B6;
2020
$p5-contrast-yellow: #F5DC23;
@@ -31,55 +31,55 @@ $p5-contrast-activeline: #999999;
3131
color: $p5-contrast-white;
3232
}
3333

34-
.cm-s-p5-contrast .cm-comment {
34+
.cm-s-p5-contrast span .cm-comment {
3535
color: $p5-contrast-lightgray;
3636
}
3737

38-
.cm-s-p5-contrast .cm-def {
38+
.cm-s-p5-contrast span .cm-def {
3939
color: $p5-contrast-blue;
4040
}
4141

42-
.cm-s-p5-contrast .cm-string {
42+
.cm-s-p5-contrast span .cm-string {
4343
color: $p5-contrast-green;
4444
}
4545

46-
.cm-s-p5-contrast .cm-string-2 {
46+
.cm-s-p5-contrast span .cm-string-2 {
4747
color: $p5-contrast-green;
4848
}
4949

50-
.cm-s-p5-contrast .cm-number {
50+
.cm-s-p5-contrast span .cm-number {
5151
color: $p5-contrast-pink;
5252
}
5353

54-
.cm-s-p5-contrast .cm-keyword {
54+
.cm-s-p5-contrast span .cm-keyword {
5555
color: $p5-contrast-yellow;
5656
}
5757

58-
.cm-s-p5-contrast .cm-variable {
58+
.cm-s-p5-contrast span .cm-variable {
5959
color: $p5-contrast-white;
6060
}
6161

62-
.cm-s-p5-contrast .cm-variable-2 {
62+
.cm-s-p5-contrast span .cm-variable-2 {
6363
color: $p5-contrast-white;
6464
}
6565

66-
.cm-s-p5-contrast .cm-property {
66+
.cm-s-p5-contrast span .cm-property {
6767
color: $p5-contrast-white;
6868
}
6969

70-
.cm-s-p5-contrast .cm-atom {
70+
.cm-s-p5-contrast span .cm-atom {
7171
color: $p5-contrast-pink;
7272
}
7373

74-
.cm-s-p5-contrast .cm-operator {
74+
.cm-s-p5-contrast span .cm-operator {
7575
color: $p5-contrast-lightgray;
7676
}
7777

7878
.cm-s-p5-contrast .cm-linenumber {
7979
color: $p5-contrast-number;
8080
}
8181

82-
.cm-s-p5-contrast .CodeMirror-selected {
82+
.cm-s-p5-contrast div .CodeMirror-selected {
8383
background-color: $p5-contrast-selected;
8484
}
8585

@@ -96,25 +96,25 @@ $p5-contrast-activeline: #999999;
9696
color: #f00;
9797
}
9898

99-
.cm-s-p5-contrast .CodeMirror-matchingbracket {
99+
.cm-s-p5-contrast span.CodeMirror-matchingbracket {
100100
outline: 1px solid $p5-contrast-lightgray;
101101
outline-offset: 1px;
102102
color: $p5-contrast-white !important;
103103
}
104104

105-
.cm-s-p5-contrast .cm-qualifier {
105+
.cm-s-p5-contrast span .cm-qualifier {
106106
color: $p5-contrast-yellow;
107107
}
108108

109-
.cm-s-p5-contrast .cm-tag {
109+
.cm-s-p5-contrast span .cm-tag {
110110
color: $p5-contrast-orange;
111111
}
112112

113-
.cm-s-p5-contrast .cm-builtin {
113+
.cm-s-p5-contrast span.cm-builtin {
114114
color: $p5-contrast-yellow;
115115
}
116116

117-
.cm-s-p5-contrast .cm-attribute {
117+
.cm-s-p5-contrast span .cm-attribute {
118118
color: $p5-contrast-white;
119119
}
120120

0 commit comments

Comments
 (0)