Skip to content

Commit 36901ab

Browse files
committed
fix(material/form-field): Allow typography mixin to consume 2018 style configs
See angular#21059 for context.
1 parent 89d5790 commit 36901ab

File tree

4 files changed

+8
-0
lines changed

4 files changed

+8
-0
lines changed

src/material/form-field/_form-field-fill-theme.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@import '../core/theming/palette';
22
@import '../core/theming/theming';
33
@import '../core/style/form-common';
4+
@import '../core/typography/typography';
45
@import '../core/typography/typography-utils';
56

67

@@ -57,6 +58,7 @@ $mat-form-field-fill-dedupe: 0;
5758
}
5859

5960
@mixin mat-form-field-fill-typography($config-or-theme) {
61+
$config: mat-private-typography-normalized-config(mat-get-typography-config($config-or-theme));
6062
$config: mat-get-typography-config($config-or-theme);
6163
// The unit-less line-height from the font config.
6264
$line-height: mat-line-height($config, input);

src/material/form-field/_form-field-legacy-theme.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@import '../core/theming/palette';
22
@import '../core/theming/theming';
33
@import '../core/style/form-common';
4+
@import '../core/typography/typography';
45
@import '../core/typography/typography-utils';
56

67

@@ -69,6 +70,7 @@ $mat-form-field-legacy-dedupe: 0;
6970
}
7071

7172
@mixin mat-form-field-legacy-typography($config-or-theme) {
73+
$config: mat-private-typography-normalized-config(mat-get-typography-config($config-or-theme));
7274
$config: mat-get-typography-config($config-or-theme);
7375
// The unit-less line-height from the font config.
7476
$line-height: mat-line-height($config, input);

src/material/form-field/_form-field-outline-theme.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@import '../core/theming/palette';
22
@import '../core/theming/theming';
33
@import '../core/style/form-common';
4+
@import '../core/typography/typography';
45
@import '../core/typography/typography-utils';
56

67

@@ -80,6 +81,7 @@ $mat-form-field-outline-dedupe: 0;
8081
}
8182

8283
@mixin mat-form-field-outline-typography($config-or-theme) {
84+
$config: mat-private-typography-normalized-config(mat-get-typography-config($config-or-theme));
8385
$config: mat-get-typography-config($config-or-theme);
8486
// The unit-less line-height from the font config.
8587
$line-height: mat-line-height($config, input);

src/material/form-field/_form-field-theme.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@import '../core/theming/palette';
22
@import '../core/theming/theming';
33
@import '../core/style/form-common';
4+
@import '../core/typography/typography';
45
@import '../core/typography/typography-utils';
56

67
@import './form-field-fill-theme.scss';
@@ -130,6 +131,7 @@ $mat-form-field-dedupe: 0;
130131
}
131132

132133
@mixin mat-form-field-typography($config-or-theme) {
134+
$config: mat-private-typography-normalized-config(mat-get-typography-config($config-or-theme));
133135
$config: mat-get-typography-config($config-or-theme);
134136
// The unit-less line-height from the font config.
135137
$line-height: mat-line-height($config, input);

0 commit comments

Comments
 (0)