diff --git a/src/examples/progress-spinner-configurable/progress-spinner-configurable-example.html b/src/examples/progress-spinner-configurable/progress-spinner-configurable-example.html index a034e2f85150..8dcc52802e9c 100644 --- a/src/examples/progress-spinner-configurable/progress-spinner-configurable-example.html +++ b/src/examples/progress-spinner-configurable/progress-spinner-configurable-example.html @@ -1,6 +1,6 @@ -

Progress circle configuration

+

Progress spinner configuration

@@ -39,11 +39,11 @@

Progress circle configuration

Result

- - +
diff --git a/src/lib/core/compatibility/compatibility.ts b/src/lib/core/compatibility/compatibility.ts index 7bb8ee9eea1d..d3ad38676aa8 100644 --- a/src/lib/core/compatibility/compatibility.ts +++ b/src/lib/core/compatibility/compatibility.ts @@ -59,7 +59,6 @@ export const MAT_ELEMENTS_SELECTOR = ` mat-option, mat-placeholder, mat-progress-bar, - mat-progress-circle, mat-pseudo-checkbox, mat-radio-button, mat-radio-group, @@ -119,7 +118,6 @@ export const MD_ELEMENTS_SELECTOR = ` md-option, md-placeholder, md-progress-bar, - md-progress-circle, md-pseudo-checkbox, md-radio-button, md-radio-group, diff --git a/src/lib/progress-spinner/_progress-spinner-theme.scss b/src/lib/progress-spinner/_progress-spinner-theme.scss index 7b221c5abc16..fe9f8fef9ddc 100644 --- a/src/lib/progress-spinner/_progress-spinner-theme.scss +++ b/src/lib/progress-spinner/_progress-spinner-theme.scss @@ -7,7 +7,7 @@ $accent: map-get($theme, accent); $warn: map-get($theme, warn); - .mat-progress-spinner, .mat-progress-circle, .mat-spinner { + .mat-progress-spinner, .mat-spinner { path { stroke: mat-color($primary, 600); } diff --git a/src/lib/progress-spinner/index.ts b/src/lib/progress-spinner/index.ts index 113dc6f84d66..8021ed61e0c8 100644 --- a/src/lib/progress-spinner/index.ts +++ b/src/lib/progress-spinner/index.ts @@ -4,7 +4,6 @@ import { MdProgressSpinner, MdSpinner, MdProgressSpinnerCssMatStyler, - MdProgressCircleCssMatStyler } from './progress-spinner'; @@ -14,14 +13,12 @@ import { MdProgressSpinner, MdSpinner, CompatibilityModule, - MdProgressSpinnerCssMatStyler, - MdProgressCircleCssMatStyler + MdProgressSpinnerCssMatStyler ], declarations: [ MdProgressSpinner, MdSpinner, - MdProgressSpinnerCssMatStyler, - MdProgressCircleCssMatStyler + MdProgressSpinnerCssMatStyler ], }) class MdProgressSpinnerModule { @@ -36,7 +33,3 @@ class MdProgressSpinnerModule { export {MdProgressSpinnerModule}; export * from './progress-spinner'; - -/** @deprecated */ -export {MdProgressSpinnerModule as MdProgressCircleModule}; -export {MdProgressSpinner as MdProgressCircle}; diff --git a/src/lib/progress-spinner/progress-spinner.html b/src/lib/progress-spinner/progress-spinner.html index a6d4721c4a15..b0e07669ad68 100644 --- a/src/lib/progress-spinner/progress-spinner.html +++ b/src/lib/progress-spinner/progress-spinner.html @@ -1,6 +1,6 @@ component. */ @Component({ moduleId: module.id, - selector: 'md-progress-spinner, mat-progress-spinner, md-progress-circle, mat-progress-circle', + selector: 'md-progress-spinner, mat-progress-spinner', host: { 'role': 'progressbar', '[attr.aria-valuemin]': '_ariaValueMin',