Skip to content

Commit fb7d76d

Browse files
committed
fixup! fixup! fix(material/core): allow mixins to handle 2018 typography configs
1 parent 4fa908e commit fb7d76d

File tree

18 files changed

+17
-21
lines changed

18 files changed

+17
-21
lines changed

src/material-experimental/mdc-checkbox/_checkbox-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
}
8484

8585
@mixin mat-mdc-checkbox-typography($config-or-theme) {
86-
$config: mat-private-typography-normalized-config(mat-get-typography-config($config-or-theme));
86+
$config: mat-get-typography-config($config-or-theme);
8787
@include mat-using-mdc-typography($config) {
8888
@include mdc-checkbox-without-ripple($query: $mat-typography-styles-query);
8989
@include mdc-form-field-core-styles($query: $mat-typography-styles-query);

src/material-experimental/mdc-chips/_chips-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
}
5757

5858
@mixin mat-mdc-chips-typography($config-or-theme) {
59-
$config: mat-private-typography-normalized-config(mat-get-typography-config($config-or-theme));
59+
$config: mat-get-typography-config($config-or-theme);
6060
@include mdc-chip-set-core-styles($query: $mat-typography-styles-query);
6161
@include mat-using-mdc-typography($config) {
6262
@include mdc-chip-without-ripple($query: $mat-typography-styles-query);

src/material-experimental/mdc-dialog/_dialog-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
}
1010

1111
@mixin mat-mdc-dialog-typography($config-or-theme) {
12-
$config: mat-private-typography-normalized-config(mat-get-typography-config($config-or-theme));
12+
$config: mat-get-typography-config($config-or-theme);
1313
@include mat-using-mdc-typography($config) {
1414
@include mdc-dialog-core-styles($query: $mat-typography-styles-query);
1515
}

src/material-experimental/mdc-radio/_radio-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
}
4242

4343
@mixin mat-mdc-radio-typography($config-or-theme) {
44-
$config: mat-private-typography-normalized-config(mat-get-typography-config($config-or-theme));
44+
$config: mat-get-typography-config($config-or-theme);
4545
@include mat-using-mdc-typography($config) {
4646
@include mdc-radio-without-ripple($query: $mat-typography-styles-query);
4747
@include mdc-form-field-core-styles($query: $mat-typography-styles-query);

src/material-experimental/mdc-slide-toggle/_slide-toggle-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
}
8080

8181
@mixin mat-mdc-slide-toggle-typography($config-or-theme) {
82-
$config: mat-private-typography-normalized-config(mat-get-typography-config($config-or-theme));
82+
$config: mat-get-typography-config($config-or-theme);
8383
@include mat-using-mdc-typography($config) {
8484
@include mdc-switch-without-ripple($query: $mat-typography-styles-query);
8585
@include mdc-form-field-core-styles($query: $mat-typography-styles-query);

src/material-experimental/mdc-snack-bar/_snack-bar-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
}
3535

3636
@mixin mat-mdc-snack-bar-typography($config-or-theme) {
37-
$config: mat-private-typography-normalized-config(mat-get-typography-config($config-or-theme));
37+
$config: mat-get-typography-config($config-or-theme);
3838
@include mat-using-mdc-typography($config) {
3939
@include mdc-snackbar-core-styles($query: $mat-typography-styles-query);
4040
}

src/material-experimental/mdc-table/_table-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
}
4444

4545
@mixin mat-mdc-table-typography($config-or-theme) {
46-
$config: mat-private-typography-normalized-config(mat-get-typography-config($config-or-theme));
46+
$config: mat-get-typography-config($config-or-theme);
4747
@include mat-using-mdc-typography($config) {
4848
@include mdc-data-table-core-styles($query: $mat-typography-styles-query);
4949
}

src/material-experimental/mdc-typography/_all-typography.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
@mixin angular-material-mdc-typography($config-or-theme: null) {
44
$config: if(mat-private-is-theme-object($config-or-theme),
5-
mat-private-typography-normalized-config(mat-get-typography-config($config-or-theme)),
6-
$config-or-theme);
5+
mat-get-typography-config($config-or-theme), $config-or-theme);
76

87
// If no actual color configuration has been specified, create a default one.
98
@if $config == null {

src/material/checkbox/_checkbox-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
}
9898

9999
@mixin mat-checkbox-typography($config-or-theme) {
100-
$config: mat-private-typography-normalized-config(mat-get-typography-config($config-or-theme));
100+
$config: mat-get-typography-config($config-or-theme);
101101
.mat-checkbox {
102102
font-family: mat-font-family($config);
103103
}

src/material/chips/_chips-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ $mat-chip-remove-font-size: 18px;
8888
}
8989

9090
@mixin mat-chips-typography($config-or-theme) {
91-
$config: mat-private-typography-normalized-config(mat-get-typography-config($config-or-theme));
91+
$config: mat-get-typography-config($config-or-theme);
9292
.mat-chip {
9393
font-size: mat-font-size($config, body-2);
9494
font-weight: mat-font-weight($config, body-2);

0 commit comments

Comments
 (0)