Skip to content

Commit 2a1e03d

Browse files
committed
feat(material/legacy-progress-bar): step 5. update the all-theme mixins
1 parent ef68651 commit 2a1e03d

File tree

10 files changed

+14
-10
lines changed

10 files changed

+14
-10
lines changed

src/material/core/_core.import.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
@forward '../icon/icon-theme.import';
3232
@forward '../input/input-theme.import';
3333
@forward '../menu/menu-theme.import';
34-
@forward '../legacy-progress-bar/progress-bar-theme.import';
34+
@forward '../progress-bar/progress-bar-theme.import';
3535
@forward '../progress-spinner/progress-spinner-theme.import';
3636
@forward '../radio/radio-theme.import';
3737
@forward '../select/select-theme.import';

src/material/core/color/_all-color.import.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
@forward '../../icon/icon-theme.import';
3333
@forward '../../input/input-theme.import';
3434
@forward '../../menu/menu-theme.import';
35-
@forward '../../legacy-progress-bar/progress-bar-theme.import';
35+
@forward '../../progress-bar/progress-bar-theme.import';
3636
@forward '../../progress-spinner/progress-spinner-theme.import';
3737
@forward '../../radio/radio-theme.import';
3838
@forward '../../select/select-theme.import';

src/material/core/density/private/_all-density.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
@use '../../../form-field/form-field-theme';
88
@use '../../../button-toggle/button-toggle-theme';
99
@use '../../../card/card-theme';
10+
@use '../../../progress-bar/progress-bar-theme';
1011
@use '../../../tooltip/tooltip-theme';
1112

1213
// Includes all of the density styles.
@@ -34,6 +35,7 @@
3435
@include form-field-theme.density($config);
3536
@include button-toggle-theme.density($config);
3637
@include card-theme.density($config);
38+
@include progress-bar-theme.density($config);
3739
@include tooltip-theme.density($config);
3840
}
3941

src/material/core/theming/_all-theme.import.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
@forward '../../icon/icon-theme.import';
3333
@forward '../../input/input-theme.import';
3434
@forward '../../menu/menu-theme.import';
35-
@forward '../../legacy-progress-bar/progress-bar-theme.import';
35+
@forward '../../progress-bar/progress-bar-theme.import';
3636
@forward '../../progress-spinner/progress-spinner-theme.import';
3737
@forward '../../radio/radio-theme.import';
3838
@forward '../../select/select-theme.import';
@@ -68,7 +68,7 @@
6868
@import '../../list/list-theme';
6969
@import '../../menu/menu-theme';
7070
@import '../../paginator/paginator-theme';
71-
@import '../../legacy-progress-bar/progress-bar-theme';
71+
@import '../../progress-bar/progress-bar-theme';
7272
@import '../../progress-spinner/progress-spinner-theme';
7373
@import '../../radio/radio-theme';
7474
@import '../../select/select-theme';

src/material/core/theming/_all-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
@use '../../list/list-theme';
2020
@use '../../menu/menu-theme';
2121
@use '../../paginator/paginator-theme';
22-
@use '../../legacy-progress-bar/progress-bar-theme';
22+
@use '../../progress-bar/progress-bar-theme';
2323
@use '../../progress-spinner/progress-spinner-theme';
2424
@use '../../radio/radio-theme';
2525
@use '../../select/select-theme';

src/material/core/theming/tests/test-css-variables-theme.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
@use '../../../list/list-theme';
2323
@use '../../../menu/menu-theme';
2424
@use '../../../paginator/paginator-theme';
25-
@use '../../../legacy-progress-bar/progress-bar-theme';
2625
@use '../../../progress-spinner/progress-spinner-theme';
2726
@use '../../../radio/radio-theme';
2827
@use '../../../select/select-theme';
@@ -85,7 +84,6 @@
8584
@include list-theme.theme($css-var-theme);
8685
@include menu-theme.theme($css-var-theme);
8786
@include paginator-theme.theme($css-var-theme);
88-
@include progress-bar-theme.theme($css-var-theme);
8987
@include progress-spinner-theme.theme($css-var-theme);
9088
@include radio-theme.theme($css-var-theme);
9189
@include select-theme.theme($css-var-theme);

src/material/core/typography/_all-typography.import.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
@forward '../../icon/icon-theme.import';
2525
@forward '../../input/input-theme.import';
2626
@forward '../../menu/menu-theme.import';
27-
@forward '../../legacy-progress-bar/progress-bar-theme.import';
27+
@forward '../../progress-bar/progress-bar-theme.import';
2828
@forward '../../progress-spinner/progress-spinner-theme.import';
2929
@forward '../../radio/radio-theme.import';
3030
@forward '../../select/select-theme.import';
@@ -57,7 +57,7 @@
5757
@import '../../list/list-theme';
5858
@import '../../menu/menu-theme';
5959
@import '../../paginator/paginator-theme';
60-
@import '../../legacy-progress-bar/progress-bar-theme';
60+
@import '../../progress-bar/progress-bar-theme';
6161
@import '../../progress-spinner/progress-spinner-theme';
6262
@import '../../radio/radio-theme';
6363
@import '../../select/select-theme';

src/material/core/typography/_all-typography.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
@use '../../list/list-theme';
1919
@use '../../menu/menu-theme';
2020
@use '../../paginator/paginator-theme';
21-
@use '../../legacy-progress-bar/progress-bar-theme';
21+
@use '../../progress-bar/progress-bar-theme';
2222
@use '../../progress-spinner/progress-spinner-theme';
2323
@use '../../radio/radio-theme';
2424
@use '../../select/select-theme';

src/material/legacy-core/theming/_all-theme.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
@use '../../core/theming/theming';
22
@use '../../legacy-card/card-theme';
3+
@use '../../legacy-progress-bar/progress-bar-theme';
34
@use '../../legacy-tooltip/tooltip-theme';
45

56
// Create a theme.
67
@mixin all-legacy-component-themes($theme-or-color-config) {
78
$dedupe-key: 'angular-material-legacy-theme';
89
@include theming.private-check-duplicate-theme-styles($theme-or-color-config, $dedupe-key) {
910
@include card-theme.theme($theme-or-color-config);
11+
@include progress-bar-theme.theme($theme-or-color-config);
1012
@include tooltip-theme.theme($theme-or-color-config);
1113
}
1214
}

src/material/legacy-core/typography/_all-typography.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@use '../../core/typography/typography';
22
@use '../../core/theming/theming';
33
@use '../../legacy-card/card-theme';
4+
@use '../../legacy-progress-bar/progress-bar-theme';
45
@use '../../legacy-tooltip/tooltip-theme';
56

67
// Includes all of the typographic styles.
@@ -20,6 +21,7 @@
2021
// would then load `all-theme` again. This ultimately results a circular dependency.
2122

2223
@include card-theme.typography($config);
24+
@include progress-bar-theme.typography($config);
2325
@include tooltip-theme.typography($config);
2426
}
2527

0 commit comments

Comments
 (0)