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

feat(type): update sass maps to be !default #6850

Merged
merged 3 commits into from
Sep 17, 2020
Merged

feat(type): update sass maps to be !default #6850

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27c3e8d
feat(type): update sass maps to be !default
joshblack Sep 16, 2020
899ef9c
Merge branch 'master' into fix/add-default-to-font-families
tw15egan Sep 16, 2020
69d819b
Merge branch 'master' into fix/add-default-to-font-families
kodiakhq[bot] Sep 17, 2020
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
4 changes: 2 additions & 2 deletions packages/type/scss/_font-family.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ $carbon--font-families: (
"'IBM Plex Sans Hebrew', 'Helvetica Hebrew', 'Arial Hebrew', sans-serif"
),
'serif': unquote("'IBM Plex Serif', 'Georgia', Times, serif"),
);
) !default;

/// Get the font-family for an IBM Plex font
/// @param {String} $name
Expand All @@ -50,7 +50,7 @@ $carbon--font-weights: (
'light': 300,
'regular': 400,
'semibold': 600,
);
) !default;

/// Retrieve the font-weight value for a given name
/// @param {String} $weight
Expand Down