Skip to content

Commit 21aa291

Browse files
cdransfcastastrophe
cdransf
authored and
castastrophe
committed
fix: conflict
1 parent 0f73320 commit 21aa291

File tree

25 files changed

+49
-75
lines changed

25 files changed

+49
-75
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`).

‎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

-6
Original file line numberDiff line numberDiff line change
@@ -293,10 +293,6 @@
293293
--highcontrast-stepper-border-color-focus: Highlight;
294294
--highcontrast-stepper-border-color-focus-hover: Highlight;
295295
--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;
300296
--highcontrast-stepper-focus-indicator-color: Highlight;
301297

302298
&.is-invalid {
@@ -305,12 +301,10 @@
305301
--highcontrast-stepper-border-color-focus: Highlight;
306302
--highcontrast-stepper-border-color-focus-hover: Highlight;
307303
--highcontrast-stepper-border-color-keyboard-focus: Highlight;
308-
--highcontrast-infield-button-border-color: Highlight;
309304
}
310305

311306
&.is-disabled {
312307
--highcontrast-stepper-border-color: GrayText;
313-
--highcontrast-infield-button-border-color: GrayText;
314308
--highcontrast-stepper-buttons-border-width: var(--mod-stepper-border-width, var(--spectrum-stepper-border-width));
315309
}
316310
}

‎components/stepper/metadata/metadata.json

+1-9
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@
132132
"--spectrum-component-height-300",
133133
"--spectrum-component-height-75",
134134
"--spectrum-corner-radius-100",
135-
"--spectrum-disabled-background-color",
136135
"--spectrum-disabled-border-color",
137136
"--spectrum-focus-indicator-color",
138137
"--spectrum-focus-indicator-gap",
@@ -178,9 +177,7 @@
178177
"--system-spectrum-stepper-buttons-border-color-hover",
179178
"--system-spectrum-stepper-buttons-border-color-keyboard-focus",
180179
"--system-spectrum-stepper-buttons-border-style",
181-
"--system-spectrum-stepper-buttons-border-width",
182-
"--system-spectrum-stepper-disabled-buttons-background-color",
183-
"--system-spectrum-stepper-disabled-buttons-border-width"
180+
"--system-spectrum-stepper-buttons-border-width"
184181
],
185182
"passthroughs": [
186183
"--mod-infield-button-border-block-end-width",
@@ -197,16 +194,11 @@
197194
"--mod-textfield-icon-spacing-inline-start-invalid"
198195
],
199196
"high-contrast": [
200-
"--highcontrast-infield-button-border-color",
201197
"--highcontrast-stepper-border-color",
202198
"--highcontrast-stepper-border-color-focus",
203199
"--highcontrast-stepper-border-color-focus-hover",
204200
"--highcontrast-stepper-border-color-hover",
205201
"--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",
210202
"--highcontrast-stepper-buttons-background-color",
211203
"--highcontrast-stepper-buttons-border-width",
212204
"--highcontrast-stepper-focus-indicator-color"

‎components/stepper/themes/express.css

-5
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,5 @@
4141

4242
--spectrum-stepper-button-background-color-focus: var(--spectrum-gray-400);
4343
--spectrum-stepper-button-background-color-keyboard-focus: var(--spectrum-gray-300);
44-
45-
&.is-disabled {
46-
--spectrum-stepper-buttons-background-color: var(--spectrum-disabled-background-color);
47-
--spectrum-stepper-buttons-border-width: 0;
48-
}
4944
}
5045
}

‎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/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);

‎yarn.lock

+7-28
Original file line numberDiff line numberDiff line change
@@ -7216,31 +7216,10 @@ __metadata:
72167216
languageName: node
72177217
linkType: hard
72187218

7219-
"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001599, caniuse-lite@npm:^1.0.30001640":
7220-
version: 1.0.30001643
7221-
resolution: "caniuse-lite@npm:1.0.30001643"
7222-
checksum: 10c0/7fcd0fd180bbe6764311ad57b0d39c23afdcc3bb1d8f804e7a76752c62a85b1bb7cf74b672d9da2f0afe7ad75336ff811a6fe279eb2a54bc04c272b6b62e57f1
7223-
languageName: node
7224-
linkType: hard
7225-
7226-
"caniuse-lite@npm:^1.0.30001629":
7227-
version: 1.0.30001636
7228-
resolution: "caniuse-lite@npm:1.0.30001636"
7229-
checksum: 10c0/e5f965b4da7bae1531fd9f93477d015729ff9e3fa12670ead39a9e6cdc4c43e62c272d47857c5cc332e7b02d697cb3f2f965a1030870ac7476da60c2fc81ee94
7230-
languageName: node
7231-
linkType: hard
7232-
7233-
"caniuse-lite@npm:^1.0.30001646":
7234-
version: 1.0.30001660
7235-
resolution: "caniuse-lite@npm:1.0.30001660"
7236-
checksum: 10c0/d28900b56c597176d515c3175ca75c454f2d30cb2c09a44d7bdb009bb0c4d8a2557905adb77642889bbe9feb85fbfe9d974c8b8e53521fb4b50ee16ab246104e
7237-
languageName: node
7238-
linkType: hard
7239-
7240-
"caniuse-lite@npm:^1.0.30001669":
7241-
version: 1.0.30001673
7242-
resolution: "caniuse-lite@npm:1.0.30001673"
7243-
checksum: 10c0/0e73a2b0f06973052e563dec9990a6fd440d510fa2ff54fa50310e736abb86e96c96b43c10e609fc22f2109f98fe76428b70441baf6b1a49f69ccf50c1879f6b
7219+
"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001599, caniuse-lite@npm:^1.0.30001629, caniuse-lite@npm:^1.0.30001640, caniuse-lite@npm:^1.0.30001646, caniuse-lite@npm:^1.0.30001669":
7220+
version: 1.0.30001690
7221+
resolution: "caniuse-lite@npm:1.0.30001690"
7222+
checksum: 10c0/646bd469032afa90400a84dec30a2b00a6eda62c03ead358117e3f884cda8aacec02ec058a6dbee5eaf9714f83e483b9b0eb4fb42febb8076569f5ca40f1d347
72447223
languageName: node
72457224
linkType: hard
72467225

@@ -18620,11 +18599,11 @@ __metadata:
1862018599
linkType: hard
1862118600

1862218601
"undici@npm:^5.25.4":
18623-
version: 5.28.4
18624-
resolution: "undici@npm:5.28.4"
18602+
version: 5.28.5
18603+
resolution: "undici@npm:5.28.5"
1862518604
dependencies:
1862618605
"@fastify/busboy": "npm:^2.0.0"
18627-
checksum: 10c0/08d0f2596553aa0a54ca6e8e9c7f45aef7d042c60918564e3a142d449eda165a80196f6ef19ea2ef2e6446959e293095d8e40af1236f0d67223b06afac5ecad7
18606+
checksum: 10c0/4dfaa13089fe4c0758f84ec0d34b257e58608e6be3aa540f493b9864b39e3fdcd0a1ace38e434fe79db55f833aa30bcfddd8d6cbe3e0982b0dcae8ec17b65e08
1862818607
languageName: node
1862918608
linkType: hard
1863018609

0 commit comments

Comments
 (0)