Skip to content

Commit c1d0cce

Browse files
committed
Additional updates to dark theme: specificity changes and reorder for proper cascade
1 parent 2938c76 commit c1d0cce

File tree

1 file changed

+23
-21
lines changed

1 file changed

+23
-21
lines changed

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

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -29,60 +29,62 @@ $p5-dark-number: #b5b5b5;
2929
$p5-dark-selected: rgba(45, 123, 182, 25);
3030
$p5-dark-activeline: rgb(207, 207, 207);
3131

32+
$p5-dark-error: #df3a3d;
33+
3234
.cm-s-p5-dark {
3335
background-color: $p5-dark-black;
3436
color: $p5-dark-white;
3537
}
3638

37-
.cm-s-p5-dark .cm-comment {
39+
.cm-s-p5-dark span.cm-comment {
3840
color: $p5-dark-gray;
3941
}
4042

41-
.cm-s-p5-dark .cm-def {
43+
.cm-s-p5-dark span.cm-def {
4244
color: $p5-dark-lightblue;
4345
}
4446

45-
.cm-s-p5-dark .cm-string {
47+
.cm-s-p5-dark span.cm-string {
4648
color: $p5-dark-green;
4749
}
4850

49-
.cm-s-p5-dark .cm-string-2 {
51+
.cm-s-p5-dark span.cm-string-2 {
5052
color: $p5-dark-orange;
5153
}
5254

53-
.cm-s-p5-dark .cm-number {
55+
.cm-s-p5-dark span.cm-number {
5456
color: $p5-dark-white;
5557
}
5658

57-
.cm-s-p5-dark .cm-keyword {
59+
.cm-s-p5-dark span.cm-keyword {
5860
color: $p5-dark-goldbrown;
5961
}
6062

61-
.cm-s-p5-dark .cm-variable {
63+
.cm-s-p5-dark span.cm-variable {
6264
color: $p5-dark-lightblue;
6365
}
6466

65-
.cm-s-p5-dark .cm-variable-2 {
67+
.cm-s-p5-dark span.cm-variable-2 {
6668
color: $p5-dark-white;
6769
}
6870

69-
.cm-s-p5-dark .cm-property {
71+
.cm-s-p5-dark span.cm-property {
7072
color: $p5-dark-white;
7173
}
7274

73-
.cm-s-p5-dark .cm-atom {
75+
.cm-s-p5-dark span.cm-atom {
7476
color: $p5-dark-pink;
7577
}
7678

77-
.cm-s-p5-dark .cm-operator {
79+
.cm-s-p5-dark span.cm-operator {
7880
color: $p5-dark-white;
7981
}
8082

8183
.cm-s-p5-dark .cm-linenumber {
8284
color: $p5-dark-number;
8385
}
8486

85-
.cm-s-p5-dark .CodeMirror-selected {
87+
.cm-s-p5-dark div.CodeMirror-selected {
8688
background-color: $p5-dark-selected;
8789
}
8890

@@ -95,30 +97,30 @@ $p5-dark-activeline: rgb(207, 207, 207);
9597
border-right: 1px solid #949494;
9698
}
9799

98-
.cm-s-p5-dark .cm-error {
99-
color: #df3a3d;
100-
}
101-
102-
.cm-s-p5-dark .CodeMirror-matchingbracket {
100+
.cm-s-p5-dark span.CodeMirror-matchingbracket {
103101
outline: 1px solid $p5-dark-gray;
104102
outline-offset: 1px;
105103
color: $p5-dark-white !important;
106104
}
107105

108-
.cm-s-p5-dark .cm-qualifier {
106+
.cm-s-p5-dark span.cm-qualifier {
109107
color: $p5-dark-lightblue;
110108
}
111109

112-
.cm-s-p5-dark .cm-tag {
110+
.cm-s-p5-dark span.cm-tag {
113111
color: $p5-dark-pink;
114112
}
115113

116-
.cm-s-p5-dark .cm-builtin {
114+
.cm-s-p5-dark span.cm-error {
115+
color: $p5-dark-error;
116+
}
117+
118+
.cm-s-p5-dark span.cm-builtin {
117119
color: $p5-dark-lightblue;
118120
font-weight: bold;
119121
}
120122

121-
.cm-s-p5-dark .cm-attribute {
123+
.cm-s-p5-dark span.cm-attribute {
122124
color: $p5-dark-lightblue;
123125
}
124126

0 commit comments

Comments
 (0)