Skip to content

Commit

Permalink
revert(font-weight): combine font-weights back to *00 based
Browse files Browse the repository at this point in the history
fix: DSS-752
  • Loading branch information
kajabi-bot committed Aug 16, 2024
1 parent 7bc1546 commit 008a6c7
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 19 deletions.
2 changes: 1 addition & 1 deletion packages/sage-assets/lib/stylesheets/global/_reboot.scss
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ body {
"Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
font-feature-settings: "liga" 1, "calt" 1; /* fix for Chrome */
font-size: 1rem;
font-weight: 425;
font-weight: 400;
line-height: 1.5; /* NOTE: line-height must be '1.5' to avoid conflicts with Ladera */
text-align: left;
}
Expand Down
13 changes: 1 addition & 12 deletions packages/sage-assets/lib/stylesheets/tokens/_font_weight.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,6 @@
/// Sage font weights token
///
$sage-font-weights: (
regular: 425,
medium: 525,
semibold: 625,
bold: 725
);

$sage-heading-font-weights: (
regular: 400,
medium: 500,
semibold: 600,
Expand All @@ -29,12 +22,8 @@ $sage-heading-font-weights: (
///
/// @return {number} The value retrieved
///
@function sage-font-weight($key: regular, $heading: false) {
@function sage-font-weight($key: regular) {
$value: map-get($sage-font-weights, $key);

@if $heading {
$value: map-get($sage-heading-font-weights, $key);
}

@return $value;
}
12 changes: 6 additions & 6 deletions packages/sage-assets/lib/stylesheets/tokens/_type_specs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -83,37 +83,37 @@ $sage-type-specs: (
kerning: sage-letter-spacing(5xl),
responsive: true,
type-pairing: h1,
weight: sage-font-weight(semibold, true),
weight: sage-font-weight(semibold),
),
"heading-2": (
kerning: sage-letter-spacing(4xl),
responsive: true,
type-pairing: h2,
weight: sage-font-weight(semibold, true),
weight: sage-font-weight(semibold),
),
"heading-3": (
kerning: sage-letter-spacing(3xl),
responsive: true,
type-pairing: h3,
weight: sage-font-weight(semibold, true),
weight: sage-font-weight(semibold),
),
"heading-4": (
kerning: sage-letter-spacing(2xl),
responsive: true,
type-pairing: h4,
weight: sage-font-weight(semibold, true),
weight: sage-font-weight(semibold),
),
"heading-5": (
kerning: sage-letter-spacing(xl),
responsive: true,
type-pairing: h5,
weight: sage-font-weight(medium, true),
weight: sage-font-weight(medium),
),
"heading-6": (
kerning: sage-letter-spacing(lg),
responsive: true,
type-pairing: h6,
weight: sage-font-weight(medium, true),
weight: sage-font-weight(medium),
),
"nav": (
responsive: false,
Expand Down

0 comments on commit 008a6c7

Please sign in to comment.