Skip to content

Commit 469f731

Browse files
authored
chore(stylelint): audit and remove unnecessary stylelint properties (#3346)
* chore(stylelint): remove unnecessary disable comments * chore(colorhandle): removes unnecessary disable * chore(stylelint): adds supported forced color value to ignoreProperties - Removes unnecessary disables - Adjusts nesting to resolve lint violations - update opacity values and remove comments for unsupported ChromeVox version * chore(stylelint): fix max nesting violations
1 parent fa59456 commit 469f731

File tree

12 files changed

+50
-91
lines changed

12 files changed

+50
-91
lines changed

components/checkbox/index.css

Lines changed: 15 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@
110110
--spectrum-checkbox-text-to-control: var(--spectrum-text-to-control-300);
111111
}
112112

113-
/* stylelint-disable max-nesting-depth */
114113
/* Default Unchecked */
115114
.spectrum-Checkbox {
116115
color: var(--highcontrast-checkbox-content-color-default, var(--mod-checkbox-content-color-default, var(--spectrum-checkbox-content-color-default)));
@@ -164,19 +163,15 @@
164163

165164
&.is-indeterminate .spectrum-Checkbox-input:focus-visible,
166165
.spectrum-Checkbox-input:focus-visible {
167-
& + .spectrum-Checkbox-box {
168-
&::before {
169-
border-color: var(--highcontrast-checkbox-color-hover, var(--mod-checkbox-invalid-color-hover, var(--spectrum-checkbox-invalid-color-hover)));
170-
}
166+
& + .spectrum-Checkbox-box::before {
167+
border-color: var(--highcontrast-checkbox-color-hover, var(--mod-checkbox-invalid-color-hover, var(--spectrum-checkbox-invalid-color-hover)));
171168
}
172169
}
173170

174171
&:hover {
175172
.spectrum-Checkbox-input:checked + .spectrum-Checkbox-box,
176-
.spectrum-Checkbox-box {
177-
&::before {
178-
border-color: var(--highcontrast-checkbox-color-hover, var(--mod-checkbox-invalid-color-hover, var(--spectrum-checkbox-invalid-color-hover)));
179-
}
173+
.spectrum-Checkbox-box::before {
174+
border-color: var(--highcontrast-checkbox-color-hover, var(--mod-checkbox-invalid-color-hover, var(--spectrum-checkbox-invalid-color-hover)));
180175
}
181176
}
182177
}
@@ -192,18 +187,14 @@
192187
border-color: var(--highcontrast-checkbox-color-default, var(--mod-checkbox-control-selected-color-default, var(--spectrum-checkbox-control-selected-color-default)));
193188

194189
&:hover {
195-
.spectrum-Checkbox-box {
196-
&::before {
197-
border-color: var(--highcontrast-checkbox-color-default, var(--mod-checkbox-control-selected-color-default, var(--spectrum-checkbox-control-selected-color-default)));
198-
}
190+
.spectrum-Checkbox-box::before {
191+
border-color: var(--highcontrast-checkbox-color-default, var(--mod-checkbox-control-selected-color-default, var(--spectrum-checkbox-control-selected-color-default)));
199192
}
200193
}
201194

202195
&:active {
203-
.spectrum-Checkbox-box {
204-
&::before {
205-
border-color: var(--highcontrast-checkbox-selected-color-default, var(--mod-checkbox-control-selected-color-default, var(--spectrum-checkbox-control-selected-color-default)));
206-
}
196+
.spectrum-Checkbox-box::before {
197+
border-color: var(--highcontrast-checkbox-selected-color-default, var(--mod-checkbox-control-selected-color-default, var(--spectrum-checkbox-control-selected-color-default)));
207198
}
208199
}
209200
}
@@ -251,11 +242,9 @@
251242
}
252243

253244
&:hover {
254-
.spectrum-Checkbox-input:checked + .spectrum-Checkbox-box,
255-
.spectrum-Checkbox-box {
256-
&::before {
257-
border-color: var(--highcontrast-checkbox-highlight-color-hover, var(--mod-checkbox-control-selected-color-hover, var(--spectrum-checkbox-control-selected-color-hover)));
258-
}
245+
.spectrum-Checkbox-input:checked + .spectrum-Checkbox-box::before,
246+
.spectrum-Checkbox-box::before {
247+
border-color: var(--highcontrast-checkbox-highlight-color-hover, var(--mod-checkbox-control-selected-color-hover, var(--spectrum-checkbox-control-selected-color-hover)));
259248
}
260249
}
261250
}
@@ -271,11 +260,9 @@
271260
}
272261

273262
&:hover {
274-
.spectrum-Checkbox-input:checked + .spectrum-Checkbox-box,
275-
.spectrum-Checkbox-box {
276-
&::before {
277-
border-color: var(--highcontrast-checkbox-color-default, var(--mod-checkbox-invalid-color-hover, var(--spectrum-checkbox-invalid-color-hover)));
278-
}
263+
.spectrum-Checkbox-box::before,
264+
.spectrum-Checkbox-input:checked + .spectrum-Checkbox-box::before {
265+
border-color: var(--highcontrast-checkbox-color-default, var(--mod-checkbox-invalid-color-hover, var(--spectrum-checkbox-invalid-color-hover)));
279266
}
280267

281268
.spectrum-Checkbox-label {
@@ -284,7 +271,6 @@
284271
}
285272
}
286273
}
287-
/* stylelint-enable max-nesting-depth */
288274

289275
/* Emphasized */
290276
.spectrum-Checkbox--emphasized {
@@ -427,8 +413,7 @@
427413
inline-size: 100%;
428414
block-size: 100%;
429415

430-
/* @todo Look into replacing with opacity 0. The tiny opacity value appears to be a workaround for a ChromeVox legacy bug (circa 2018). */
431-
opacity: 0.0001;
416+
opacity: 0;
432417
z-index: 1;
433418

434419
cursor: pointer;
@@ -577,7 +562,6 @@
577562
outline-color: var(--highcontrast-checkbox-focus-indicator-color, var(--mod-checkbox-focus-indicator-color, var(--spectrum-checkbox-focus-indicator-color)));
578563
outline-style: auto;
579564
outline-offset: var(--highcontrast-checkbox-focus-indicator-gap, var(--mod-checkbox-focus-indicator-gap, var(--spectrum-checkbox-focus-indicator-gap)));
580-
/* stylelint-disable-next-line declaration-block-no-redundant-longhand-properties */
581565
outline-width: var(--mod-focus-indicator-thickness, var(--spectrum-focus-indicator-thickness));
582566

583567
&::after {

components/checkbox/metadata/metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
".spectrum-Checkbox.is-invalid.is-indeterminate:hover .spectrum-Checkbox-input:checked + .spectrum-Checkbox-box:before",
6767
".spectrum-Checkbox.is-invalid.is-indeterminate:hover .spectrum-Checkbox-label",
6868
".spectrum-Checkbox.is-invalid:hover .spectrum-Checkbox-box:before",
69-
".spectrum-Checkbox.is-invalid:hover .spectrum-Checkbox-input:checked + .spectrum-Checkbox-box:before",
69+
".spectrum-Checkbox.is-invalid:hover .spectrum-Checkbox-input:checked + .spectrum-Checkbox-box",
7070
".spectrum-Checkbox.is-readOnly",
7171
".spectrum-Checkbox.is-readOnly .spectrum-Checkbox-input:checked:disabled + .spectrum-Checkbox-box:before",
7272
".spectrum-Checkbox.is-readOnly .spectrum-Checkbox-input:checked:disabled ~ .spectrum-Checkbox-label",

components/colorhandle/index.css

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,6 @@
9595
inline-size: 100%;
9696
block-size: 100%;
9797
box-shadow: inset 0 0 0 var(--mod-colorhandle-inner-border-width, var(--spectrum-colorhandle-inner-border-width)) var(--mod-colorhandle-inner-border-color, var(--spectrum-colorhandle-inner-border-color));
98-
99-
/* stylelint-disable-next-line spectrum-tools/no-unknown-custom-properties -- undefined variable allows custom stylesheet or JS to pass the value to this element */
10098
background-color: var(--spectrum-picked-color);
10199
}
102100

components/colorloupe/index.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
}
6161

6262
.spectrum-ColorLoupe-inner-border {
63-
/* stylelint-disable-next-line spectrum-tools/no-unknown-custom-properties -- undefined variable allows custom stylesheet or JS to pass the value to this element */
6463
fill: var(--spectrum-picked-color);
6564
stroke: var(--mod-colorloupe-inner-border-color, var(--spectrum-colorloupe-inner-border-color));
6665
stroke-width: var(--mod-colorloupe-inner-border-width, var(--spectrum-colorloupe-inner-border-width));

components/dial/index.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,7 @@
230230
padding: 0;
231231
position: absolute;
232232
overflow: hidden;
233-
/* stylelint-disable-next-line number-max-precision -- @todo Look into replacing with opacity 0. The tiny opacity value appears to be a workaround for a ChromeVox legacy bug (circa 2018). */
234-
opacity: 0.000001;
233+
opacity: 0;
235234
cursor: default;
236235
appearance: none;
237236
border: 0;
@@ -274,6 +273,7 @@
274273

275274
.u-isGrabbing {
276275
cursor: ns-resize;
276+
/* stylelint-disable-next-line -- required for webkit cursor grab/grabbing support */
277277
cursor: -webkit-grabbing;
278278
cursor: grabbing;
279279

components/sidenav/index.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,6 @@
265265
@media (forced-colors: active) {
266266
.spectrum-SideNav {
267267
.spectrum-Icon {
268-
/* stylelint-disable-next-line declaration-property-value-no-unknown -- forced-color-adjust: preserve-parent-color addresses svg bug on icon hover */
269268
forced-color-adjust: preserve-parent-color;
270269
}
271270
}

components/site/site.css

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,11 @@
103103
}
104104

105105
.spectrum-Site-logo {
106-
/* stylelint-disable-next-line spectrum-tools/no-unused-custom-properties -- passthrough icon sizing */
107106
--spectrum-icon-size: 32px;
108107
--mod-icon-color: #fa0f00;
109108
margin-inline-end: var(--spectrum-spacing-200);
110109

111110
.spectrum--large & {
112-
/* stylelint-disable-next-line spectrum-tools/no-unused-custom-properties -- passthrough icon sizing */
113111
--spectrum-icon-size: 40px;
114112
}
115113
}
@@ -206,7 +204,6 @@
206204
margin-inline-end: 20px;
207205

208206
& .spectrum-Icon {
209-
/* stylelint-disable-next-line spectrum-tools/no-unused-custom-properties -- passthrough icon sizing */
210207
--spectrum-icon-size: 200px;
211208
}
212209
}

components/slider/index.css

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -390,8 +390,7 @@
390390
inset-inline-start: var(--mod-slider-input-left, var(--spectrum-slider-input-left));
391391
overflow: hidden;
392392

393-
/* stylelint-disable-next-line number-max-precision -- @todo Look into replacing with opacity 0. The tiny opacity value appears to be a workaround for a ChromeVox legacy bug (circa 2018). */
394-
opacity: 0.000001;
393+
opacity: 0;
395394
cursor: default;
396395
appearance: none;
397396
border: 0;
@@ -704,7 +703,6 @@
704703
--highcontrast-slider-track-color: ButtonText;
705704
--highcontrast-slider-track-color-disabled: GrayText;
706705
--highcontrast-slider-track-color-static: ButtonText;
707-
--highcontrast-slider-track-fill-color: ButtonText;
708706
--highcontrast-slider-track-fill-color-disabled: GrayText;
709707
--highcontrast-slider-filled-track-fill-color: Highlight;
710708

@@ -745,7 +743,6 @@
745743
.spectrum-Slider-controls:active,
746744
.spectrum-Slider-controls:focus-within,
747745
.spectrum-Slider-controls.is-focused {
748-
--highcontrast-slider-track-fill-color: Highlight;
749746
--highcontrast-slider-track-color: Highlight;
750747
--highcontrast-slider-handle-border-color: Highlight;
751748
--highcontrast-slider-ramp-track-color: Highlight;

components/slider/metadata/metadata.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,6 @@
301301
"--highcontrast-slider-track-color",
302302
"--highcontrast-slider-track-color-disabled",
303303
"--highcontrast-slider-track-color-static",
304-
"--highcontrast-slider-track-fill-color",
305304
"--highcontrast-slider-track-fill-color-disabled"
306305
]
307306
}

components/swatch/index.css

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@
145145

146146
&.is-mixedValue {
147147
.spectrum-Swatch-fill {
148-
/* stylelint-disable-next-line -- Undefined variable allows custom stylesheet or JS to pass the value to this element */
149148
background: var(--spectrum-picked-color, transparent);
150149
}
151150

@@ -158,7 +157,6 @@
158157
/* Swatch fill: Not fill with Slash */
159158
&.is-nothing {
160159
.spectrum-Swatch-fill {
161-
/* stylelint-disable-next-line -- Undefined variable allows custom stylesheet or JS to pass the value to this element */
162160
background-color: var(--spectrum-picked-color, transparent);
163161
background-image: none;
164162

@@ -172,12 +170,8 @@
172170
}
173171
}
174172

175-
&.spectrum-Swatch--rectangle {
176-
.spectrum-Swatch-fill {
177-
&::after {
178-
transform: rotate(-25deg);
179-
}
180-
}
173+
&.spectrum-Swatch--rectangle .spectrum-Swatch-fill::after {
174+
transform: rotate(-25deg);
181175
}
182176
}
183177

@@ -248,7 +242,6 @@
248242
inset: 0;
249243
z-index: 0;
250244

251-
/* stylelint-disable-next-line -- Undefined variable allows custom stylesheet or JS to pass the value to this element */
252245
background-color: var(--spectrum-picked-color, transparent);
253246

254247
/* Swatch border */
@@ -263,7 +256,6 @@
263256
&::before {
264257
box-shadow: none;
265258

266-
/* stylelint-disable-next-line -- Undefined variable allows custom stylesheet or JS to pass the value to this element */
267259
background-color: var(--spectrum-picked-color, transparent);
268260
}
269261
}
@@ -281,7 +273,6 @@
281273
display: none;
282274
pointer-events: none;
283275

284-
/* stylelint-disable-next-line -- Undefined variable allows custom stylesheet or JS to pass the value to this element */
285276
color: var(--spectrum-picked-color, transparent);
286277
}
287278

0 commit comments

Comments
 (0)