Skip to content

Commit 74a8314

Browse files
cdransfcdransf
committed
fix: conflict
1 parent c091b4d commit 74a8314

File tree

31 files changed

+1890
-58
lines changed

31 files changed

+1890
-58
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
@@ -411,7 +411,6 @@
411411
@media (forced-colors: active) {
412412
.spectrum-Calendar-prevMonth,
413413
.spectrum-Calendar-nextMonth {
414-
--highcontrast-calendar-button-icon-color-disabled: GrayText;
415414
--highcontrast-calendar-button-icon-color: ButtonText;
416415
}
417416

@@ -427,7 +426,6 @@
427426
--highcontrast-calendar-day-text-color-disabled: GrayText;
428427
--highcontrast-calendar-day-text-color-hover: ButtonText;
429428
--highcontrast-calendar-day-text-color-key-focus: ButtonText;
430-
--highcontrast-calendar-day-text-color-selected-hover: HighlightText;
431429
--highcontrast-calendar-day-text-color-selected: HighlightText;
432430
--highcontrast-calendar-day-title-text-color: CanvasText;
433431
--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
@@ -156,7 +156,7 @@
156156
}
157157

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

161161
border-color: var(--highcontrast-card-border-color-selected, var(--mod-card-border-color-selected, var(--spectrum-card-border-color-selected)));
162162
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
@@ -12,7 +12,7 @@
1212
*/
1313
.spectrum-ColorArea {
1414
--spectrum-colorarea-border-radius: var(--spectrum-color-area-border-rounding);
15-
--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 */
15+
--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 */
1616
--spectrum-colorarea-disabled-background-color: var(--spectrum-disabled-background-color);
1717
--spectrum-colorarea-border-width: var(--spectrum-color-area-border-width);
1818
--spectrum-colorarea-height: var(--spectrum-color-area-height);

‎components/colorwheel/index.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124

125125
.spectrum-ColorWheel-wheel {
126126
position: absolute;
127-
background: conic-gradient(from 90deg, red, rgb(255, 128, 0), rgb(255, 255, 0), rgb(128, 255, 0), rgb(0, 255, 0), rgb(0, 255, 128), rgb(0, 255, 255), rgb(0, 128, 255), rgb(0, 0, 255), rgb(128, 0, 255), rgb(255, 0, 255), rgb(255, 0, 128), red);
127+
background: conic-gradient(from 90deg, red, rgb(255 128 0), rgb(255 255 0), rgb(128 255 0), rgb(0 255 0), rgb(0 255 128), rgb(0 255 255), rgb(0 128 255), rgb(0 0 255), rgb(128 0 255), rgb(255 0 255), rgb(255 0 128), red);
128128
inset-block: var(--spectrum-colorwheel-border-width);
129129
inset-inline: var(--spectrum-colorwheel-border-width);
130130
clip-path: path(evenodd, var(--mod-colorwheel-path, var(--spectrum-colorwheel-path)));

‎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

+11-11
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,17 @@
107107
}
108108

109109
.spectrum-LogicButton {
110+
--highcontrast-logic-button-and-background-color: ButtonFace;
111+
--highcontrast-logic-button-and-background-color-hover: ButtonFace;
112+
--highcontrast-logic-button-and-border-color: ButtonText;
113+
--highcontrast-logic-button-and-border-color-hover: Highlight;
114+
--highcontrast-logic-button-and-text-color: ButtonText;
115+
--highcontrast-logic-button-or-background-color: ButtonFace;
116+
--highcontrast-logic-button-or-background-color-hover: ButtonFace;
117+
--highcontrast-logic-button-or-border-color: ButtonText;
118+
--highcontrast-logic-button-or-border-color-hover: Highlight;
119+
--highcontrast-logic-button-or-text-color: ButtonText;
120+
110121
forced-color-adjust: none;
111122

112123
&:disabled,
@@ -118,16 +129,5 @@
118129
--highcontrast-logic-button-or-border-color: GrayText;
119130
--highcontrast-logic-button-or-text-color: GrayText;
120131
}
121-
122-
--highcontrast-logic-button-and-background-color: ButtonFace;
123-
--highcontrast-logic-button-and-background-color-hover: ButtonFace;
124-
--highcontrast-logic-button-and-border-color: ButtonText;
125-
--highcontrast-logic-button-and-border-color-hover: Highlight;
126-
--highcontrast-logic-button-and-text-color: ButtonText;
127-
--highcontrast-logic-button-or-background-color: ButtonFace;
128-
--highcontrast-logic-button-or-background-color-hover: ButtonFace;
129-
--highcontrast-logic-button-or-border-color: ButtonText;
130-
--highcontrast-logic-button-or-border-color-hover: Highlight;
131-
--highcontrast-logic-button-or-text-color: ButtonText;
132132
}
133133
}

‎components/modal/index.css

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

7676
/* Start offset by the animation distance */
77-
transform: translateY(var(--mod-modal-confirm-entry-animation-distance, var(--spectrum-modal-confirm-entry-animation-distance)));
77+
transform: translateY(var(--mod-modal-confirm-entry-animation-distance));
7878

7979
/* Appear above underlay */
8080
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

+2-1
Original file line numberDiff line numberDiff line change
@@ -269,9 +269,10 @@
269269

270270
@media (forced-colors: active) {
271271
.spectrum-ProgressBar-track {
272-
forced-color-adjust: none;
273272
--highcontrast-progressbar-fill-color: ButtonText;
274273
--highcontrast-progressbar-track-color: ButtonFace;
274+
275275
border: 1px solid ButtonText;
276+
forced-color-adjust: none;
276277
}
277278
}

‎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",

0 commit comments

Comments
 (0)