Skip to content

Commit 5895920

Browse files
aramos-adobecastastrophe
authored andcommitted
fix(progresscircle): remove token dupes
1 parent c6215ae commit 5895920

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

components/progresscircle/index.css

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ governing permissions and limitations under the License.
2525
/* default size and thickness */
2626
--spectrum-progress-circle-size: var(--spectrum-progress-circle-size-medium);
2727
--spectrum-progress-circle-thickness: var(--spectrum-progress-circle-thickness-medium);
28-
29-
/* track border style */
30-
--spectrum-progress-circle-size: var(--spectrum-progress-circle-size-medium);
31-
--spectrum-progress-circle-thickness: var(--spectrum-progress-circle-thickness-medium);
3228
}
3329

3430
.spectrum-ProgressCircle--sizeS {
@@ -41,18 +37,16 @@ governing permissions and limitations under the License.
4137
--spectrum-progress-circle-thickness: var(--spectrum-progress-circle-thickness-large);
4238
}
4339

44-
<<<<<<< HEAD
4540
.spectrum-Circle {
4641
fill: none;
4742
}
4843

49-
=======
50-
>>>>>>> 46765ca32 (feat(progresscircle): isolate progress circle)
5144
/* windows high contrast mode */
5245
@media (forced-colors: active) {
5346
.spectrum-ProgressCircle {
5447
/* fill is bright color */
5548
--highcontrast-progress-circle-fill-border-color: Highlight;
49+
<<<<<<< HEAD
5650
<<<<<<< HEAD
5751
--highcontrast-progressbar-track-color: Canvas;
5852
}
@@ -72,6 +66,8 @@ governing permissions and limitations under the License.
7266
/* fill over background is bright color */
7367
--highcontrast-progress-circle-fill-border-color-over-background: Highlight;
7468
>>>>>>> 46765ca32 (feat(progresscircle): isolate progress circle)
69+
=======
70+
>>>>>>> 5ac4a966e (fix(progresscircle): remove token dupes)
7571
}
7672
}
7773

0 commit comments

Comments
 (0)