Skip to content

Commit 4611c76

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-dialog` with `dialog` 2. Under `src/material/core/density/private/_all-density.scss` add an `@include` for the new `dialog-theme.density` mixin 3. Under `src/material/legacy-core/theming/_all-theme.scss` add an `@include` for the legacy `dialog.theme` mixin 4. Under `src/material/legacy-core/typography/_all-typography.scss` add an `@include` for the legacy `dialog.typography` mixin 5. In `src/material/core/theming/tests/test-css-variables-theme.scss` remove the `@include` of `dialog-theme.theme` 6. Run `yarn format`
1 parent 0612364 commit 4611c76

File tree

11 files changed

+21
-15
lines changed

11 files changed

+21
-15
lines changed

src/material/core/_core.import.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
@forward '../checkbox/checkbox-theme.import';
2626
@forward '../divider/divider-theme.import';
2727
@forward '../table/table-theme.import';
28-
@forward '../legacy-dialog/dialog-theme.import';
28+
@forward '../dialog/dialog-theme.import';
2929
@forward '../list/list-theme.import';
3030
@forward '../grid-list/grid-list-theme.import';
3131
@forward '../icon/icon-theme.import';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
@forward '../../checkbox/checkbox-theme.import';
2727
@forward '../../divider/divider-theme.import';
2828
@forward '../../table/table-theme.import';
29-
@forward '../../legacy-dialog/dialog-theme.import';
29+
@forward '../../dialog/dialog-theme.import';
3030
@forward '../../list/list-theme.import';
3131
@forward '../../grid-list/grid-list-theme.import';
3232
@forward '../../icon/icon-theme.import';

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
@use '../../../input/input-theme';
1313
@use '../../../core/option/option-theme';
1414
@use '../../../core/option/optgroup-theme';
15+
@use '../../../dialog/dialog-theme';
1516

1617
@mixin private-all-unmigrated-component-densities($config) {
1718
@include expansion-theme.density($config);
@@ -20,9 +21,6 @@
2021
@include tree-theme.density($config);
2122
@include paginator-theme.density($config);
2223
@include button-toggle-theme.density($config);
23-
@include card-theme.density($config);
24-
@include progress-bar-theme.density($config);
25-
@include tooltip-theme.density($config);
2624
}
2725

2826
// Includes all of the density styles.
@@ -42,9 +40,13 @@
4240
// mixin that is transitively loaded by the `all-theme` file, imports `all-density` which
4341
// would then load `all-theme` again. This ultimately results a circular dependency.
4442
@include form-field-theme.density($config);
43+
@include card-theme.density($config);
44+
@include progress-bar-theme.density($config);
45+
@include tooltip-theme.density($config);
4546
@include input-theme.density($config);
4647
@include option-theme.density($config);
4748
@include optgroup-theme.density($config);
49+
@include dialog-theme.density($config);
4850
@include private-all-unmigrated-component-densities($config);
4951
}
5052

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
@forward '../../checkbox/checkbox-theme.import';
2727
@forward '../../divider/divider-theme.import';
2828
@forward '../../table/table-theme.import';
29-
@forward '../../legacy-dialog/dialog-theme.import';
29+
@forward '../../dialog/dialog-theme.import';
3030
@forward '../../list/list-theme.import';
3131
@forward '../../grid-list/grid-list-theme.import';
3232
@forward '../../icon/icon-theme.import';
@@ -59,7 +59,7 @@
5959
@import '../../chips/chips-theme';
6060
@import '../../table/table-theme';
6161
@import '../../datepicker/datepicker-theme';
62-
@import '../../legacy-dialog/dialog-theme';
62+
@import '../../dialog/dialog-theme';
6363
@import '../../divider/divider-theme';
6464
@import '../../expansion/expansion-theme';
6565
@import '../../grid-list/grid-list-theme';

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
@use '../../chips/chips-theme';
1111
@use '../../table/table-theme';
1212
@use '../../datepicker/datepicker-theme';
13-
@use '../../legacy-dialog/dialog-theme';
13+
@use '../../dialog/dialog-theme';
1414
@use '../../divider/divider-theme';
1515
@use '../../expansion/expansion-theme';
1616
@use '../../grid-list/grid-list-theme';
@@ -46,7 +46,6 @@
4646
@include chips-theme.theme($theme-or-color-config);
4747
@include table-theme.theme($theme-or-color-config);
4848
@include datepicker-theme.theme($theme-or-color-config);
49-
@include dialog-theme.theme($theme-or-color-config);
5049
@include divider-theme.theme($theme-or-color-config);
5150
@include expansion-theme.theme($theme-or-color-config);
5251
@include grid-list-theme.theme($theme-or-color-config);
@@ -78,6 +77,7 @@
7877
@include tooltip-theme.theme($theme-or-color-config);
7978
@include form-field-theme.theme($theme-or-color-config);
8079
@include input-theme.theme($theme-or-color-config);
80+
@include dialog-theme.theme($theme-or-color-config);
8181
@include private-all-unmigrated-component-themes($theme-or-color-config);
8282
}
8383
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
@use '../../../chips/chips-theme';
1313
@use '../../../table/table-theme';
1414
@use '../../../datepicker/datepicker-theme';
15-
@use '../../../legacy-dialog/dialog-theme';
1615
@use '../../../divider/divider-theme';
1716
@use '../../../expansion/expansion-theme';
1817
@use '../../../grid-list/grid-list-theme';
@@ -70,7 +69,6 @@
7069
@include chips-theme.theme($css-var-theme);
7170
@include table-theme.theme($css-var-theme);
7271
@include datepicker-theme.theme($css-var-theme);
73-
@include dialog-theme.theme($css-var-theme);
7472
@include divider-theme.theme($css-var-theme);
7573
@include expansion-theme.theme($css-var-theme);
7674
@include grid-list-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
@@ -18,7 +18,7 @@
1818
@forward '../../checkbox/checkbox-theme.import';
1919
@forward '../../divider/divider-theme.import';
2020
@forward '../../table/table-theme.import';
21-
@forward '../../legacy-dialog/dialog-theme.import';
21+
@forward '../../dialog/dialog-theme.import';
2222
@forward '../../list/list-theme.import';
2323
@forward '../../grid-list/grid-list-theme.import';
2424
@forward '../../icon/icon-theme.import';
@@ -49,7 +49,7 @@
4949
@import '../../divider/divider-theme';
5050
@import '../../table/table-theme';
5151
@import '../../datepicker/datepicker-theme';
52-
@import '../../legacy-dialog/dialog-theme';
52+
@import '../../dialog/dialog-theme';
5353
@import '../../expansion/expansion-theme';
5454
@import '../../grid-list/grid-list-theme';
5555
@import '../../icon/icon-theme';

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
@use '../../divider/divider-theme';
1111
@use '../../table/table-theme';
1212
@use '../../datepicker/datepicker-theme';
13-
@use '../../legacy-dialog/dialog-theme';
13+
@use '../../dialog/dialog-theme';
1414
@use '../../expansion/expansion-theme';
1515
@use '../../grid-list/grid-list-theme';
1616
@use '../../icon/icon-theme';
@@ -49,7 +49,6 @@
4949
@include divider-theme.typography($config);
5050
@include table-theme.typography($config);
5151
@include datepicker-theme.typography($config);
52-
@include dialog-theme.typography($config);
5352
@include expansion-theme.typography($config);
5453
@include grid-list-theme.typography($config);
5554
@include icon-theme.typography($config);
@@ -94,6 +93,7 @@
9493
@include tooltip-theme.typography($config);
9594
@include form-field-theme.typography($config);
9695
@include input-theme.typography($config);
96+
@include dialog-theme.typography($config);
9797
}
9898

9999
// @deprecated Use `all-component-typographies`.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
@use '../../../core/theming/theming';
22
@use '../../../core/density/private/all-density';
3+
@use '../../../legacy-form-field/form-field-theme';
34

45
// Add legacy theme imports here, e.g.:
56
// @use '../../../<legacy-component>/<legacy-component>-theme';
@@ -23,6 +24,7 @@
2324

2425
// Add legacy density includes here, e.g.:
2526
// @include <legacy-component>-theme.density($config);
27+
@include form-field-theme.density($config);
2628
@include all-density.private-all-unmigrated-component-densities($config);
2729
}
2830

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

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

1011
// Create a theme.
1112
@mixin all-legacy-component-themes($theme-or-color-config) {
@@ -17,6 +18,7 @@
1718
@include tooltip-theme.theme($theme-or-color-config);
1819
@include input-theme.theme($theme-or-color-config);
1920
@include form-field-theme.theme($theme-or-color-config);
21+
@include dialog-theme.theme($theme-or-color-config);
2022
@include all-theme.private-all-unmigrated-component-themes($theme-or-color-config);
2123
}
2224
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
@use '../../legacy-tooltip/tooltip-theme';
99
@use '../../legacy-input/input-theme';
1010
@use '../../legacy-form-field/form-field-theme';
11+
@use '../../legacy-dialog/dialog-theme';
1112

1213
// Includes all of the typographic styles.
1314
@mixin all-legacy-component-typographies($config-or-theme: null) {
@@ -33,6 +34,7 @@
3334
@include tooltip-theme.typography($config);
3435
@include input-theme.typography($config);
3536
@include form-field-theme.typography($config);
37+
@include dialog-theme.typography($config);
3638
}
3739

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

0 commit comments

Comments
 (0)