Skip to content

Commit c8194b0

Browse files
authored
fix(stylelint): addresses remaining stylelint violations (#3359)
1 parent c01ec97 commit c8194b0

File tree

27 files changed

+59
-53
lines changed

27 files changed

+59
-53
lines changed

.changeset/clever-otters-mix.md

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
---
2+
"@spectrum-css/infieldbutton": minor
3+
"@spectrum-css/logicbutton": minor
4+
"@spectrum-css/progressbar": minor
5+
"@spectrum-css/colorwheel": minor
6+
"@spectrum-css/assetcard": minor
7+
"@spectrum-css/colorarea": minor
8+
"@spectrum-css/calendar": minor
9+
"@spectrum-css/checkbox": minor
10+
"@spectrum-css/underlay": minor
11+
"@spectrum-css/stepper": minor
12+
"@spectrum-css/button": minor
13+
"@spectrum-css/modal": minor
14+
"@spectrum-css/radio": minor
15+
"@spectrum-css/table": minor
16+
"@spectrum-css/card": minor
17+
"@spectrum-css/site": minor
18+
"@spectrum-css/tokens": minor
19+
---
20+
21+
This resolves our remaining stylelint issues around undefined tokens, rule order, unused values and color syntax.
22+
23+
- Updates invalid color syntax from `rgba(N, N, N, N)` to `rgba(N N N / N)`.
24+
- In cases of duplicate properties, preserves the property that would be applied given current code structure.
25+
- Updates misnamed tokens to use valid tokens (`table/index.css`).

.github/workflows/lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
filter_mode: diff_context
8787
# stylelint_input: "components/*/index.css components/*/themes/*.css"
8888
stylelint_input: "${{ inputs.styles_added_files }} ${{ inputs.styles_modified_files }}"
89-
stylelint_config: stylelint.config.js
89+
stylelint_config: "${{ github.workspace }}/stylelint.config.js"
9090

9191
- name: Run eslint on packages and stories
9292
uses: reviewdog/[email protected]

components/assetcard/index.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@
272272

273273
border-radius: var(--mod-assetcard-selectionindicator-border-radius, var(--spectrum-assetcard-selectionindicator-border-radius));
274274

275-
box-shadow: 0 var(--spectrum-assetcard-selectionindicator-offset-y) var(--spectrum-assetcard-selectionindicator-blur) rgb(0, 0, 0, 15%);
275+
box-shadow: 0 var(--spectrum-assetcard-selectionindicator-offset-y) var(--spectrum-assetcard-selectionindicator-blur) rgb(0 0 0 / 15%);
276276

277277
color: var(--highcontrast-assetcard-selectionindicator-color, var(--mod-assetcard-selectionindicator-color, var(--spectrum-assetcard-selectionindicator-color)));
278278
font-weight: var(--mod-assetcard-selectionindicator-font-weight, var(--spectrum-assetcard-selectionindicator-font-weight));

components/assetcard/themes/express.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515

1616
@container (--system: express) {
1717
.spectrum-AssetCard {
18-
--spectrum-assetcard-overlay-background-color: rgba(109, 115, 246, 20%);
18+
--spectrum-assetcard-overlay-background-color: rgba(109 115 246 / 20%);
1919
}
2020
}

components/assetcard/themes/spectrum.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313

1414
@container (--system: spectrum) {
1515
.spectrum-AssetCard {
16-
--spectrum-assetcard-overlay-background-color: rgba(27, 127, 245, 10%);
16+
--spectrum-assetcard-overlay-background-color: rgba(27 127 245 / 10%);
1717
}
1818
}

components/calendar/index.css

-2
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,6 @@
413413
@media (forced-colors: active) {
414414
.spectrum-Calendar-prevMonth,
415415
.spectrum-Calendar-nextMonth {
416-
--highcontrast-calendar-button-icon-color-disabled: GrayText;
417416
--highcontrast-calendar-button-icon-color: ButtonText;
418417
}
419418

@@ -429,7 +428,6 @@
429428
--highcontrast-calendar-day-text-color-disabled: GrayText;
430429
--highcontrast-calendar-day-text-color-hover: ButtonText;
431430
--highcontrast-calendar-day-text-color-key-focus: ButtonText;
432-
--highcontrast-calendar-day-text-color-selected-hover: HighlightText;
433431
--highcontrast-calendar-day-text-color-selected: HighlightText;
434432
--highcontrast-calendar-day-title-text-color: CanvasText;
435433
--highcontrast-calendar-day-today-background-color-selected-hover: Highlight;

components/calendar/metadata/metadata.json

-2
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@
170170
"passthroughs": [],
171171
"high-contrast": [
172172
"--highcontrast-calendar-button-icon-color",
173-
"--highcontrast-calendar-button-icon-color-disabled",
174173
"--highcontrast-calendar-day-background-color-cap-selected",
175174
"--highcontrast-calendar-day-background-color-down",
176175
"--highcontrast-calendar-day-background-color-hover",
@@ -183,7 +182,6 @@
183182
"--highcontrast-calendar-day-text-color-hover",
184183
"--highcontrast-calendar-day-text-color-key-focus",
185184
"--highcontrast-calendar-day-text-color-selected",
186-
"--highcontrast-calendar-day-text-color-selected-hover",
187185
"--highcontrast-calendar-day-title-text-color",
188186
"--highcontrast-calendar-day-today-background-color-selected-hover",
189187
"--highcontrast-calendar-day-today-border-color",

components/card/index.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
}
159159

160160
&.is-drop-target {
161-
--mod-card-background-color: var(--spectrum-card-background-color-quiet, var(--spectrum-background-base-color));
161+
--mod-card-background-color: var(--spectrum-background-base-color);
162162

163163
border-color: var(--highcontrast-card-border-color-selected, var(--mod-card-border-color-selected, var(--spectrum-card-border-color-selected)));
164164
box-shadow: 0 0 0 1px var(--highcontrast-card-border-color-selected, var(--mod-card-border-color-selected, var(--spectrum-card-border-color-selected)));

components/card/metadata/metadata.json

-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@
148148
"--spectrum-card-actions-size",
149149
"--spectrum-card-actions-spacing",
150150
"--spectrum-card-background-color",
151-
"--spectrum-card-background-color-quiet",
152151
"--spectrum-card-body-font-color",
153152
"--spectrum-card-body-font-family",
154153
"--spectrum-card-body-font-size",

components/checkbox/index.css

+2-1
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,8 @@
442442
}
443443

444444
.spectrum-Checkbox-box {
445+
--spectrum-checkbox-spacing: calc(var(--mod-checkbox-height, var(--spectrum-checkbox-height)) - var(--mod-checkbox-control-size, var(--spectrum-checkbox-control-size)));
446+
445447
display: flex;
446448
align-items: center;
447449
justify-content: center;
@@ -452,7 +454,6 @@
452454
block-size: var(--mod-checkbox-control-size, var(--spectrum-checkbox-control-size));
453455

454456
/* Fix vertical alignment when not wrapping since we're flex-start */
455-
--spectrum-checkbox-spacing: calc(var(--mod-checkbox-height, var(--spectrum-checkbox-height)) - var(--mod-checkbox-control-size, var(--spectrum-checkbox-control-size)));
456457
margin: calc(var(--mod-checkbox-spacing, var(--spectrum-checkbox-spacing)) / 2) 0;
457458

458459
flex-grow: 0;

components/colorarea/index.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
.spectrum-ColorArea {
1717
--spectrum-colorarea-border-radius: var(--spectrum-color-area-border-rounding);
18-
--spectrum-colorarea-border-color: rgb(0 0 0 / 10%); /* TODO replace with token --spectrum-color-area-border-color and --spectrum-color-area-border-opacity using RGBA function */
18+
--spectrum-colorarea-border-color: rgba(0 0 0 / 10%); /* TODO replace with token --spectrum-color-area-border-color and --spectrum-color-area-border-opacity using RGBA function */
1919
--spectrum-colorarea-disabled-background-color: var(--spectrum-disabled-background-color);
2020
--spectrum-colorarea-border-width: var(--spectrum-color-area-border-width);
2121
--spectrum-colorarea-height: var(--spectrum-color-area-height);

components/infieldbutton/index.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@
202202
align-items: center;
203203
justify-content: var(--mod-infield-button-fill-justify-content, var(--spectrum-infield-button-fill-justify-content));
204204

205-
transition: border-color var(--spectrum-global-animation-duration-100) ease-in-out;
205+
transition: border-color var(--spectrum-animation-duration-100) ease-in-out;
206206
}
207207

208208
/* Stacked in-field buttons */

components/infieldbutton/metadata/metadata.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@
129129
"--spectrum-infield-button-width"
130130
],
131131
"global": [
132+
"--spectrum-animation-duration-100",
132133
"--spectrum-border-width-100",
133134
"--spectrum-component-height-100",
134135
"--spectrum-component-height-200",
@@ -138,7 +139,6 @@
138139
"--spectrum-corner-radius-75",
139140
"--spectrum-disabled-background-color",
140141
"--spectrum-disabled-content-color",
141-
"--spectrum-global-animation-duration-100",
142142
"--spectrum-gray-200",
143143
"--spectrum-gray-300",
144144
"--spectrum-gray-400",

components/logicbutton/index.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@
108108
}
109109

110110
.spectrum-LogicButton {
111-
112111
--highcontrast-logic-button-and-background-color: ButtonFace;
113112
--highcontrast-logic-button-and-background-color-hover: ButtonFace;
114113
--highcontrast-logic-button-and-border-color: ButtonText;
@@ -119,6 +118,7 @@
119118
--highcontrast-logic-button-or-border-color: ButtonText;
120119
--highcontrast-logic-button-or-border-color-hover: Highlight;
121120
--highcontrast-logic-button-or-text-color: ButtonText;
121+
122122
forced-color-adjust: none;
123123

124124
&:disabled,

components/modal/index.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
@extend %spectrum-overlay;
7676

7777
/* Start offset by the animation distance */
78-
transform: translateY(var(--mod-modal-confirm-entry-animation-distance, var(--spectrum-modal-confirm-entry-animation-distance)));
78+
transform: translateY(var(--mod-modal-confirm-entry-animation-distance));
7979

8080
/* Appear above underlay */
8181
z-index: 2;

components/modal/metadata/metadata.json

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
"--spectrum-modal-background-color",
3131
"--spectrum-modal-confirm-border-radius",
3232
"--spectrum-modal-confirm-entry-animation-delay",
33-
"--spectrum-modal-confirm-entry-animation-distance",
3433
"--spectrum-modal-confirm-entry-animation-duration",
3534
"--spectrum-modal-confirm-exit-animation-delay",
3635
"--spectrum-modal-confirm-exit-animation-duration",

components/progressbar/index.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@
273273
.spectrum-ProgressBar-track {
274274
--highcontrast-progressbar-fill-color: ButtonText;
275275
--highcontrast-progressbar-track-color: ButtonFace;
276-
forced-color-adjust: none;
277276
border: 1px solid ButtonText;
277+
forced-color-adjust: none;
278278
}
279279
}

components/radio/index.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
--spectrum-radio-button-checked-border-color-default: var(--spectrum-neutral-background-color-selected-default);
5050
--spectrum-radio-button-checked-border-color-hover: var(--spectrum-neutral-background-color-selected-hover);
5151
--spectrum-radio-button-checked-border-color-down: var(--spectrum-neutral-background-color-selected-down);
52-
--spectrum-radio-button-checked-border-color-focus: var(--spectrum-neutral-background-color-selected-focus);
52+
--spectrum-radio-button-checked-border-color-focus: var(--spectrum-neutral-background-color-selected-key-focus);
5353

5454
/* spacing all themes */
5555
--spectrum-radio-text-to-control: var(--spectrum-text-to-control-100);

components/radio/metadata/metadata.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@
158158
"--spectrum-line-height-100",
159159
"--spectrum-neutral-background-color-selected-default",
160160
"--spectrum-neutral-background-color-selected-down",
161-
"--spectrum-neutral-background-color-selected-focus",
162161
"--spectrum-neutral-background-color-selected-hover",
162+
"--spectrum-neutral-background-color-selected-key-focus",
163163
"--spectrum-neutral-content-color-default",
164164
"--spectrum-neutral-content-color-down",
165165
"--spectrum-neutral-content-color-hover",

components/stepper/index.css

+8-16
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,6 @@
8989
}
9090
}
9191

92-
.x {
93-
border-radius: var(--spectrum-stepper-button-border-radius-reset);
94-
}
95-
9692
.spectrum-Stepper {
9793
position: relative;
9894
display: inline-flex;
@@ -173,6 +169,13 @@
173169
}
174170

175171
/*** Quiet ***/
172+
173+
/* stylelint-disable-next-line selector-class-pattern -- .hide-stepper class is deprecated for S2 */
174+
.spectrum-Stepper.spectrum-Stepper--quiet.hide-stepper .spectrum-Stepper-input {
175+
border-inline-end-width: 0;
176+
border-end-end-radius: 0;
177+
}
178+
176179
.spectrum-Stepper.spectrum-Stepper--quiet {
177180
--mod-infield-button-border-color: var(--highcontrast-stepper-border-color, var(--mod-stepper-border-color, var(--spectrum-stepper-border-color)));
178181

@@ -182,11 +185,6 @@
182185
border-end-start-radius: 0;
183186
border-end-end-radius: 0;
184187

185-
&.hide-stepper .spectrum-Stepper-input {
186-
border-inline-end-width: 0;
187-
border-end-end-radius: 0;
188-
}
189-
190188
&::after {
191189
content: "";
192190
position: absolute;
@@ -279,7 +277,7 @@
279277
transition: border-color var(--mod-stepper-animation-duration, var(--spectrum-stepper-animation-duration)) ease-in-out;
280278
}
281279

282-
/* hide-stepper */
280+
/* stylelint-disable-next-line selector-class-pattern -- .hide-stepper class is deprecated for S2 */
283281
.spectrum-Stepper.hide-stepper .spectrum-Stepper-input {
284282
border-start-end-radius: var(--mod-stepper-border-radius, var(--spectrum-stepper-border-radius));
285283
border-end-end-radius: var(--mod-stepper-border-radius, var(--spectrum-stepper-border-radius));
@@ -293,10 +291,6 @@
293291
--highcontrast-stepper-border-color-focus: Highlight;
294292
--highcontrast-stepper-border-color-focus-hover: Highlight;
295293
--highcontrast-stepper-border-color-keyboard-focus: CanvasText;
296-
--highcontrast-stepper-button-background-color-default: Canvas;
297-
--highcontrast-stepper-button-background-color-hover: Canvas;
298-
--highcontrast-stepper-button-background-color-focus: Canvas;
299-
--highcontrast-stepper-button-background-color-keyboard-focus: Canvas;
300294
--highcontrast-stepper-focus-indicator-color: Highlight;
301295

302296
&.is-invalid {
@@ -305,12 +299,10 @@
305299
--highcontrast-stepper-border-color-focus: Highlight;
306300
--highcontrast-stepper-border-color-focus-hover: Highlight;
307301
--highcontrast-stepper-border-color-keyboard-focus: Highlight;
308-
--highcontrast-infield-button-border-color: Highlight;
309302
}
310303

311304
&.is-disabled {
312305
--highcontrast-stepper-border-color: GrayText;
313-
--highcontrast-infield-button-border-color: GrayText;
314306
--highcontrast-stepper-buttons-border-width: var(--mod-stepper-border-width, var(--spectrum-stepper-border-width));
315307
}
316308
}

components/stepper/metadata/metadata.json

+1-7
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@
5656
".spectrum-Stepper:focus:not(.is-disabled) .spectrum-Stepper-input",
5757
".spectrum-Stepper:hover:not(.is-disabled) .spectrum-Stepper-buttons",
5858
".spectrum-Stepper:hover:not(.is-disabled) .spectrum-Stepper-input",
59-
".spectrum-Stepper:hover:not(.is-invalid)",
60-
".x"
59+
".spectrum-Stepper:hover:not(.is-invalid)"
6160
],
6261
"modifiers": [
6362
"--mod-stepper-animation-duration",
@@ -197,16 +196,11 @@
197196
"--mod-textfield-icon-spacing-inline-start-invalid"
198197
],
199198
"high-contrast": [
200-
"--highcontrast-infield-button-border-color",
201199
"--highcontrast-stepper-border-color",
202200
"--highcontrast-stepper-border-color-focus",
203201
"--highcontrast-stepper-border-color-focus-hover",
204202
"--highcontrast-stepper-border-color-hover",
205203
"--highcontrast-stepper-border-color-keyboard-focus",
206-
"--highcontrast-stepper-button-background-color-default",
207-
"--highcontrast-stepper-button-background-color-focus",
208-
"--highcontrast-stepper-button-background-color-hover",
209-
"--highcontrast-stepper-button-background-color-keyboard-focus",
210204
"--highcontrast-stepper-buttons-background-color",
211205
"--highcontrast-stepper-buttons-border-width",
212206
"--highcontrast-stepper-focus-indicator-color"

components/stepper/themes/spectrum.css

+5
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,10 @@
3939

4040
--spectrum-stepper-button-background-color-focus: var(--spectrum-gray-300);
4141
--spectrum-stepper-button-background-color-keyboard-focus: var(--spectrum-gray-200);
42+
43+
&.is-disabled {
44+
--spectrum-stepper-buttons-background-color: var(--spectrum-gray-50);
45+
--spectrum-stepper-buttons-border-width: 0;
46+
}
4247
}
4348
}

components/table/index.css

+2-4
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@
6868
--spectrum-table-icon-color-default: var(--spectrum-neutral-subdued-content-color-default);
6969
--spectrum-table-icon-color-hover: var(--spectrum-neutral-subdued-content-color-hover);
7070
--spectrum-table-icon-color-active: var(--spectrum-neutral-subdued-content-color-down);
71-
--spectrum-table-icon-color-focus: var(--spectrum-neutral-subdued-content-color-focus);
72-
--spectrum-table-icon-color-focus-hover: var(--spectrum-neutral-subdued-content-focus-hover);
71+
--spectrum-table-icon-color-focus: var(--spectrum-neutral-subdued-content-color-key-focus);
72+
--spectrum-table-icon-color-focus-hover: var(--spectrum-neutral-subdued-content-color-hover);
7373
--spectrum-table-icon-color-key-focus: var(--spectrum-neutral-subdued-content-color-key-focus);
7474

7575
/* Row Selection */
@@ -353,12 +353,10 @@
353353

354354
--highcontrast-table-selected-row-background-color: Highlight;
355355
--highcontrast-table-selected-row-text-color: HighlightText;
356-
--highcontrast-table-selected-row-text-color-default: HighlightText;
357356

358357
@supports (color: SelectedItem) {
359358
--highcontrast-table-selected-row-background-color: SelectedItem;
360359
--highcontrast-table-selected-row-text-color: SelectedItemText;
361-
--highcontrast-table-selected-row-text-color-default: SelectedItemText;
362360
}
363361

364362
--highcontrast-table-selected-row-background-color-focus: Highlight;

components/table/metadata/metadata.json

-3
Original file line numberDiff line numberDiff line change
@@ -415,10 +415,8 @@
415415
"--spectrum-neutral-content-color-default",
416416
"--spectrum-neutral-subdued-content-color-default",
417417
"--spectrum-neutral-subdued-content-color-down",
418-
"--spectrum-neutral-subdued-content-color-focus",
419418
"--spectrum-neutral-subdued-content-color-hover",
420419
"--spectrum-neutral-subdued-content-color-key-focus",
421-
"--spectrum-neutral-subdued-content-focus-hover",
422420
"--spectrum-regular-font-weight",
423421
"--spectrum-sans-font-family-stack",
424422
"--spectrum-spacing-300",
@@ -452,7 +450,6 @@
452450
"--highcontrast-table-selected-row-background-color",
453451
"--highcontrast-table-selected-row-background-color-focus",
454452
"--highcontrast-table-selected-row-text-color",
455-
"--highcontrast-table-selected-row-text-color-default",
456453
"--highcontrast-table-selected-row-text-color-focus",
457454
"--highcontrast-table-transition-duration"
458455
]

components/tooltip/index.css

+2-1
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,12 @@
7777
}
7878

7979
.spectrum-Tooltip-tip {
80-
forced-color-adjust: none;
8180
--highcontrast-tooltip-background-color-default: CanvasText;
8281
--highcontrast-tooltip-background-color-informative: CanvasText;
8382
--highcontrast-tooltip-background-color-positive: CanvasText;
8483
--highcontrast-tooltip-background-color-negative: CanvasText;
84+
85+
forced-color-adjust: none;
8586
}
8687
}
8788

components/underlay/index.css

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
--spectrum-underlay-background-entry-animation-delay: var(--spectrum-animation-duration-0);
1919
--spectrum-underlay-background-exit-animation-ease: var(--spectrum-animation-ease-in);
2020
--spectrum-underlay-background-entry-animation-ease: var(--spectrum-animation-ease-out);
21-
--spectrum-underlay-background-exit-animation-duration: var(--spectrum-animation-duration-100);
2221
--spectrum-underlay-background-entry-animation-duration: var(--spectrum-animation-duration-600);
2322
--spectrum-underlay-background-exit-animation-duration: var(--spectrum-animation-duration-300);
2423
--spectrum-underlay-background-exit-animation-delay: var(--spectrum-animation-duration-200);

0 commit comments

Comments
 (0)