feat(material/legacy-progress-bar): step 5. update the all-theme mixins

angular · Jul 12, 2022 · 0be06ba · 0be06ba
1 parent 3442d6a
commit 0be06ba
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 10 deletions.
diff --git a/src/material/core/_core.import.scss b/src/material/core/_core.import.scss
@@ -31,7 +31,7 @@
 @forward '../icon/icon-theme.import';
 @forward '../input/input-theme.import';
 @forward '../menu/menu-theme.import';
-@forward '../legacy-progress-bar/progress-bar-theme.import';
+@forward '../progress-bar/progress-bar-theme.import';
 @forward '../progress-spinner/progress-spinner-theme.import';
 @forward '../radio/radio-theme.import';
 @forward '../select/select-theme.import';

diff --git a/src/material/core/color/_all-color.import.scss b/src/material/core/color/_all-color.import.scss
@@ -32,7 +32,7 @@
 @forward '../../icon/icon-theme.import';
 @forward '../../input/input-theme.import';
 @forward '../../menu/menu-theme.import';
-@forward '../../legacy-progress-bar/progress-bar-theme.import';
+@forward '../../progress-bar/progress-bar-theme.import';
 @forward '../../progress-spinner/progress-spinner-theme.import';
 @forward '../../radio/radio-theme.import';
 @forward '../../select/select-theme.import';

diff --git a/src/material/core/density/private/_all-density.scss b/src/material/core/density/private/_all-density.scss
@@ -7,6 +7,7 @@
 @use '../../../form-field/form-field-theme';
 @use '../../../button-toggle/button-toggle-theme';
 @use '../../../card/card-theme';
+@use '../../../progress-bar/progress-bar-theme';
 
 // Includes all of the density styles.
 @mixin all-component-densities($config-or-theme) {
@@ -33,6 +34,7 @@
   @include form-field-theme.density($config);
   @include button-toggle-theme.density($config);
   @include card-theme.density($config);
+  @include progress-bar-theme.density($config);
 }
 
 

diff --git a/src/material/core/theming/_all-theme.import.scss b/src/material/core/theming/_all-theme.import.scss
@@ -32,7 +32,7 @@
 @forward '../../icon/icon-theme.import';
 @forward '../../input/input-theme.import';
 @forward '../../menu/menu-theme.import';
-@forward '../../legacy-progress-bar/progress-bar-theme.import';
+@forward '../../progress-bar/progress-bar-theme.import';
 @forward '../../progress-spinner/progress-spinner-theme.import';
 @forward '../../radio/radio-theme.import';
 @forward '../../select/select-theme.import';
@@ -68,7 +68,7 @@
 @import '../../list/list-theme';
 @import '../../menu/menu-theme';
 @import '../../paginator/paginator-theme';
-@import '../../legacy-progress-bar/progress-bar-theme';
+@import '../../progress-bar/progress-bar-theme';
 @import '../../progress-spinner/progress-spinner-theme';
 @import '../../radio/radio-theme';
 @import '../../select/select-theme';

diff --git a/src/material/core/theming/_all-theme.scss b/src/material/core/theming/_all-theme.scss
@@ -19,7 +19,7 @@
 @use '../../list/list-theme';
 @use '../../menu/menu-theme';
 @use '../../paginator/paginator-theme';
-@use '../../legacy-progress-bar/progress-bar-theme';
+@use '../../progress-bar/progress-bar-theme';
 @use '../../progress-spinner/progress-spinner-theme';
 @use '../../radio/radio-theme';
 @use '../../select/select-theme';

diff --git a/src/material/core/theming/tests/test-css-variables-theme.scss b/src/material/core/theming/tests/test-css-variables-theme.scss
@@ -22,7 +22,6 @@
 @use '../../../list/list-theme';
 @use '../../../menu/menu-theme';
 @use '../../../paginator/paginator-theme';
-@use '../../../legacy-progress-bar/progress-bar-theme';
 @use '../../../progress-spinner/progress-spinner-theme';
 @use '../../../radio/radio-theme';
 @use '../../../select/select-theme';
@@ -86,7 +85,6 @@
   @include list-theme.theme($css-var-theme);
   @include menu-theme.theme($css-var-theme);
   @include paginator-theme.theme($css-var-theme);
-  @include progress-bar-theme.theme($css-var-theme);
   @include progress-spinner-theme.theme($css-var-theme);
   @include radio-theme.theme($css-var-theme);
   @include select-theme.theme($css-var-theme);

diff --git a/src/material/core/typography/_all-typography.import.scss b/src/material/core/typography/_all-typography.import.scss
@@ -24,7 +24,7 @@
 @forward '../../icon/icon-theme.import';
 @forward '../../input/input-theme.import';
 @forward '../../menu/menu-theme.import';
-@forward '../../legacy-progress-bar/progress-bar-theme.import';
+@forward '../../progress-bar/progress-bar-theme.import';
 @forward '../../progress-spinner/progress-spinner-theme.import';
 @forward '../../radio/radio-theme.import';
 @forward '../../select/select-theme.import';
@@ -57,7 +57,7 @@
 @import '../../list/list-theme';
 @import '../../menu/menu-theme';
 @import '../../paginator/paginator-theme';
-@import '../../legacy-progress-bar/progress-bar-theme';
+@import '../../progress-bar/progress-bar-theme';
 @import '../../progress-spinner/progress-spinner-theme';
 @import '../../radio/radio-theme';
 @import '../../select/select-theme';

diff --git a/src/material/core/typography/_all-typography.scss b/src/material/core/typography/_all-typography.scss
@@ -18,7 +18,7 @@
 @use '../../list/list-theme';
 @use '../../menu/menu-theme';
 @use '../../paginator/paginator-theme';
-@use '../../legacy-progress-bar/progress-bar-theme';
+@use '../../progress-bar/progress-bar-theme';
 @use '../../progress-spinner/progress-spinner-theme';
 @use '../../radio/radio-theme';
 @use '../../select/select-theme';

diff --git a/src/material/legacy-core/theming/_all-theme.scss b/src/material/legacy-core/theming/_all-theme.scss
@@ -1,11 +1,13 @@
 @use '../../core/theming/theming';
 @use '../../legacy-card/card-theme';
+@use '../../legacy-progress-bar/progress-bar-theme';
 
 // Create a theme.
 @mixin all-legacy-component-themes($theme-or-color-config) {
   $dedupe-key: 'angular-material-legacy-theme';
   @include theming.private-check-duplicate-theme-styles($theme-or-color-config, $dedupe-key) {
     @include card-theme.theme($theme-or-color-config);
+    @include progress-bar-theme.theme($theme-or-color-config);
   }
 }
 

diff --git a/src/material/legacy-core/typography/_all-typography.scss b/src/material/legacy-core/typography/_all-typography.scss
@@ -1,6 +1,7 @@
 @use '../../core/typography/typography';
 @use '../../core/theming/theming';
 @use '../../legacy-card/card-theme';
+@use '../../legacy-progress-bar/progress-bar-theme';
 
 // Includes all of the typographic styles.
 @mixin all-legacy-component-typographies($config-or-theme: null) {
@@ -19,6 +20,7 @@
   // would then load `all-theme` again. This ultimately results a circular dependency.
 
   @include card-theme.typography($config);
+  @include progress-bar-theme.typography($config);
 }
 
 // @deprecated Use `all-legacy-component-typographies`.