Skip to content

Commit 70048ef

Browse files
committed
fix(material/dialog): invalid font-family declaration (#29516)
We were emitting a font family value like `var(--mat-dialog-font, Roboto, sans-serif)` which is invalid. These changes remove the fallback since it was primarily there to make it easier to land the MDC changes. (cherry picked from commit 95d1354)
1 parent 913267c commit 70048ef

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/material/dialog/dialog.scss

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,8 @@ $_emit-fallbacks: true;
174174
.mat-mdc-dialog-container & {
175175
@include _use-mdc-tokens {
176176
@include token-utils.create-token-slot(color, subhead-color, $_emit-fallbacks);
177-
@include token-utils.create-token-slot(font-family, subhead-font, $_emit-fallbacks);
177+
@include token-utils.create-token-slot(font-family, subhead-font,
178+
if($_emit-fallbacks, inherit, null));
178179
@include token-utils.create-token-slot(line-height, subhead-line-height, $_emit-fallbacks);
179180
@include token-utils.create-token-slot(font-size, subhead-size, $_emit-fallbacks);
180181
@include token-utils.create-token-slot(font-weight, subhead-weight, $_emit-fallbacks);
@@ -203,7 +204,8 @@ $_emit-fallbacks: true;
203204
.mat-mdc-dialog-container & {
204205
@include _use-mdc-tokens {
205206
@include token-utils.create-token-slot(color, supporting-text-color, $_emit-fallbacks);
206-
@include token-utils.create-token-slot(font-family, supporting-text-font, $_emit-fallbacks);
207+
@include token-utils.create-token-slot(font-family, supporting-text-font,
208+
if($_emit-fallbacks, inherit, null));
207209
@include token-utils.create-token-slot(line-height, supporting-text-line-height,
208210
$_emit-fallbacks);
209211
@include token-utils.create-token-slot(font-size, supporting-text-size, $_emit-fallbacks);

0 commit comments

Comments
 (0)