Skip to content

Commit f2d8870

Browse files
committed
fix(material-experimental/mdc-button): Allow typography mixin to consume 2018 style configs
See angular#21059 for context.
1 parent 89d5790 commit f2d8870

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

src/material-experimental/mdc-button/_button-theme.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ $mat-button-state-target: '.mdc-button__ripple';
167167
}
168168

169169
@mixin mat-mdc-button-typography($config-or-theme) {
170+
$config: mat-private-typography-normalized-config(mat-get-typography-config($config-or-theme));
170171
$config: mat-get-typography-config($config-or-theme);
171172
@include mat-using-mdc-typography($config) {
172173
@include mdc-button-without-ripple($query: $mat-typography-styles-query);
@@ -253,6 +254,7 @@ $mat-button-state-target: '.mdc-button__ripple';
253254
}
254255

255256
@mixin mat-mdc-fab-typography($config-or-theme) {
257+
$config: mat-private-typography-normalized-config(mat-get-typography-config($config-or-theme));
256258
$config: mat-get-typography-config($config-or-theme);
257259
@include mat-using-mdc-typography($config) {
258260
@include mdc-fab-without-ripple($query: $mat-typography-styles-query);
@@ -326,6 +328,7 @@ $mat-button-state-target: '.mdc-button__ripple';
326328
}
327329

328330
@mixin mat-mdc-icon-button-typography($config-or-theme) {
331+
$config: mat-private-typography-normalized-config(mat-get-typography-config($config-or-theme));
329332
$config: mat-get-typography-config($config-or-theme);
330333
@include mat-using-mdc-typography($config) {
331334
@include mdc-icon-button-without-ripple($query: $mat-typography-styles-query);

0 commit comments

Comments
 (0)