Skip to content

Commit c71b8b3

Browse files
castastrophecastastrophe
committed
chore: fix a few minor duplicate properties
1 parent 8efa03b commit c71b8b3

File tree

19 files changed

+39
-154
lines changed

19 files changed

+39
-154
lines changed

‎.github/workflows/vrt.yml

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- main
7+
- spectrum-two
78
- "!changeset-release/**"
89
- "!dependabot/**"
910
workflow_dispatch:

‎components/actionbutton/dist/metadata.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,6 @@
228228
"--highcontrast-actionbutton-content-color-disabled",
229229
"--highcontrast-actionbutton-content-color-down",
230230
"--highcontrast-actionbutton-content-color-focus",
231-
"--highcontrast-actionbutton-content-color-hover",
232-
"--highcontrast-actionbutton-focus-indicator-color"
231+
"--highcontrast-actionbutton-content-color-hover"
233232
]
234233
}

‎components/actionbutton/index.css

-3
Original file line numberDiff line numberDiff line change
@@ -425,9 +425,6 @@ a.spectrum-ActionButton {
425425

426426
@media (forced-colors: active) {
427427
.spectrum-ActionButton {
428-
/* force a more visible focus indicator color */
429-
--highcontrast-actionbutton-focus-indicator-color: ButtonText;
430-
431428
&::after {
432429
/* make sure focus indicator renders */
433430
forced-color-adjust: none;

‎components/checkbox/index.css

+5-11
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,7 @@
1717
*/
1818

1919
.spectrum-Checkbox {
20-
--spectrum-checkbox-control-color-default: var(--spectrum-gray-600);
21-
--spectrum-checkbox-control-color-hover: var(--spectrum-gray-700);
22-
--spectrum-checkbox-control-color-down: var(--spectrum-gray-800);
23-
--spectrum-checkbox-control-color-focus: var(--spectrum-gray-700);
24-
25-
--spectrum-checkbox-checkmark-color: var(--spectrum-gray-50);
26-
--spectrum-checkbox-control-corner-radius: 2px;
20+
--spectrum-checkbox-checkmark-color: var(--highcontrast-checkbox-background-color-default, var(--mod-checkbox-checkmark-color, var(--spectrum-gray-50)));
2721

2822
/* Color */
2923
--spectrum-checkbox-content-color-default: var(--spectrum-neutral-content-color-default);
@@ -201,7 +195,7 @@
201195
.spectrum-Checkbox-input:checked {
202196
&:disabled + .spectrum-Checkbox-box::before {
203197
border-color: var(--highcontrast-checkbox-color-default, var(--mod-checkbox-control-selected-color-default, var(--spectrum-checkbox-control-selected-color-default)));
204-
background-color: var(--highcontrast-checkbox-background-color-default, var(--mod-checkbox-checkmark-color, var(--spectrum-checkbox-checkmark-color)));
198+
background-color: var(--spectrum-checkbox-checkmark-color);
205199
}
206200

207201
&:disabled ~ .spectrum-Checkbox-label {
@@ -422,7 +416,7 @@
422416
&:checked + .spectrum-Checkbox-box {
423417
&::before {
424418
border-color: var(--highcontrast-checkbox-highlight-color-default, var(--mod-checkbox-control-selected-color-default, var(--spectrum-checkbox-control-selected-color-default)));
425-
background-color: var(--mod-checkbox-checkmark-color, var(--spectrum-checkbox-checkmark-color));
419+
background-color: var(--spectrum-checkbox-checkmark-color);
426420
border-width: var(--mod-checkbox-selected-border-width, var(--spectrum-checkbox-selected-border-width));
427421
}
428422

@@ -520,7 +514,7 @@
520514
.spectrum-Checkbox {
521515
.spectrum-Checkbox-checkmark,
522516
.spectrum-Checkbox-partialCheckmark {
523-
color: var(--highcontrast-checkbox-background-color-default, var(--mod-checkbox-checkmark-color, var(--spectrum-checkbox-checkmark-color)));
517+
color: var(--spectrum-checkbox-checkmark-color);
524518
opacity: 0;
525519
transform: scale(0);
526520

@@ -541,7 +535,7 @@
541535
&::before {
542536
border-color: var(--highcontrast-checkbox-disabled-color-default, var(--mod-checkbox-control-color-disabled, var(--spectrum-checkbox-control-color-disabled)));
543537

544-
background-color: var(--highcontrast-checkbox-background-color-default, var(--mod-checkbox-checkmark-color, var(--spectrum-checkbox-checkmark-color)));
538+
background-color: var(--spectrum-checkbox-checkmark-color);
545539
}
546540
}
547541

‎components/clearbutton/index.css

+13-16
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@
1212
*/
1313

1414
.spectrum-ClearButton {
15-
--spectrum-clear-button-background-color: transparent;
16-
--spectrum-clear-button-background-color-hover: transparent;
17-
--spectrum-clear-button-background-color-down: transparent;
18-
--spectrum-clear-button-background-color-key-focus: transparent;
19-
2015
--spectrum-clear-button-height: var(--spectrum-component-height-100);
2116
--spectrum-clear-button-width: var(--spectrum-component-height-100);
2217
--spectrum-clear-button-padding: var(--spectrum-in-field-button-edge-to-fill);
@@ -31,17 +26,6 @@
3126
--spectrum-clear-button-background-color-down: transparent;
3227
--spectrum-clear-button-background-color-key-focus: transparent;
3328

34-
block-size: var(--mod-clear-button-height, var(--spectrum-clear-button-height));
35-
inline-size: var(--mod-clear-button-width, var(--spectrum-clear-button-width));
36-
border-radius: 100%;
37-
38-
background-color: var(--mod-clear-button-background-color, transparent);
39-
margin: 0;
40-
padding: var(--mod-clear-button-padding, var(--spectrum-clear-button-padding));
41-
42-
border: none;
43-
color: var(--mod-clear-button-icon-color, var(--spectrum-clear-button-icon-color));
44-
4529
&.spectrum-ClearButton--staticWhite {
4630
--spectrum-clear-button-background-color-hover: var(--spectrum-transparent-white-400);
4731
--spectrum-clear-button-background-color-down: var(--spectrum-transparent-white-500);
@@ -91,6 +75,19 @@
9175
--mod-clear-button-icon-color-down: var(--spectrum-disabled-content-color);
9276
--mod-clear-button-background-color: var(--mod-clear-button-background-color-disabled, transparent);
9377
}
78+
}
79+
80+
.spectrum-ClearButton {
81+
block-size: var(--mod-clear-button-height, var(--spectrum-clear-button-height));
82+
inline-size: var(--mod-clear-button-width, var(--spectrum-clear-button-width));
83+
border-radius: 100%;
84+
85+
background-color: var(--mod-clear-button-background-color, transparent);
86+
margin: 0;
87+
padding: var(--mod-clear-button-padding, var(--spectrum-clear-button-padding));
88+
89+
border: none;
90+
color: var(--mod-clear-button-icon-color, var(--spectrum-clear-button-icon-color));
9491

9592
&:not(:disabled) {
9693
cursor: pointer;

‎components/coachindicator/dist/metadata.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@
88
".spectrum-CoachIndicator-ring:nth-child(3)",
99
".spectrum-CoachIndicator.spectrum-CoachIndicator--quiet",
1010
".spectrum-CoachIndicator.spectrum-CoachIndicator--staticBlack",
11-
".spectrum-CoachIndicator.spectrum-CoachIndicator--staticWhite",
12-
"0%",
13-
"50%",
14-
"to"
11+
".spectrum-CoachIndicator.spectrum-CoachIndicator--staticWhite"
1512
],
1613
"modifiers": [
1714
"--mod-coach-animation-indicator-ring-center-delay-multiple",

‎components/infieldbutton/index.css

-14
Original file line numberDiff line numberDiff line change
@@ -46,20 +46,6 @@
4646

4747
--spectrum-infield-button-fill-justify-content: center;
4848

49-
--spectrum-infield-button-border-width: var(--spectrum-border-width-100);
50-
--spectrum-infield-button-border-color: inherit;
51-
52-
--spectrum-infield-button-border-radius: var(--spectrum-corner-radius-100);
53-
--spectrum-infield-button-border-radius-reset: 0;
54-
55-
--spectrum-infield-button-stacked-top-border-radius-start-start: var(--spectrum-infield-button-border-radius-reset);
56-
--spectrum-infield-button-stacked-bottom-border-radius-end-start: var(--spectrum-infield-button-border-radius-reset);
57-
58-
--spectrum-infield-button-background-color: var(--spectrum-gray-50);
59-
--spectrum-infield-button-background-color-hover: var(--spectrum-gray-100);
60-
--spectrum-infield-button-background-color-down: var(--spectrum-gray-200);
61-
--spectrum-infield-button-background-color-key-focus: var(--spectrum-gray-100);
62-
6349
&:disabled {
6450
--mod-infield-button-background-color: var(--mod-infield-button-background-color-disabled, var(--spectrum-disabled-background-color));
6551
--mod-infield-button-background-color-hover: var(--mod-infield-button-background-color-hover-disabled, var(--spectrum-disabled-background-color));

‎components/modal/dist/metadata.json

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
"--spectrum-animation-duration-500",
4444
"--spectrum-animation-ease-in",
4545
"--spectrum-animation-ease-out",
46-
"--spectrum-background-layer-2-color",
4746
"--spectrum-corner-radius-extra-large-default",
4847
"--spectrum-dialog-confirm-entry-animation-distance",
4948
"--spectrum-gray-75",

‎components/modal/index.css

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
*/
1313

1414
.spectrum-Modal {
15-
--spectrum-modal-background-color: var(--spectrum-background-layer-2-color);
16-
1715
--spectrum-modal-confirm-entry-animation-duration: var(--mod-modal-confirm-entry-animation-duration, var(--spectrum-animation-duration-500));
1816
--spectrum-modal-confirm-entry-animation-delay: var(--mod-modal-confirm-entry-animation-delay, var(--spectrum-animation-duration-200));
1917

‎components/pickerbutton/dist/metadata.json

-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@
114114
"--spectrum-component-height-75",
115115
"--spectrum-corner-radius-100",
116116
"--spectrum-corner-radius-200",
117-
"--spectrum-corner-radius-75",
118117
"--spectrum-default-font-style",
119118
"--spectrum-disabled-background-color",
120119
"--spectrum-disabled-content-color",

‎components/pickerbutton/index.css

-11
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,6 @@
1212
*/
1313

1414
.spectrum-PickerButton {
15-
--spectrum-picker-button-background-color: var(--spectrum-gray-50);
16-
--spectrum-picker-button-background-color-hover: var(--spectrum-gray-100);
17-
--spectrum-picker-button-background-color-down: var(--spectrum-gray-200);
18-
--spectrum-picker-button-background-color-key-focus: var(--spectrum-gray-100);
19-
20-
--spectrum-picker-button-border-color: none;
21-
--spectrum-picker-button-border-radius: var(--spectrum-corner-radius-75);
22-
--spectrum-picker-button-border-radius-rounded-sided: var(--spectrum-corner-radius-200);
23-
--spectrum-picker-button-border-radius-sided: var(--spectrum-corner-radius-75);
24-
--spectrum-picker-button-border-width: 0px;
25-
2615
/* Bring back --spectrum-in-field-button-edge-to-fill when S2 tokens available */
2716
--spectrum-picker-button-padding: 4px;
2817

‎components/progressbar/dist/metadata.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@
2626
".spectrum-ProgressBar--staticWhite .spectrum-ProgressBar-percentage",
2727
".spectrum-ProgressBar--staticWhite .spectrum-ProgressBar-track",
2828
".spectrum-ProgressBar-track",
29-
"0%",
30-
"[dir=\"rtl\"] .spectrum-ProgressBar--indeterminate .spectrum-ProgressBar-fill",
31-
"to"
29+
"[dir=\"rtl\"] .spectrum-ProgressBar--indeterminate .spectrum-ProgressBar-fill"
3230
],
3331
"modifiers": [
3432
"--mod-progressbar-animation-duration-indeterminate",

‎components/progresscircle/dist/metadata.json

+2-6
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
],
2222
"component": [
2323
"--spectrum-progress-circle-fill-border-color",
24-
"--spectrum-progress-circle-fill-border-color-over-background",
2524
"--spectrum-progress-circle-size",
2625
"--spectrum-progress-circle-size-large",
2726
"--spectrum-progress-circle-size-medium",
@@ -30,18 +29,15 @@
3029
"--spectrum-progress-circle-thickness-large",
3130
"--spectrum-progress-circle-thickness-medium",
3231
"--spectrum-progress-circle-thickness-small",
33-
"--spectrum-progress-circle-track-border-color",
34-
"--spectrum-progress-circle-track-border-color-over-background"
32+
"--spectrum-progress-circle-track-border-color"
3533
],
3634
"global": [
3735
"--spectrum-accent-content-color-default",
3836
"--spectrum-static-black-track-color",
3937
"--spectrum-static-black-track-indicator-color",
4038
"--spectrum-static-white-track-color",
4139
"--spectrum-static-white-track-indicator-color",
42-
"--spectrum-track-color",
43-
"--spectrum-transparent-white-1000",
44-
"--spectrum-transparent-white-400"
40+
"--spectrum-track-color"
4541
],
4642
"passthroughs": [],
4743
"high-contrast": [

‎components/progresscircle/index.css

-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ governing permissions and limitations under the License.
1616
/* circle unfilled border color */
1717
--spectrum-progress-circle-track-border-color: var(--spectrum-track-color);
1818

19-
--spectrum-progress-circle-track-border-color-over-background: var(--spectrum-transparent-white-400);
20-
--spectrum-progress-circle-fill-border-color-over-background: var(--spectrum-transparent-white-1000);
21-
2219
/* circle progress fill border color */
2320
--spectrum-progress-circle-fill-border-color: var(--spectrum-accent-content-color-default);
2421

‎components/radio/dist/metadata.json

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
".spectrum-Radio--emphasized:focus .spectrum-Radio-input:checked + .spectrum-Radio-button:before",
1313
".spectrum-Radio--emphasized:hover .spectrum-Radio-input:checked + .spectrum-Radio-button:before",
1414
".spectrum-Radio--sizeL",
15-
".spectrum-Radio--sizeM",
1615
".spectrum-Radio--sizeS",
1716
".spectrum-Radio--sizeXL",
1817
".spectrum-Radio-button",

‎components/radio/index.css

+7-16
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@
1818
*/
1919

2020
.spectrum-Radio {
21-
/* selection indicator */
22-
--spectrum-radio-button-border-color-default: var(--spectrum-gray-600);
23-
--spectrum-radio-button-border-color-hover: var(--spectrum-gray-700);
24-
--spectrum-radio-button-border-color-down: var(--spectrum-gray-800);
25-
--spectrum-radio-button-border-color-focus: var(--spectrum-gray-700);
26-
2721
--spectrum-radio-button-background-color: var(--spectrum-gray-50);
2822

2923
/* state colors for all themes */
@@ -64,16 +58,6 @@
6458
/* animation all themes */
6559
--spectrum-radio-animation-duration: var(--spectrum-animation-duration-100);
6660

67-
/* CJK language support all themes */
68-
&:lang(ja),
69-
&:lang(zh),
70-
&:lang(ko) {
71-
--spectrum-radio-line-height-cjk: var(--spectrum-cjk-line-height-100);
72-
}
73-
}
74-
75-
.spectrum-Radio,
76-
.spectrum-Radio--sizeM {
7761
--spectrum-radio-height: var(--spectrum-component-height-100);
7862
--spectrum-radio-button-control-size: var(--spectrum-radio-button-control-size-medium);
7963

@@ -83,6 +67,13 @@
8367
--spectrum-radio-button-top-to-control: var(--spectrum-radio-button-top-to-control-medium);
8468

8569
--spectrum-radio-font-size: var(--spectrum-font-size-100);
70+
71+
/* CJK language support all themes */
72+
&:lang(ja),
73+
&:lang(zh),
74+
&:lang(ko) {
75+
--spectrum-radio-line-height-cjk: var(--spectrum-cjk-line-height-100);
76+
}
8677
}
8778

8879
.spectrum-Radio--sizeS {

‎components/tag/index.css

+1-40
Original file line numberDiff line numberDiff line change
@@ -12,46 +12,6 @@
1212
*/
1313

1414
.spectrum-Tag {
15-
--spectrum-tag-background-color: var(--spectrum-gray-50);
16-
--spectrum-tag-background-color-hover: var(--spectrum-gray-50);
17-
--spectrum-tag-background-color-active: var(--spectrum-gray-100);
18-
--spectrum-tag-background-color-focus: var(--spectrum-gray-50);
19-
20-
--spectrum-tag-size-small-corner-radius: var(--spectrum-corner-radius-100);
21-
--spectrum-tag-size-medium-corner-radius: var(--spectrum-corner-radius-100);
22-
--spectrum-tag-size-large-corner-radius: var(--spectrum-corner-radius-100);
23-
24-
--spectrum-tag-border-color: var(--spectrum-gray-700);
25-
--spectrum-tag-border-color-hover: var(--spectrum-gray-800);
26-
--spectrum-tag-border-color-active: var(--spectrum-gray-900);
27-
--spectrum-tag-border-color-focus: var(--spectrum-gray-800);
28-
29-
--spectrum-tag-content-color: var(--spectrum-neutral-subdued-content-color-default);
30-
--spectrum-tag-content-color-hover: var(--spectrum-neutral-subdued-content-color-hover);
31-
--spectrum-tag-content-color-active: var(--spectrum-neutral-subdued-content-color-down);
32-
--spectrum-tag-content-color-focus: var(--spectrum-neutral-subdued-content-color-key-focus);
33-
--spectrum-tag-content-color-selected: var(--spectrum-gray-25);
34-
35-
--spectrum-tag-border-color-selected: var(--spectrum-neutral-subdued-background-color-default);
36-
--spectrum-tag-border-color-selected-hover: var(--spectrum-neutral-subdued-background-color-hover);
37-
--spectrum-tag-border-color-selected-active: var(--spectrum-neutral-subdued-background-color-down);
38-
--spectrum-tag-border-color-selected-focus: var(--spectrum-neutral-subdued-background-color-key-focus);
39-
40-
/* disabled variant */
41-
--spectrum-tag-border-color-disabled: transparent;
42-
--spectrum-tag-background-color-disabled: var(--spectrum-disabled-background-color);
43-
44-
/* tokens based on theme and t-shirt size */
45-
--spectrum-tag-size-small-spacing-inline-start: var(--spectrum-component-edge-to-visual-75);
46-
--spectrum-tag-size-small-label-spacing-inline-end: var(--spectrum-component-edge-to-text-75);
47-
--spectrum-tag-size-small-clear-button-spacing-inline-end: var(--spectrum-component-edge-to-visual-75);
48-
--spectrum-tag-size-medium-spacing-inline-start: var(--spectrum-component-edge-to-visual-100);
49-
--spectrum-tag-size-medium-label-spacing-inline-end: var(--spectrum-component-edge-to-text-100);
50-
--spectrum-tag-size-medium-clear-button-spacing-inline-end: var(--spectrum-component-edge-to-visual-100);
51-
--spectrum-tag-size-large-spacing-inline-start: var(--spectrum-component-edge-to-visual-200);
52-
--spectrum-tag-size-large-label-spacing-inline-end: var(--spectrum-component-edge-to-text-200);
53-
--spectrum-tag-size-large-clear-button-spacing-inline-end: var(--spectrum-component-edge-to-visual-200);
54-
5515
/* TODO - replace placeholder disabled avatar opacity with correct token once avatar is migrated */
5616
--spectrum-avatar-opacity-disabled: 0.3;
5717

@@ -80,6 +40,7 @@
8040
--spectrum-tag-content-color-hover: var(--spectrum-neutral-subdued-content-color-hover);
8141
--spectrum-tag-content-color-active: var(--spectrum-neutral-subdued-content-color-down);
8242
--spectrum-tag-content-color-focus: var(--spectrum-neutral-subdued-content-color-key-focus);
43+
--spectrum-tag-content-color-selected: var(--spectrum-gray-25);
8344

8445
/* focus ring */
8546
--spectrum-tag-focus-ring-thickness: var(--spectrum-focus-indicator-thickness);

‎components/textfield/dist/metadata.json

-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@
8686
".spectrum-Textfield.is-readOnly:hover .spectrum-Textfield-input",
8787
".spectrum-Textfield.is-readOnly:hover .spectrum-Textfield-input::placeholder",
8888
".spectrum-Textfield.is-valid .spectrum-Textfield-validationIcon",
89-
".spectrum-Textfield.spectrum-Textfield--quiet",
9089
".spectrum-Textfield.spectrum-Textfield--sideLabel .spectrum-Textfield-validationIcon",
9190
".spectrum-Textfield:hover .spectrum-Textfield-input",
9291
".spectrum-Textfield:hover .spectrum-Textfield-input::placeholder"

0 commit comments

Comments
 (0)