Skip to content

Commit b5f6da7

Browse files
castastrophecastastrophe
committed
fix(meter,styles): remove unneeded system layer
1 parent 7e38c70 commit b5f6da7

12 files changed

Lines changed: 280 additions & 611 deletions

File tree

‎.changeset/lazy-schools-hunt.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@spectrum-web-components/meter': patch
3+
'@spectrum-web-components/styles': patch
4+
---
5+
6+
Remove unnecessary system theme references to reduce complexity for components that don't need the additional mapping layer.

‎packages/meter/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565
"@spectrum-web-components/shared": "1.4.0"
6666
},
6767
"devDependencies": {
68-
"@spectrum-css/meter": "0.0.0",
69-
"@spectrum-css/progressbar": "5.0.0-s2-foundations.19"
68+
"@spectrum-css/meter": "1.1.0",
69+
"@spectrum-css/progressbar": "6.1.0"
7070
},
7171
"types": "./src/index.d.ts",
7272
"customElements": "custom-elements.json",

‎packages/meter/src/progress-bar-overrides.css‎

Lines changed: 0 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -12,111 +12,8 @@ governing permissions and limitations under the License.
1212

1313
/* THIS FILE IS MACHINE GENERATED. DO NOT EDIT */
1414
:host {
15-
--spectrum-progressbar-animation-ease-in-out-indeterminate: var(
16-
--system-progress-bar-animation-ease-in-out-indeterminate
17-
);
18-
--spectrum-progressbar-animation-duration-indeterminate: var(
19-
--system-progress-bar-animation-duration-indeterminate
20-
);
21-
--spectrum-progressbar-corner-radius: var(
22-
--system-progress-bar-corner-radius
23-
);
24-
--spectrum-progressbar-fill-size-indeterminate: var(
25-
--system-progress-bar-fill-size-indeterminate
26-
);
27-
--spectrum-progressbar-size-2400: var(--system-progress-bar-size-2400);
28-
--spectrum-progressbar-size-2500: var(--system-progress-bar-size-2500);
29-
--spectrum-progressbar-size-2800: var(--system-progress-bar-size-2800);
30-
--spectrum-progressbar-line-height-cjk: var(
31-
--system-progress-bar-line-height-cjk
32-
);
33-
--spectrum-progressbar-min-size: var(--system-progress-bar-min-size);
34-
--spectrum-progressbar-max-size: var(--system-progress-bar-max-size);
35-
--spectrum-progressbar-line-height: var(--system-progress-bar-line-height);
36-
--spectrum-progressbar-spacing-label-to-progressbar: var(
37-
--system-progress-bar-spacing-label-to
38-
);
39-
--spectrum-progressbar-spacing-label-to-text: var(
40-
--system-progress-bar-spacing-label-to-text
41-
);
42-
--spectrum-progressbar-text-color: var(--system-progress-bar-text-color);
4315
--spectrum-progressbar-track-color: var(--system-progress-bar-track-color);
44-
--spectrum-progressbar-fill-color: var(--system-progress-bar-fill-color);
45-
--spectrum-progressbar-label-and-value-white: var(
46-
--system-progress-bar-label-and-value-white
47-
);
4816
--spectrum-progressbar-track-color-white: var(
4917
--system-progress-bar-track-color-white
5018
);
51-
--spectrum-progressbar-fill-color-white: var(
52-
--system-progress-bar-fill-color-white
53-
);
54-
--spectrum-progressbar-size-default: var(
55-
--system-progress-bar-size-default
56-
);
57-
--spectrum-progressbar-font-size: var(--system-progress-bar-font-size);
58-
--spectrum-progressbar-thickness: var(--system-progress-bar-thickness);
59-
--spectrum-progressbar-spacing-top-to-text: var(
60-
--system-progress-bar-spacing-top-to-text
61-
);
62-
}
63-
64-
.spectrum-ProgressBar--sizeM {
65-
--spectrum-progressbar-size-default: var(
66-
--system-progress-bar-size-m-size-default
67-
);
68-
--spectrum-progressbar-font-size: var(
69-
--system-progress-bar-size-m-font-size
70-
);
71-
--spectrum-progressbar-thickness: var(
72-
--system-progress-bar-size-m-thickness
73-
);
74-
--spectrum-progressbar-spacing-top-to-text: var(
75-
--system-progress-bar-size-m-spacing-top-to-text
76-
);
77-
}
78-
79-
.spectrum-ProgressBar--sizeS {
80-
--spectrum-progressbar-size-default: var(
81-
--system-progress-bar-size-s-size-default
82-
);
83-
--spectrum-progressbar-font-size: var(
84-
--system-progress-bar-size-s-font-size
85-
);
86-
--spectrum-progressbar-thickness: var(
87-
--system-progress-bar-size-s-thickness
88-
);
89-
--spectrum-progressbar-spacing-top-to-text: var(
90-
--system-progress-bar-size-s-spacing-top-to-text
91-
);
92-
}
93-
94-
.spectrum-ProgressBar--sizeL {
95-
--spectrum-progressbar-size-default: var(
96-
--system-progress-bar-size-l-size-default
97-
);
98-
--spectrum-progressbar-font-size: var(
99-
--system-progress-bar-size-l-font-size
100-
);
101-
--spectrum-progressbar-thickness: var(
102-
--system-progress-bar-size-l-thickness
103-
);
104-
--spectrum-progressbar-spacing-top-to-text: var(
105-
--system-progress-bar-size-l-spacing-top-to-text
106-
);
107-
}
108-
109-
.spectrum-ProgressBar--sizeXL {
110-
--spectrum-progressbar-size-default: var(
111-
--system-progress-bar-size-xl-size-default
112-
);
113-
--spectrum-progressbar-font-size: var(
114-
--system-progress-bar-size-xl-font-size
115-
);
116-
--spectrum-progressbar-thickness: var(
117-
--system-progress-bar-size-xl-thickness
118-
);
119-
--spectrum-progressbar-spacing-top-to-text: var(
120-
--system-progress-bar-size-xl-spacing-top-to-text
121-
);
12219
}

‎packages/meter/src/spectrum-meter.css‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,16 @@ governing permissions and limitations under the License.
1515
--mod-progressbar-size-default: var(--mod-meter-inline-size, var(--spectrum-meter-default-width));
1616
--mod-progressbar-max-size: var(--mod-meter-max-width, var(--spectrum-meter-maximum-width));
1717
--mod-progressbar-min-size: var(--mod-meter-min-width, var(--spectrum-meter-minimum-width));
18+
}
19+
20+
:host,
21+
:host([size='s']) {
1822
--mod-progressbar-thickness: var(--spectrum-meter-thickness-small);
1923
--mod-progressbar-font-size: var(--spectrum-font-size-75);
2024
--mod-progressbar-spacing-top-to-text: var(--spectrum-component-top-to-text-75);
2125
}
2226

2327
:host([size='l']) {
24-
--mod-progressbar-size-default: var(--mod-meter-inline-size, var(--spectrum-progressbar-size-2500));
2528
--mod-progressbar-thickness: var(--spectrum-meter-thickness-large);
2629
--mod-progressbar-font-size: var(--spectrum-font-size-100);
2730
--mod-progressbar-spacing-top-to-text: var(--spectrum-component-top-to-text-200);

0 commit comments

Comments
 (0)