Skip to content

Commit 6b59ccc

Browse files
committed
fix(material/core): Allow typography mixin to consume 2018 style configs
See angular#21059 for context.
1 parent 89d5790 commit 6b59ccc

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

src/material/core/option/_optgroup-theme.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
@import '../theming/palette';
22
@import '../theming/theming';
3+
@import '../typography/typography';
34
@import '../typography/typography-utils';
45

56
@mixin mat-optgroup-color($config-or-theme) {
@@ -16,6 +17,7 @@
1617
}
1718

1819
@mixin mat-optgroup-typography($config-or-theme) {
20+
$config: mat-private-typography-normalized-config(mat-get-typography-config($config-or-theme));
1921
$config: mat-get-typography-config($config-or-theme);
2022
.mat-optgroup-label {
2123
@include mat-typography-level-to-styles($config, body-2);

src/material/core/option/_option-theme.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
@import '../theming/palette';
22
@import '../theming/theming';
3+
@import '../typography/typography';
34
@import '../typography/typography-utils';
45

56
@mixin mat-option-color($config-or-theme) {
@@ -47,6 +48,7 @@
4748
}
4849

4950
@mixin mat-option-typography($config-or-theme) {
51+
$config: mat-private-typography-normalized-config(mat-get-typography-config($config-or-theme));
5052
$config: mat-get-typography-config($config-or-theme);
5153
.mat-option {
5254
font: {

0 commit comments

Comments
 (0)