Skip to content

Commit 0e34ae9

Browse files
committed
Make sure letter spacing and font weight is only set once per utility class (rely on inherited values)
1 parent c1174c7 commit 0e34ae9

File tree

2 files changed

+24
-11
lines changed

2 files changed

+24
-11
lines changed

src/marketing/support/variables.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ $font-mktg: $body-font !default;
55
$mktg-font-feature-settings: 'ss02' on, 'ss01' on !default;
66
$mktg-header-spacing-large: -0.03em !default;
77
$mktg-header-spacing-default: -0.01em !default;
8+
$mktg-header-spacing-threshold: 48px !default;
9+
$mktg-header-weight-large: 800 !default;
10+
$mktg-header-weight-default: 600 !default;
11+
$mktg-header-weight-threshold: 24px !default;
812

913
// Header size steps
1014
$mktg-h-size-0: 96px !default;

src/marketing/type/typography.scss

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,36 @@
1515
@each $header, $sizes in $mktg-headers {
1616
.h#{$header}-mktg {
1717
$pairing: map-get($mktg-header-pairings, nth($sizes, 1));
18+
$pairing-md: map-get($mktg-header-pairings, nth($sizes, 2));
19+
$pairing-lg: map-get($mktg-header-pairings, nth($sizes, 3));
20+
1821
font-size: map-get($pairing, "size") !important;
1922
line-height: map-get($pairing, "lh") !important;
20-
@if (map-get($pairing, "size") >= 24px) { font-weight: 800 !important; }
23+
@if (map-get($pairing, "size") >= $mktg-header-weight-threshold) { font-weight: $mktg-header-weight-large !important; }
2124

2225
@if (nth($sizes, 1) != nth($sizes, 2)) {
2326
@include breakpoint(md) {
24-
$pairing: map-get($mktg-header-pairings, nth($sizes, 2));
25-
font-size: map-get($pairing, "size") !important;
26-
line-height: map-get($pairing, "lh") !important;
27-
@if (map-get($pairing, "size") >= 48px) { letter-spacing: $mktg-header-spacing-large; }
28-
@if (map-get($pairing, "size") >= 24px) { font-weight: 800 !important; }
27+
font-size: map-get($pairing-md, "size") !important;
28+
line-height: map-get($pairing-md, "lh") !important;
29+
@if (map-get($pairing-md, "size") >= $mktg-header-spacing-threshold and map-get($pairing, "size") < $mktg-header-spacing-threshold) {
30+
letter-spacing: $mktg-header-spacing-large;
31+
}
32+
@if (map-get($pairing-md, "size") >= $mktg-header-weight-threshold and map-get($pairing, "size") < $mktg-header-weight-threshold) {
33+
font-weight: $mktg-header-weight-large !important;
34+
}
2935
}
3036
}
3137

3238
@if (nth($sizes, 2) != nth($sizes, 3)) {
3339
@include breakpoint(lg) {
34-
$pairing: map-get($mktg-header-pairings, nth($sizes, 3));
35-
font-size: map-get($pairing, "size") !important;
36-
line-height: map-get($pairing, "lh") !important;
37-
@if (map-get($pairing, "size") >= 48px) { letter-spacing: $mktg-header-spacing-large; }
38-
@if (map-get($pairing, "size") >= 24px) { font-weight: 800 !important; }
40+
font-size: map-get($pairing-lg, "size") !important;
41+
line-height: map-get($pairing-lg, "lh") !important;
42+
@if (map-get($pairing-lg, "size") >= $mktg-header-spacing-threshold and map-get($pairing-md, "size") < $mktg-header-spacing-threshold) {
43+
letter-spacing: $mktg-header-spacing-large;
44+
}
45+
@if (map-get($pairing-lg, "size") >= $mktg-header-weight-threshold and map-get($pairing-md, "size") < $mktg-header-weight-threshold) {
46+
font-weight: $mktg-header-weight-large !important;
47+
}
3948
}
4049
}
4150
}

0 commit comments

Comments
 (0)