Skip to content

Commit

Permalink
fix(material/core): top-level font family not copied when converting …
Browse files Browse the repository at this point in the history
…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)
  • Loading branch information
crisbeto committed Jan 23, 2023
1 parent b6c1989 commit 4f2767f
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/material/core/typography/_typography.scss
Expand Up @@ -132,6 +132,7 @@
body-1: map.get($config, body-2),
button: map.get($config, button),
caption: map.get($config, caption),
font-family: map.get($config, font-family),
);
$non-null-args: ();
@each $key, $value in $args {
Expand Down Expand Up @@ -161,6 +162,7 @@
headline-5: map.get($config, headline),
headline-6: map.get($config, title),
subtitle-1: map.get($config, subheading-2),
font-famiy: map.get($config, font-family),

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

0 comments on commit 4f2767f

Please sign in to comment.