Skip to content

Commit f1ed31a

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

File tree

21 files changed

+31
-32
lines changed

21 files changed

+31
-32
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-core/option/_optgroup-theme.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
}
2020
}
2121

22-
@mixin mat-mdc-optgroup-typography($config-or-theme) {}
22+
@mixin mat-mdc-optgroup-typography($config-or-theme) {
23+
$config: mat-get-typography-config($config-or-theme);
24+
}
2325

2426
@mixin mat-mdc-optgroup-density($config-or-theme) {
2527
$density-scale: mat-get-density-config($config-or-theme);

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-input/_input-theme.scss

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
@include mat-using-mdc-theme($config) {}
66
}
77

8-
@mixin mat-mdc-input-typography($config-or-theme) {}
8+
@mixin mat-mdc-input-typography($config-or-theme) {
9+
$config: mat-get-typography-config($config-or-theme);
10+
@include mat-using-mdc-typography($config) {}
11+
}
912

1013
@mixin mat-mdc-input-density($config-or-theme) {}
1114

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-slider/_slider-theme.scss

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,13 @@
2222
}
2323
}
2424

25-
@mixin mat-mdc-slider-typography($config-or-theme) {}
25+
@mixin mat-mdc-slider-typography($config-or-theme) {
26+
$config: mat-get-typography-config($config-or-theme);
27+
@include mat-using-mdc-typography($config) {
28+
// TODO: disabled until we implement the new MDC slider.
29+
// @include mdc-slider-core-styles($query: $mat-typography-styles-query);
30+
}
31+
}
2632

2733
@mixin mat-mdc-slider-density($config-or-theme) {}
2834

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
}

0 commit comments

Comments
 (0)