Skip to content

Commit 9e3f45c

Browse files
author
Yosevu Kilonzo
committed
fix: update windows high contrast colors
1 parent 055318e commit 9e3f45c

File tree

1 file changed

+14
-20
lines changed

1 file changed

+14
-20
lines changed

components/swatch/index.css

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ governing permissions and limitations under the License.
3030
--spectrum-swatch-focus-ring-thickness: var(--spectrum-focus-ring-thickness);
3131
--spectrum-swatch-focus-ring-gap: var(--spectrum-focus-ring-gap);
3232

33+
/* Color */
3334
--spectrum-swatch-border-color: var(--spectrum-swatch-border-color);
34-
/* --spectrum-swatch-border-color-selected: var(--spectrum-gray-900); */
3535
--spectrum-swatch-inner-border-color-selected: var(--spectrum-gray-50);
3636
--spectrum-swatch-disabled-icon-border-color: var(--spectrum-swatch-disabled-icon-border-color);
3737
--spectrum-swatch-disabled-icon-color: var(--spectrum-white);
@@ -67,30 +67,23 @@ governing permissions and limitations under the License.
6767

6868
/* Windows high contrast mode */
6969
@media (forced-colors: active) {
70-
.spectrum-Swatch-fill {
71-
forced-color-adjust: none;
72-
}
7370
.spectrum-Swatch {
7471
--highcontrast-swatch-disabled-icon-color: grayText;
75-
--highcontrast-swatch-focus-ring-color: ButtonText;
72+
--highcontrast-swatch-focus-ring-color: Highlight;
7673
--highcontrast-swatch-border-color-selected: Highlight;
7774
--highcontrast-swatch-border-color: ButtonText;
78-
--highcontrast-swatch-border-color-light: ButtonText;
79-
/* --highcontrast-swatch-fill-background-color-selected: ButtonFace; */
8075
--highcontrast-swatch-fill-background-color: ButtonFace;
76+
--highcontrast-swatch-fill-foreground-color: ButtonText;
77+
78+
.spectrum-Swatch-fill {
79+
forced-color-adjust: none;
80+
}
81+
8182
&.is-disabled {
8283
.spectrum-Swatch-fill {
8384
forced-color-adjust: auto;
8485
}
8586
}
86-
/* Slash */
87-
&.is-nothing {
88-
.spectrum-Swatch-fill {
89-
&:after {
90-
background: ButtonText;
91-
}
92-
}
93-
}
9487
}
9588
}
9689

@@ -141,7 +134,7 @@ governing permissions and limitations under the License.
141134
}
142135
}
143136

144-
/* Swatch fill with transparent background-color for images, gradients, and svgs */
137+
/* Swatch fill: Image, Gradient, SVG */
145138
&.is-image {
146139
.spectrum-Swatch-fill {
147140
&::before {
@@ -161,18 +154,18 @@ governing permissions and limitations under the License.
161154
}
162155
}
163156

157+
/* Swatch fill: Not fill with Slash */
164158
&.is-nothing {
165159
.spectrum-Swatch-fill {
166160
background-color: var(--highcontrast-swatch-fill-background-color, var(--mod-swatch-fill-background-color, var(--spectrum-swatch-fill-background-color)));
167161

168-
/* Slash */
169162
&:after {
170163
height: var(--mod-swatch-slash-thickness, var(--spectrum-swatch-slash-thickness));
171164
content: '';
172165
position: absolute;
173166
transform: rotate(-45deg);
174167
width: 200%; /* just needs to be bigger than a swatch */
175-
background: var(--spectrum-swatch-slash-icon-color);
168+
background: var(--highcontrast-swatch-fill-foreground-color, var(--mod-swatch-slash-icon-color, var(--spectrum-swatch-slash-icon-color)));
176169
}
177170
}
178171

@@ -274,7 +267,7 @@ governing permissions and limitations under the License.
274267
linear-gradient(-45deg, var(--spectrum-swatch-checkerboard-dark-color) 25.5%, transparent 25.5%),
275268
linear-gradient(45deg, var(--spectrum-swatch-checkerboard-dark-color) 25.5%, transparent 25.5%);
276269

277-
/* Swatch fill - default */
270+
/* Swatch fill: Default */
278271
&:before {
279272
content: '';
280273
position: absolute;
@@ -294,7 +287,7 @@ governing permissions and limitations under the License.
294287
.spectrum-Swatch--lightBorder {
295288
.spectrum-Swatch-fill {
296289
&:before {
297-
box-shadow: inset 0 0 0 var(--mod-swatch-border-thickness, var(--spectrum-swatch-border-thickness)) var(--highcontrast-swatch-border-color-light, var(--mod-swatch-border-color-light, var(--spectrum-swatch-border-color-light)));
290+
box-shadow: inset 0 0 0 var(--mod-swatch-border-thickness, var(--spectrum-swatch-border-thickness)) var(--highcontrast-swatch-border-color, var(--mod-swatch-border-color-light, var(--spectrum-swatch-border-color-light)));
298291
}
299292
}
300293
}
@@ -304,6 +297,7 @@ governing permissions and limitations under the License.
304297
.spectrum-Swatch-fill {
305298
&:before {
306299
box-shadow: none;
300+
background-color: var(--highcontrast-swatch-fill-foreground-color, inherit);
307301
}
308302
}
309303
}

0 commit comments

Comments
 (0)