Skip to content

Commit 1d64ba4

Browse files
castastrophecastastrophe
committed
fix(meter,styles): remove unneeded system layer
1 parent 9665cf4 commit 1d64ba4

7 files changed

Lines changed: 31 additions & 108 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/src/meter-overrides.css‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,3 @@ governing permissions and limitations under the License.
1111
*/
1212

1313
/* THIS FILE IS MACHINE GENERATED. DO NOT EDIT */
14-
:host {
15-
--spectrum-meter-min-width: var(--system-meter-min-width);
16-
--spectrum-meter-max-width: var(--system-meter-max-width);
17-
--spectrum-meter-inline-size: var(--system-meter-inline-size);
18-
--spectrum-meter-top-to-text: var(--system-meter-top-to-text);
19-
--spectrum-meter-fill-color-positive: var(
20-
--system-meter-fill-color-positive
21-
);
22-
--spectrum-meter-fill-color-notice: var(--system-meter-fill-color-notice);
23-
--spectrum-meter-fill-color-negative: var(
24-
--system-meter-fill-color-negative
25-
);
26-
--spectrum-meter-thickness: var(--system-meter-thickness);
27-
--spectrum-meter-font-size: var(--system-meter-font-size);
28-
}
29-
30-
:host([size='s']) {
31-
--spectrum-meter-thickness: var(--system-meter-size-s-thickness);
32-
--spectrum-meter-inline-size: var(--system-meter-size-s-inline-size);
33-
--spectrum-meter-font-size: var(--system-meter-size-s-font-size);
34-
--spectrum-meter-top-to-text: var(--system-meter-size-s-top-to-text);
35-
}
36-
37-
:host([size='l']) {
38-
--spectrum-meter-thickness: var(--system-meter-size-l-thickness);
39-
--spectrum-meter-inline-size: var(--system-meter-size-l-inline-size);
40-
--spectrum-meter-font-size: var(--system-meter-size-l-font-size);
41-
--spectrum-meter-top-to-text: var(--system-meter-size-l-top-to-text);
42-
}

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

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,38 +14,43 @@ governing permissions and limitations under the License.
1414
:host {
1515
--mod-progressbar-size-default: var(
1616
--mod-meter-inline-size,
17-
var(--spectrum-meter-inline-size)
17+
var(--spectrum-meter-default-width)
1818
);
1919
--mod-progressbar-max-size: var(
2020
--mod-meter-max-width,
21-
var(--spectrum-meter-max-width)
21+
var(--spectrum-meter-maximum-width)
2222
);
2323
--mod-progressbar-min-size: var(
2424
--mod-meter-min-width,
25-
var(--spectrum-meter-min-width)
25+
var(--spectrum-meter-minimum-width)
26+
);
27+
--mod-progressbar-thickness: var(--spectrum-meter-thickness-small);
28+
--mod-progressbar-font-size: var(--spectrum-font-size-75);
29+
--mod-progressbar-spacing-top-to-text: var(
30+
--spectrum-component-top-to-text-75
2631
);
27-
--mod-progressbar-thickness: var(--spectrum-meter-thickness);
28-
--mod-progressbar-font-size: var(--spectrum-meter-font-size);
29-
--mod-progressbar-spacing-top-to-text: var(--spectrum-meter-top-to-text);
3032
}
3133

32-
:host([variant='positive']) {
33-
--mod-progressbar-fill-color: var(
34-
--mod-meter-fill-color-positive,
35-
var(--spectrum-meter-fill-color-positive)
34+
:host([size='l']) {
35+
--mod-progressbar-size-default: var(
36+
--mod-meter-inline-size,
37+
var(--spectrum-progressbar-size-2500)
38+
);
39+
--mod-progressbar-thickness: var(--spectrum-meter-thickness-large);
40+
--mod-progressbar-font-size: var(--spectrum-font-size-100);
41+
--mod-progressbar-spacing-top-to-text: var(
42+
--spectrum-component-top-to-text-200
3643
);
3744
}
3845

46+
:host([variant='positive']) {
47+
--mod-progressbar-fill-color: var(--spectrum-positive-visual-color);
48+
}
49+
3950
:host([variant='notice']) {
40-
--mod-progressbar-fill-color: var(
41-
--mod-meter-fill-color-notice,
42-
var(--spectrum-meter-fill-color-notice)
43-
);
51+
--mod-progressbar-fill-color: var(--spectrum-notice-visual-color);
4452
}
4553

4654
:host([variant='negative']) {
47-
--mod-progressbar-fill-color: var(
48-
--mod-meter-fill-color-negative,
49-
var(--spectrum-meter-fill-color-negative)
50-
);
55+
--mod-progressbar-fill-color: var(--spectrum-negative-visual-color);
5156
}

‎tools/styles/tokens-v2/system-theme-bridge.css‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2135,27 +2135,6 @@
21352135
--system-menu-item-focus-indicator-offset: var(--spectrum-spacing-50);
21362136
--system-menu-item-spacing-multiplier: 1;
21372137
--system-menu-item-focus-indicator-outline-style: solid;
2138-
--system-meter-min-width: var(--spectrum-meter-minimum-width);
2139-
--system-meter-max-width: var(--spectrum-meter-maximum-width);
2140-
--system-meter-inline-size: var(--spectrum-meter-width);
2141-
--system-meter-top-to-text: var(--spectrum-component-top-to-text);
2142-
--system-meter-fill-color-positive: var(--spectrum-positive-visual-color);
2143-
--system-meter-fill-color-notice: var(--spectrum-notice-visual-color);
2144-
--system-meter-fill-color-negative: var(--spectrum-negative-visual-color);
2145-
--system-meter-size-s-thickness: var(--spectrum-meter-thickness-small);
2146-
--system-meter-size-s-inline-size: var(--spectrum-progressbar-size-2400);
2147-
--system-meter-size-s-font-size: var(--spectrum-font-size-75);
2148-
--system-meter-size-s-top-to-text: var(--spectrum-component-top-to-text-75);
2149-
--system-meter-thickness: var(--spectrum-meter-thickness-large);
2150-
--system-meter-size-l-thickness: var(--spectrum-meter-thickness-large);
2151-
--system-meter-inline-size: var(--spectrum-progressbar-size-2500);
2152-
--system-meter-size-l-inline-size: var(--spectrum-progressbar-size-2500);
2153-
--system-meter-font-size: var(--spectrum-font-size-100);
2154-
--system-meter-size-l-font-size: var(--spectrum-font-size-100);
2155-
--system-meter-top-to-text: var(--spectrum-component-top-to-text-200);
2156-
--system-meter-size-l-top-to-text: var(
2157-
--spectrum-component-top-to-text-200
2158-
);
21592138
--system-modal-confirm-exit-animation-delay: var(
21602139
--spectrum-animation-duration-0
21612140
);

‎tools/styles/tokens/express/system-theme-bridge.css‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2157,25 +2157,6 @@
21572157
--system-menu-item-focus-indicator-offset: 0;
21582158
--system-menu-item-spacing-multiplier: 0;
21592159
--system-menu-item-focus-indicator-outline-style: none;
2160-
--system-meter-min-width: var(--spectrum-meter-minimum-width);
2161-
--system-meter-max-width: var(--spectrum-meter-maximum-width);
2162-
--system-meter-inline-size: var(--spectrum-progressbar-size-2500);
2163-
--system-meter-top-to-text: var(--spectrum-component-top-to-text-200);
2164-
--system-meter-fill-color-positive: var(--spectrum-positive-visual-color);
2165-
--system-meter-fill-color-notice: var(--spectrum-notice-visual-color);
2166-
--system-meter-fill-color-negative: var(--spectrum-negative-visual-color);
2167-
--system-meter-size-s-thickness: var(--spectrum-meter-thickness-small);
2168-
--system-meter-size-s-inline-size: var(--spectrum-progressbar-size-2400);
2169-
--system-meter-size-s-font-size: var(--spectrum-font-size-75);
2170-
--system-meter-size-s-top-to-text: var(--spectrum-component-top-to-text-75);
2171-
--system-meter-thickness: var(--spectrum-meter-thickness-large);
2172-
--system-meter-size-l-thickness: var(--spectrum-meter-thickness-large);
2173-
--system-meter-size-l-inline-size: var(--spectrum-progressbar-size-2500);
2174-
--system-meter-font-size: var(--spectrum-font-size-100);
2175-
--system-meter-size-l-font-size: var(--spectrum-font-size-100);
2176-
--system-meter-size-l-top-to-text: var(
2177-
--spectrum-component-top-to-text-200
2178-
);
21792160
--system-modal-confirm-exit-animation-delay: var(
21802161
--spectrum-animation-duration-0
21812162
);

‎tools/styles/tokens/spectrum/system-theme-bridge.css‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2161,25 +2161,6 @@
21612161
--system-menu-item-focus-indicator-offset: 0;
21622162
--system-menu-item-spacing-multiplier: 0;
21632163
--system-menu-item-focus-indicator-outline-style: none;
2164-
--system-meter-min-width: var(--spectrum-meter-minimum-width);
2165-
--system-meter-max-width: var(--spectrum-meter-maximum-width);
2166-
--system-meter-inline-size: var(--spectrum-progressbar-size-2500);
2167-
--system-meter-top-to-text: var(--spectrum-component-top-to-text-200);
2168-
--system-meter-fill-color-positive: var(--spectrum-positive-visual-color);
2169-
--system-meter-fill-color-notice: var(--spectrum-notice-visual-color);
2170-
--system-meter-fill-color-negative: var(--spectrum-negative-visual-color);
2171-
--system-meter-size-s-thickness: var(--spectrum-meter-thickness-small);
2172-
--system-meter-size-s-inline-size: var(--spectrum-progressbar-size-2400);
2173-
--system-meter-size-s-font-size: var(--spectrum-font-size-75);
2174-
--system-meter-size-s-top-to-text: var(--spectrum-component-top-to-text-75);
2175-
--system-meter-thickness: var(--spectrum-meter-thickness-large);
2176-
--system-meter-size-l-thickness: var(--spectrum-meter-thickness-large);
2177-
--system-meter-size-l-inline-size: var(--spectrum-progressbar-size-2500);
2178-
--system-meter-font-size: var(--spectrum-font-size-100);
2179-
--system-meter-size-l-font-size: var(--spectrum-font-size-100);
2180-
--system-meter-size-l-top-to-text: var(
2181-
--spectrum-component-top-to-text-200
2182-
);
21832164
--system-modal-confirm-exit-animation-delay: var(
21842165
--spectrum-animation-duration-0
21852166
);

‎yarn.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8414,8 +8414,8 @@ __metadata:
84148414

84158415
"@spectrum-web-components/eslint-plugin@file:./linters/eslint::locator=%40adobe%2Fspectrum-web-components%40workspace%3A.":
84168416
version: 1.3.0
8417-
resolution: "@spectrum-web-components/eslint-plugin@file:./linters/eslint#./linters/eslint::hash=2eb1f0&locator=%40adobe%2Fspectrum-web-components%40workspace%3A."
8418-
checksum: 10c0/646f7fd6d92878bfd71f32c64ac198fb94462321a3c1296194dd6c777e7ee8303370e5b211ce2587d6eed527a9c2cc99397f06611ec68d003e06cd40a8a5d2ab
8417+
resolution: "@spectrum-web-components/eslint-plugin@file:./linters/eslint#./linters/eslint::hash=850176&locator=%40adobe%2Fspectrum-web-components%40workspace%3A."
8418+
checksum: 10c0/49197a16df8435d740d61d048a43fea9accdf3dc4c13e2c2f4e986ef5e5474a325f19fd7406814cb6aa0033da949da4b4922b5127c18855bd4bb69880bae7dda
84198419
languageName: node
84208420
linkType: hard
84218421

0 commit comments

Comments
 (0)