Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(font-family): added system fonts #9325

Merged
merged 7 commits into from
Aug 2, 2021
Merged

fix(font-family): added system fonts #9325

Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f4850c9
fix(font-family): added system fonts
sstrubberg Jul 26, 2021
22f24ca
fix(font-family): updated tests
sstrubberg Jul 26, 2021
51ed37d
fix(font-family): update reset-test
sstrubberg Jul 27, 2021
9af05b1
fix(font-family): undid last changes and added more languages
sstrubberg Jul 29, 2021
3767606
Merge branch 'main' into 8764-font-family
sstrubberg Jul 29, 2021
074473d
Merge branch 'main' into 8764-font-family
sstrubberg Jul 29, 2021
7b7336c
Merge branch 'main' into 8764-font-family
joshblack Jul 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 33 additions & 5 deletions packages/type/scss/modules/_font-family.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,44 @@
$font-families: (
'mono':
unquote(
"'IBM Plex Mono', 'Menlo', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', Courier, monospace"
"'IBM Plex Mono', system-ui, -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', monospace"
),
'sans':
unquote(
"'IBM Plex Sans', system-ui, -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', sans-serif"
),
'sans': unquote("'IBM Plex Sans', 'Helvetica Neue', Arial, sans-serif"),
'sans-condensed':
unquote("'IBM Plex Sans Condensed', 'Helvetica Neue', Arial, sans-serif"),
unquote(
"'IBM Plex Sans Condensed', system-ui, -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', sans-serif"
),
'sans-arabic':
unquote(
"'IBM Plex Sans Arabic', system-ui, -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', sans-serif"
),
'sans-devanagari':
unquote(
"'IBM Plex Sans Devanagari', system-ui, -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', sans-serif"
),
'sans-hebrew':
unquote(
"'IBM Plex Sans Hebrew', 'Helvetica Hebrew', 'Arial Hebrew', sans-serif"
"'IBM Plex Sans Hebrew', system-ui, -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', sans-serif"
),
'sans-jp':
unquote(
"'IBM Plex Sans JP', system-ui, -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', sans-serif"
),
'sans-kr':
unquote(
"'IBM Plex Sans KR', system-ui, -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', sans-serif"
),
'sans-thai':
unquote(
"'IBM Plex Sans Thai', system-ui, -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', sans-serif"
),
'serif':
unquote(
"'IBM Plex Serif', system-ui, -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', serif"
),
'serif': unquote("'IBM Plex Serif', 'Georgia', Times, serif"),
) !default;

/// Get the font-family for an IBM Plex font
Expand Down