Skip to content

Commit d55ec61

Browse files
committedNov 11, 2024·
fix(material/core): update prebuilt themes to use mat.theme (#29989)
Co-authored-by: Andrew Seguin <andrewseguin@google.com> (cherry picked from commit 1568ac2)
1 parent d0d59b7 commit d55ec61

File tree

4 files changed

+40
-92
lines changed

4 files changed

+40
-92
lines changed
 
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,14 @@
1-
@use '../../theming/definition';
2-
@use '../../theming/color-api-backwards-compatibility';
31
@use '../../theming/palettes';
4-
@use '../all-theme';
5-
@use '../../core';
6-
@use '../../typography/typography';
7-
8-
@include core.app-background();
9-
@include core.elevation-classes();
10-
11-
$theme: definition.define-theme((
12-
color: (
13-
theme-type: light,
14-
primary: palettes.$azure-palette,
15-
tertiary: palettes.$blue-palette,
16-
),
17-
density: (
18-
scale: 0,
19-
)
20-
));
2+
@use '../../../core/tokens/m3-system';
213

224
html {
23-
@include all-theme.all-component-themes($theme);
5+
@include m3-system.theme((
6+
color: (
7+
theme-type: light,
8+
primary: palettes.$azure-palette,
9+
tertiary: palettes.$blue-palette,
10+
),
11+
typography: Roboto,
12+
density: 0,
13+
));
2414
}
25-
26-
@include color-api-backwards-compatibility.color-variants-backwards-compatibility($theme);
27-
@include typography.typography-hierarchy($theme);
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,14 @@
1-
@use '../../theming/definition';
2-
@use '../../theming/color-api-backwards-compatibility';
31
@use '../../theming/palettes';
4-
@use '../all-theme';
5-
@use '../../core';
6-
@use '../../typography/typography';
7-
8-
@include core.app-background();
9-
@include core.elevation-classes();
10-
11-
$theme: definition.define-theme((
12-
color: (
13-
theme-type: dark,
14-
primary: palettes.$cyan-palette,
15-
tertiary: palettes.$orange-palette,
16-
),
17-
density: (
18-
scale: 0,
19-
)
20-
));
2+
@use '../../../core/tokens/m3-system';
213

224
html {
23-
@include all-theme.all-component-themes($theme);
5+
@include m3-system.theme((
6+
color: (
7+
theme-type: dark,
8+
primary: palettes.$cyan-palette,
9+
tertiary: palettes.$orange-palette,
10+
),
11+
typography: Roboto,
12+
density: 0,
13+
));
2414
}
25-
26-
@include color-api-backwards-compatibility.color-variants-backwards-compatibility($theme);
27-
@include typography.typography-hierarchy($theme);
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,14 @@
1-
@use '../../theming/definition';
2-
@use '../../theming/color-api-backwards-compatibility';
31
@use '../../theming/palettes';
4-
@use '../all-theme';
5-
@use '../../core';
6-
@use '../../typography/typography';
7-
8-
@include core.app-background();
9-
@include core.elevation-classes();
10-
11-
$theme: definition.define-theme((
12-
color: (
13-
theme-type: dark,
14-
primary: palettes.$magenta-palette,
15-
tertiary: palettes.$violet-palette,
16-
),
17-
density: (
18-
scale: 0,
19-
)
20-
));
2+
@use '../../../core/tokens/m3-system';
213

224
html {
23-
@include all-theme.all-component-themes($theme);
5+
@include m3-system.theme((
6+
color: (
7+
theme-type: dark,
8+
primary: palettes.$magenta-palette,
9+
tertiary: palettes.$violet-palette,
10+
),
11+
typography: Roboto,
12+
density: 0,
13+
));
2414
}
25-
26-
@include color-api-backwards-compatibility.color-variants-backwards-compatibility($theme);
27-
@include typography.typography-hierarchy($theme);
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,14 @@
1-
@use '../../theming/definition';
2-
@use '../../theming/color-api-backwards-compatibility';
31
@use '../../theming/palettes';
4-
@use '../all-theme';
5-
@use '../../core';
6-
@use '../../typography/typography';
7-
8-
@include core.app-background();
9-
@include core.elevation-classes();
10-
11-
$theme: definition.define-theme((
12-
color: (
13-
theme-type: light,
14-
primary: palettes.$rose-palette,
15-
tertiary: palettes.$red-palette,
16-
),
17-
density: (
18-
scale: 0,
19-
)
20-
));
2+
@use '../../../core/tokens/m3-system';
213

224
html {
23-
@include all-theme.all-component-themes($theme);
5+
@include m3-system.theme((
6+
color: (
7+
theme-type: light,
8+
primary: palettes.$rose-palette,
9+
tertiary: palettes.$red-palette,
10+
),
11+
typography: Roboto,
12+
density: 0,
13+
));
2414
}
25-
26-
@include color-api-backwards-compatibility.color-variants-backwards-compatibility($theme);
27-
@include typography.typography-hierarchy($theme);

0 commit comments

Comments
 (0)
Please sign in to comment.