Skip to content

Commit b1b7112

Browse files
Melissa Thompsoncastastrophe
authored andcommitted
feat(progressbar): s2 migration (#2659)
1 parent 1d56db6 commit b1b7112

File tree

8 files changed

+197
-220
lines changed

8 files changed

+197
-220
lines changed

.changeset/proud-jokes-rule.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@spectrum-css/progressbar": major
3+
---
4+
5+
feat(progressbar): S2 migration
6+
7+
Progress bar now uses Spectrum 2 tokens and specifications. This migration includes updated colors, font sizes, and spacing. No mods were harmed in the migration of this component (all `--mod` properties remain the same).

components/meter/dist/metadata.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@
2727
"--spectrum-font-size-75",
2828
"--spectrum-negative-visual-color",
2929
"--spectrum-notice-visual-color",
30-
"--spectrum-positive-visual-color"
30+
"--spectrum-positive-visual-color",
31+
"--spectrum-progressbar-size-2400",
32+
"--spectrum-progressbar-size-2500"
3133
],
3234
"system-theme": [],
3335
"passthroughs": [

components/meter/index.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,14 @@
1919

2020
&,
2121
&.spectrum-Meter--sizeS {
22+
--mod-progressbar-size-default: var(--spectrum-progressbar-size-2400);
2223
--mod-progressbar-thickness: var(--spectrum-meter-thickness-small);
2324
--mod-progressbar-font-size: var(--spectrum-font-size-75);
2425
--mod-progressbar-spacing-top-to-text: var(--spectrum-component-top-to-text-75);
2526
}
2627

2728
&.spectrum-Meter--sizeL {
29+
--mod-progressbar-size-default: var(--spectrum-progressbar-size-2500);
2830
--mod-progressbar-thickness: var(--spectrum-meter-thickness-large);
2931
--mod-progressbar-font-size: var(--spectrum-font-size-100);
3032
--mod-progressbar-spacing-top-to-text: var(--spectrum-component-top-to-text-200);

components/progressbar/dist/metadata.json

Lines changed: 28 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,32 @@
22
"sourceFile": "index.css",
33
"selectors": [
44
".spectrum-ProgressBar",
5+
".spectrum-ProgressBar .spectrum-ProgressBar-fill",
6+
".spectrum-ProgressBar .spectrum-ProgressBar-label",
7+
".spectrum-ProgressBar .spectrum-ProgressBar-label:lang(ja)",
8+
".spectrum-ProgressBar .spectrum-ProgressBar-label:lang(ko)",
9+
".spectrum-ProgressBar .spectrum-ProgressBar-label:lang(zh)",
10+
".spectrum-ProgressBar .spectrum-ProgressBar-percentage",
11+
".spectrum-ProgressBar .spectrum-ProgressBar-percentage:lang(ja)",
12+
".spectrum-ProgressBar .spectrum-ProgressBar-percentage:lang(ko)",
13+
".spectrum-ProgressBar .spectrum-ProgressBar-percentage:lang(zh)",
14+
".spectrum-ProgressBar .spectrum-ProgressBar-track",
515
".spectrum-ProgressBar--indeterminate .spectrum-ProgressBar-fill",
16+
".spectrum-ProgressBar--indeterminate .spectrum-ProgressBar-fill:dir(rtl)",
17+
".spectrum-ProgressBar--sideLabel",
618
".spectrum-ProgressBar--sideLabel .spectrum-ProgressBar-label",
719
".spectrum-ProgressBar--sideLabel .spectrum-ProgressBar-percentage",
820
".spectrum-ProgressBar--sideLabel .spectrum-ProgressBar-track",
921
".spectrum-ProgressBar--sizeL",
1022
".spectrum-ProgressBar--sizeS",
1123
".spectrum-ProgressBar--sizeXL",
12-
".spectrum-ProgressBar-fill",
13-
".spectrum-ProgressBar-label",
14-
".spectrum-ProgressBar-percentage",
24+
".spectrum-ProgressBar--staticWhite .spectrum-ProgressBar-fill",
25+
".spectrum-ProgressBar--staticWhite .spectrum-ProgressBar-label",
26+
".spectrum-ProgressBar--staticWhite .spectrum-ProgressBar-percentage",
27+
".spectrum-ProgressBar--staticWhite .spectrum-ProgressBar-track",
1528
".spectrum-ProgressBar-track",
16-
".spectrum-ProgressBar.spectrum-ProgressBar--sideLabel",
17-
".spectrum-ProgressBar.spectrum-ProgressBar--staticWhite",
18-
".spectrum-ProgressBar:dir(rtl)",
19-
".spectrum-ProgressBar:lang(ja)",
20-
".spectrum-ProgressBar:lang(ko)",
21-
".spectrum-ProgressBar:lang(zh)",
2229
"0%",
23-
"[dir=\"rtl\"] .spectrum-ProgressBar",
30+
"[dir=\"rtl\"] .spectrum-ProgressBar--indeterminate .spectrum-ProgressBar-fill",
2431
"to"
2532
],
2633
"modifiers": [
@@ -41,7 +48,8 @@
4148
"--mod-progressbar-spacing-top-to-text",
4249
"--mod-progressbar-text-color",
4350
"--mod-progressbar-thickness",
44-
"--mod-progressbar-track-color"
51+
"--mod-progressbar-track-color",
52+
"--mod-spacing-progressbar-label-to-text"
4553
],
4654
"component": [
4755
"--spectrum-progress-bar-maximum-width",
@@ -53,11 +61,7 @@
5361
"--spectrum-progressbar-animation-duration-indeterminate",
5462
"--spectrum-progressbar-animation-ease-in-out-indeterminate",
5563
"--spectrum-progressbar-corner-radius",
56-
"--spectrum-progressbar-dir-indeterminate-multiplier",
5764
"--spectrum-progressbar-fill-color",
58-
"--spectrum-progressbar-fill-color-negative",
59-
"--spectrum-progressbar-fill-color-notice",
60-
"--spectrum-progressbar-fill-color-positive",
6165
"--spectrum-progressbar-fill-color-white",
6266
"--spectrum-progressbar-fill-size-indeterminate",
6367
"--spectrum-progressbar-font-size",
@@ -70,60 +74,42 @@
7074
"--spectrum-progressbar-size-2500",
7175
"--spectrum-progressbar-size-2800",
7276
"--spectrum-progressbar-size-default",
73-
"--spectrum-progressbar-sized-font-size",
74-
"--spectrum-progressbar-sized-size-default",
75-
"--spectrum-progressbar-sized-spacing-top-to-text",
76-
"--spectrum-progressbar-sized-thickness",
7777
"--spectrum-progressbar-spacing-label-to-progressbar",
7878
"--spectrum-progressbar-spacing-label-to-text",
7979
"--spectrum-progressbar-spacing-top-to-text",
80-
"--spectrum-progressbar-static-white-track-color",
8180
"--spectrum-progressbar-text-color",
8281
"--spectrum-progressbar-thickness",
8382
"--spectrum-progressbar-track-color",
84-
"--spectrum-progressbar-track-color-default",
8583
"--spectrum-progressbar-track-color-white"
8684
],
8785
"global": [
88-
"--spectrum-accent-color-900",
86+
"--spectrum-accent-content-color-default",
8987
"--spectrum-animation-duration-2000",
9088
"--spectrum-animation-ease-in-out",
9189
"--spectrum-cjk-line-height-100",
92-
"--spectrum-component-top-to-text",
9390
"--spectrum-component-top-to-text-100",
9491
"--spectrum-component-top-to-text-200",
9592
"--spectrum-component-top-to-text-300",
9693
"--spectrum-component-top-to-text-75",
97-
"--spectrum-corner-radius-100",
94+
"--spectrum-corner-radius-full",
9895
"--spectrum-font-size-100",
9996
"--spectrum-font-size-200",
97+
"--spectrum-font-size-300",
10098
"--spectrum-font-size-75",
101-
"--spectrum-gray-200",
99+
"--spectrum-gray-300",
102100
"--spectrum-line-height-100",
103-
"--spectrum-meter-default-width",
104-
"--spectrum-meter-inline-size",
105-
"--spectrum-meter-max-width",
106-
"--spectrum-meter-maximum-width",
107-
"--spectrum-meter-min-width",
108-
"--spectrum-meter-minimum-width",
109-
"--spectrum-meter-thickness-l",
110-
"--spectrum-meter-thickness-large",
111-
"--spectrum-meter-thickness-s",
112-
"--spectrum-meter-thickness-small",
113-
"--spectrum-meter-top-to-text",
114-
"--spectrum-negative-visual-color",
115-
"--spectrum-neutral-content-color-default",
116-
"--spectrum-notice-visual-color",
117-
"--spectrum-positive-visual-color",
101+
"--spectrum-neutral-subdued-content-color-default",
118102
"--spectrum-spacing-200",
119103
"--spectrum-spacing-75",
120104
"--spectrum-transparent-white-300",
121-
"--spectrum-white"
105+
"--spectrum-transparent-white-700",
106+
"--spectrum-transparent-white-900"
122107
],
123108
"system-theme": [],
124-
"passthroughs": ["--mod-fieldlabel-font-size"],
109+
"passthroughs": [],
125110
"high-contrast": [
126111
"--highcontrast-progressbar-fill-color",
112+
"--highcontrast-progressbar-fill-color-white",
127113
"--highcontrast-progressbar-track-color"
128114
]
129115
}

0 commit comments

Comments
 (0)