Skip to content

Commit 4f2767f

Browse files
committed
fix(material/core): top-level font family not copied when converting between typography formats (#26471)
Fixes that our functions for converting between the 2014 and 2018 typography formats weren't copying over the top-level font family. Fixes #26446. (cherry picked from commit 434ec52)
1 parent b6c1989 commit 4f2767f

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

src/material/core/typography/_typography.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@
132132
body-1: map.get($config, body-2),
133133
button: map.get($config, button),
134134
caption: map.get($config, caption),
135+
font-family: map.get($config, font-family),
135136
);
136137
$non-null-args: ();
137138
@each $key, $value in $args {
@@ -161,6 +162,7 @@
161162
headline-5: map.get($config, headline),
162163
headline-6: map.get($config, title),
163164
subtitle-1: map.get($config, subheading-2),
165+
font-famiy: map.get($config, font-family),
164166

165167
// These mappings are odd, but body-2 in the 2014 system actually looks closer to subtitle-2
166168
// in the 2018 system, and subeading-1 in the 2014 system looks more like body-1 in the 2018

0 commit comments

Comments
 (0)