Skip to content

Commit d24a5b3

Browse files
josephperrottjelbourn
authored andcommitted
fix(progress-circle): actually render on Firefox & Edge (#283)
1 parent 3294772 commit d24a5b3

File tree

2 files changed

+18
-14
lines changed

2 files changed

+18
-14
lines changed

src/components/progress-circle/progress-circle.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
-->
66
<svg viewBox="0 0 100 100"
77
preserveAspectRatio="xMidYMid meet">
8-
<circle [style.strokeDashoffset]="strokeDashOffset()"></circle>
8+
<circle [style.strokeDashoffset]="strokeDashOffset()"
9+
cx="50px" cy="50px" r="40px"></circle>
910
</svg>

src/components/progress-circle/progress-circle.scss

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ $md-progress-circle-sporadic-rotate-duration : $md-progress-circle-duration !def
1212
$md-progress-circle-stroke-width: 10px !default;
1313
$md-progress-circle-radius: 40px !default;
1414
$md-progress-circle-circumference: $pi * $md-progress-circle-radius * 2 !default;
15-
$md-progress-circle-center-point: 50px !default;
1615
// Height and weight of the viewport for md-progress-circle.
1716
$md-progress-circle-viewport-size : 100px !default;
1817

@@ -40,20 +39,17 @@ $md-progress-circle-viewport-size : 100px !default;
4039
svg {
4140
height: 100%;
4241
width: 100%;
42+
transform: rotate(-90deg);
43+
transform-origin: center;
4344
}
4445

4546

4647
circle {
47-
cx: $md-progress-circle-center-point;
48-
cy: $md-progress-circle-center-point;
4948
fill: transparent;
50-
r: $md-progress-circle-radius;
5149
stroke: md-color($md-primary, 600);
5250
/** Stroke width of 10px defines stroke as 10% of the viewBox */
5351
stroke-width: $md-progress-circle-stroke-width;
5452
/** SVG circle rotations begin rotated 90deg clockwise from the circle's center top */
55-
transform: rotate(-90deg);
56-
transform-origin: center;
5753
transition: stroke-dashoffset 0.225s linear;
5854
/** The dash array of the circle is defined as the circumference of the circle. */
5955
stroke-dasharray: $md-progress-circle-circumference;
@@ -73,18 +69,25 @@ $md-progress-circle-viewport-size : 100px !default;
7369
}
7470

7571

76-
&[mode="indeterminate"] circle {
72+
73+
74+
&[mode="indeterminate"] {
7775
animation-duration: $md-progress-circle-sporadic-rotate-duration,
78-
$md-progress-circle-constant-rotate-duration,
79-
$md-progress-circle-value-change-duration;
76+
$md-progress-circle-constant-rotate-duration;
8077
animation-name: md-progress-circle-sporadic-rotate,
81-
md-progress-circle-linear-rotate,
82-
md-progress-circle-value-change;
78+
md-progress-circle-linear-rotate;
8379
animation-timing-function: $ease-in-out-curve-function,
84-
linear,
85-
$ease-in-out-curve-function;
80+
linear;
8681
animation-iteration-count: infinite;
8782
transition: none;
83+
84+
circle {
85+
animation-duration: $md-progress-circle-value-change-duration;
86+
animation-name: md-progress-circle-value-change;
87+
animation-timing-function: $ease-in-out-curve-function;
88+
animation-iteration-count: infinite;
89+
transition: none;
90+
}
8891
}
8992
}
9093

0 commit comments

Comments
 (0)