diff --git a/src/demo-app/progress-spinner/progress-spinner-demo.html b/src/demo-app/progress-spinner/progress-spinner-demo.html
index 27a9dfcec7c3..01eeeff43b82 100644
--- a/src/demo-app/progress-spinner/progress-spinner-demo.html
+++ b/src/demo-app/progress-spinner/progress-spinner-demo.html
@@ -9,9 +9,9 @@
Determinate
+ [value]="progressValue" color="primary" [strokeWidth]="1" [diameter]="32">
+ [value]="progressValue" color="accent" [diameter]="50">
Indeterminate
diff --git a/src/lib/progress-spinner/_progress-spinner-theme.scss b/src/lib/progress-spinner/_progress-spinner-theme.scss
index a062443d0043..353cb3cf0be7 100644
--- a/src/lib/progress-spinner/_progress-spinner-theme.scss
+++ b/src/lib/progress-spinner/_progress-spinner-theme.scss
@@ -8,15 +8,15 @@
$warn: map-get($theme, warn);
.mat-progress-spinner, .mat-spinner {
- path {
+ circle {
stroke: mat-color($primary);
}
- &.mat-accent path {
+ &.mat-accent circle {
stroke: mat-color($accent);
}
- &.mat-warn path {
+ &.mat-warn circle {
stroke: mat-color($warn);
}
}
diff --git a/src/lib/progress-spinner/progress-spinner-module.ts b/src/lib/progress-spinner/progress-spinner-module.ts
index 11e7e841acab..abbef18f3c5f 100644
--- a/src/lib/progress-spinner/progress-spinner-module.ts
+++ b/src/lib/progress-spinner/progress-spinner-module.ts
@@ -5,28 +5,23 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/
-
import {NgModule} from '@angular/core';
+import {PlatformModule} from '@angular/cdk/platform';
import {MatCommonModule} from '@angular/material/core';
-import {
- MatProgressSpinner,
- MatSpinner,
- MatProgressSpinnerCssMatStyler,
-} from './progress-spinner';
-
+import {MatProgressSpinner, MatSpinner} from './progress-spinner';
@NgModule({
- imports: [MatCommonModule],
+ imports: [MatCommonModule, PlatformModule],
exports: [
MatProgressSpinner,
MatSpinner,
- MatCommonModule,
- MatProgressSpinnerCssMatStyler
+ MatCommonModule
],
declarations: [
MatProgressSpinner,
- MatSpinner,
- MatProgressSpinnerCssMatStyler
+ MatSpinner
],
})
-export class MatProgressSpinnerModule {}
+class MatProgressSpinnerModule {}
+
+export {MatProgressSpinnerModule};
diff --git a/src/lib/progress-spinner/progress-spinner.html b/src/lib/progress-spinner/progress-spinner.html
index bb27e80f90b6..237f087fcb07 100644
--- a/src/lib/progress-spinner/progress-spinner.html
+++ b/src/lib/progress-spinner/progress-spinner.html
@@ -4,8 +4,21 @@
element containing the SVG. `focusable="false"` prevents IE from allowing the user to
tab into the SVG element.
-->
-