Skip to content

Commit e090662

Browse files
committed
5. Update the "all theme" mixins
Perform the following steps to update the theme mixins: 1. Under `src/material/core` find and replace `legacy-<component>` with `<component>` 2. Under `src/material/core/density/private/_all-density.scss` add an @include for the new `<component>-theme.density` mixin 3. Under `src/material/legacy-core/theming/_all-theme.scss` add an @include for the legacy `<component>.theme` mixin 4. Under `src/material/legacy-core/typography/_all-typography.scss` add an @include for the legacy `<component>.typography` mixin 5. Run `yarn format`
1 parent ca24cd4 commit e090662

File tree

9 files changed

+14
-18
lines changed

9 files changed

+14
-18
lines changed

src/material/core/_core.import.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
@forward 'typography/typography.import';
2222
@forward '../autocomplete/autocomplete-theme.import';
2323
@forward '../bottom-sheet/bottom-sheet-theme.import';
24-
@forward '../legacy-card/card-theme.import';
24+
@forward '../card/card-theme.import';
2525
@forward '../checkbox/checkbox-theme.import';
2626
@forward '../divider/divider-theme.import';
2727
@forward '../table/table-theme.import';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
@forward '../typography/typography.import';
2323
@forward '../../autocomplete/autocomplete-theme.import';
2424
@forward '../../bottom-sheet/bottom-sheet-theme.import';
25-
@forward '../../legacy-card/card-theme.import';
25+
@forward '../../card/card-theme.import';
2626
@forward '../../checkbox/checkbox-theme.import';
2727
@forward '../../divider/divider-theme.import';
2828
@forward '../../table/table-theme.import';

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
@use '../../../paginator/paginator-theme';
77
@use '../../../form-field/form-field-theme';
88
@use '../../../button-toggle/button-toggle-theme';
9+
@use '../../../card/card-theme';
910

1011
// Includes all of the density styles.
1112
@mixin all-component-densities($config-or-theme) {
@@ -31,6 +32,7 @@
3132
@include paginator-theme.density($config);
3233
@include form-field-theme.density($config);
3334
@include button-toggle-theme.density($config);
35+
@include card-theme.density($config);
3436
}
3537

3638

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
@forward '../typography/typography.import';
2323
@forward '../../autocomplete/autocomplete-theme.import';
2424
@forward '../../bottom-sheet/bottom-sheet-theme.import';
25-
@forward '../../legacy-card/card-theme.import';
25+
@forward '../../card/card-theme.import';
2626
@forward '../../checkbox/checkbox-theme.import';
2727
@forward '../../divider/divider-theme.import';
2828
@forward '../../table/table-theme.import';
@@ -54,7 +54,7 @@
5454
@import '../../bottom-sheet/bottom-sheet-theme';
5555
@import '../../button/button-theme';
5656
@import '../../button-toggle/button-toggle-theme';
57-
@import '../../legacy-card/card-theme';
57+
@import '../../card/card-theme';
5858
@import '../../checkbox/checkbox-theme';
5959
@import '../../chips/chips-theme';
6060
@import '../../table/table-theme';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
@use '../../bottom-sheet/bottom-sheet-theme';
66
@use '../../button/button-theme';
77
@use '../../button-toggle/button-toggle-theme';
8-
@use '../../legacy-card/card-theme';
8+
@use '../../card/card-theme';
99
@use '../../checkbox/checkbox-theme';
1010
@use '../../chips/chips-theme';
1111
@use '../../table/table-theme';

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
@forward 'typography.import';
1515
@forward '../../autocomplete/autocomplete-theme.import';
1616
@forward '../../bottom-sheet/bottom-sheet-theme.import';
17-
@forward '../../legacy-card/card-theme.import';
17+
@forward '../../card/card-theme.import';
1818
@forward '../../checkbox/checkbox-theme.import';
1919
@forward '../../divider/divider-theme.import';
2020
@forward '../../table/table-theme.import';
@@ -43,7 +43,7 @@
4343
@import '../../bottom-sheet/bottom-sheet-theme';
4444
@import '../../button/button-theme';
4545
@import '../../button-toggle/button-toggle-theme';
46-
@import '../../legacy-card/card-theme';
46+
@import '../../card/card-theme';
4747
@import '../../checkbox/checkbox-theme';
4848
@import '../../chips/chips-theme';
4949
@import '../../divider/divider-theme';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
@use '../../bottom-sheet/bottom-sheet-theme';
55
@use '../../button/button-theme';
66
@use '../../button-toggle/button-toggle-theme';
7-
@use '../../legacy-card/card-theme';
7+
@use '../../card/card-theme';
88
@use '../../checkbox/checkbox-theme';
99
@use '../../chips/chips-theme';
1010
@use '../../divider/divider-theme';

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
@use '../../core/theming/theming';
2-
3-
// Add legacy theme imports here, e.g.:
4-
// @use '../../<legacy-component>/<legacy-component>-theme';
2+
@use '../../legacy-card/card-theme';
53

64
// Create a theme.
75
@mixin all-legacy-component-themes($theme-or-color-config) {
86
$dedupe-key: 'angular-material-legacy-theme';
97
@include theming.private-check-duplicate-theme-styles($theme-or-color-config, $dedupe-key) {
10-
// Add legacy theme includes here, e.g.:
11-
// @include <legacy-component>-theme.theme($theme-or-color-config);
8+
@include card-theme.theme($theme-or-color-config);
129
}
1310
}
1411

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
@use '../../core/typography/typography';
22
@use '../../core/theming/theming';
3-
4-
// Add legacy theme imports here, e.g.:
5-
// @use '../../<legacy-component>/<legacy-component>-theme';
3+
@use '../../legacy-card/card-theme';
64

75
// Includes all of the typographic styles.
86
@mixin all-legacy-component-typographies($config-or-theme: null) {
@@ -20,8 +18,7 @@
2018
// mixin that is transitively loaded by the `all-theme` file, imports `all-typography` which
2119
// would then load `all-theme` again. This ultimately results a circular dependency.
2220

23-
// Add legacy typography includes here, e.g.:
24-
// @include <legacy-component>-theme.typography($config);
21+
@include card-theme.typography($config);
2522
}
2623

2724
// @deprecated Use `all-legacy-component-typographies`.

0 commit comments

Comments
 (0)