Skip to content

Commit 3067736

Browse files
aramos-adobecastastrophe
authored andcommitted
chore: fix keyframe data injected into progresscircle metadata
1 parent cf4cadc commit 3067736

File tree

3 files changed

+9
-71
lines changed

3 files changed

+9
-71
lines changed
Lines changed: 6 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,18 @@
11
{
22
"sourceFile": "index.css",
33
"selectors": [
4+
".spectrum-Circle",
45
".spectrum-ProgressCircle",
56
".spectrum-ProgressCircle--indeterminate .spectrum-ProgressCircle-fill",
6-
".spectrum-ProgressCircle--indeterminate .spectrum-ProgressCircle-fillSubMask1",
7-
".spectrum-ProgressCircle--indeterminate .spectrum-ProgressCircle-fillSubMask2",
8-
".spectrum-ProgressCircle--indeterminate-fill-submask-2",
97
".spectrum-ProgressCircle--sizeL",
108
".spectrum-ProgressCircle--sizeS",
119
".spectrum-ProgressCircle-fill",
1210
".spectrum-ProgressCircle-track",
1311
".spectrum-ProgressCircle.spectrum-ProgressCircle--staticBlack",
1412
".spectrum-ProgressCircle.spectrum-ProgressCircle--staticWhite",
15-
"0%",
16-
"1.69%",
17-
"10.17%",
18-
"11.86%",
19-
"13.56%",
20-
"15.25%",
21-
"16.95%",
22-
"18.64%",
23-
"20.34%",
24-
"22.03%",
25-
"23.73%",
26-
"25.42%",
27-
"27.12%",
28-
"28.81%",
29-
"3.39%",
30-
"30%",
31-
"30.51%",
32-
"32.2%",
33-
"33.9%",
34-
"35.59%",
35-
"37.29%",
36-
"38.98%",
37-
"40.68%",
38-
"42.37%",
39-
"44.07%",
40-
"45.76%",
41-
"47.46%",
42-
"49.15%",
43-
"5.08%",
44-
"50.85%",
45-
"52.54%",
46-
"54.24%",
47-
"55.93%",
48-
"57.63%",
49-
"59.32%",
50-
"6.78%",
51-
"61.02%",
52-
"62.71%",
53-
"64.41%",
54-
"66.1%",
55-
"67.8%",
56-
"69.49%",
57-
"71.19%",
58-
"72.88%",
59-
"74.58%",
60-
"76.27%",
61-
"77.97%",
62-
"79.66%",
63-
"8.47%",
64-
"81.36%",
65-
"83.05%",
66-
"84.75%",
67-
"86.44%",
68-
"88.14%",
69-
"89.83%",
70-
"91.53%",
71-
"93.22%",
72-
"94.92%",
73-
"96.61%",
74-
"98.31%",
75-
"to"
13+
".spectrum-ProgressCircle:not(.spectrum-ProgressCircle--indeterminate)",
14+
".spectrum-ProgressCircle:not(.spectrum-ProgressCircle--indeterminate) .spectrum-innerCircle",
15+
".spectrum-ProgressCircle:not(.spectrum-ProgressCircle--indeterminate) .spectrum-outerCircle"
7616
],
7717
"modifiers": [
7818
"--mod-progress-circle-fill-border-color",
@@ -108,6 +48,7 @@
10848
"passthroughs": [],
10949
"high-contrast": [
11050
"--highcontrast-progress-circle-fill-border-color",
111-
"--highcontrast-progress-circle-fill-border-color-over-background"
51+
"--highcontrast-progress-circle-fill-border-color-over-background",
52+
"--highcontrast-progressbar-track-color"
11253
]
11354
}

components/progresscircle/index.css

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ governing permissions and limitations under the License.
4646
.spectrum-ProgressCircle {
4747
/* fill is bright color */
4848
--highcontrast-progress-circle-fill-border-color: Highlight;
49-
<<<<<<< HEAD
50-
<<<<<<< HEAD
5149
--highcontrast-progressbar-track-color: Canvas;
5250
}
5351

@@ -61,13 +59,9 @@ governing permissions and limitations under the License.
6159
border-color: CanvasText;
6260
border-radius: 50%;
6361
}
64-
=======
6562

6663
/* fill over background is bright color */
6764
--highcontrast-progress-circle-fill-border-color-over-background: Highlight;
68-
>>>>>>> 46765ca32 (feat(progresscircle): isolate progress circle)
69-
=======
70-
>>>>>>> 5ac4a966e (fix(progresscircle): remove token dupes)
7165
}
7266
}
7367

tasks/component-reporter.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ async function extractModifiers(
6666
const selectors = new Set();
6767
const root = postcss.parse(content);
6868
root.walkRules((rule) => {
69+
// Check that the selector is not inside a keyframe
70+
if (rule.parent.type === "atrule" && rule.parent.name === "keyframes") return;
71+
6972
if (rule.selectors) {
7073
rule.selectors.forEach((selector) => {
7174
// If the selector is not a base selector, add it to the set

0 commit comments

Comments
 (0)