From 0b6f1c68e096b9576c3dcbeb2395964da85741c2 Mon Sep 17 00:00:00 2001 From: Joe Tower Date: Tue, 29 Nov 2022 11:26:21 -0600 Subject: [PATCH 1/3] fix: line-height adjustments --- tokens/typography/font.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tokens/typography/font.yml b/tokens/typography/font.yml index 9ba52d0..8875988 100644 --- a/tokens/typography/font.yml +++ b/tokens/typography/font.yml @@ -184,43 +184,43 @@ font: body: xl: size: "{ font.scale.23-29.value }" - line-height: "1.4" + line-height: "2.20" family: "{ fontFamilies.mallory-compact.value }" weight: "{ font.weights.mallory-book.value }" value: "{ font.style.body.xl.weight } { font.style.body.xl.size }/{ font.style.body.xl.line-height } { font.style.body.xl.family }" l: size: "{ font.scale.20-26.value }" - line-height: "1.45" + line-height: "1.50" family: "{ fontFamilies.mallory-compact.value }" weight: "{ font.weights.mallory-book.value }" value: "{ font.style.body.l.weight } { font.style.body.l.size }/{ font.style.body.l.line-height } { font.style.body.l.family }" default: size: "{ font.scale.17-20.value }" - line-height: "1.65" + line-height: "2" family: "{ fontFamilies.mallory-compact.value }" weight: "{ font.weights.mallory-book.value }" value: "{ font.style.body.default.weight } { font.style.body.default.size }/{ font.style.body.default.line-height } { font.style.body.default.family }" default-condensed: size: "{ font.scale.17-20.value }" - line-height: "1.4" + line-height: "0.80" family: "{ fontFamilies.mallory-compact.value }" weight: "{ font.weights.mallory-book.value }" value: "{ font.style.body.default-condensed.weight } { font.style.body.default-condensed.size }/{ font.style.body.default-condensed.line-height } { font.style.body.default-condensed.family }" s: size: "{ font.scale.15-16.value }" - line-height: "1.60" + line-height: "1.40" family: "{ fontFamilies.mallory-compact.value }" weight: "{ font.weights.mallory-book.value }" value: "{ font.style.body.s.weight } { font.style.body.s.size }/{ font.style.body.s.line-height } { font.style.body.s.family }" s-condensed: size: "{ font.scale.15-16.value }" - line-height: "1.29" + line-height: "0.9" family: "{ fontFamilies.mallory-compact.value }" weight: "{ font.weights.mallory-book.value }" value: "{ font.style.body.s-condensed.weight } { font.style.body.s-condensed.size }/{ font.style.body.s-condensed.line-height } { font.style.body.s-condensed.family }" xs: size: "{ font.scale.13-14.value }" - line-height: "1.45" + line-height: "1.30" family: "{ fontFamilies.mallory-compact.value }" weight: "{ font.weights.mallory-book.value }" value: "{ font.style.body.xs.weight } { font.style.body.xs.size }/{ font.style.body.xs.line-height } { font.style.body.xs.family }" From 2155d1d021387b90247f047dee391873d4a67ebb Mon Sep 17 00:00:00 2001 From: Joe Tower Date: Tue, 29 Nov 2022 14:21:04 -0600 Subject: [PATCH 2/3] fix: adjust body text line-heights --- tokens/typography/font.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tokens/typography/font.yml b/tokens/typography/font.yml index 8875988..67afc49 100644 --- a/tokens/typography/font.yml +++ b/tokens/typography/font.yml @@ -184,13 +184,13 @@ font: body: xl: size: "{ font.scale.23-29.value }" - line-height: "2.20" + line-height: "1.8" family: "{ fontFamilies.mallory-compact.value }" weight: "{ font.weights.mallory-book.value }" value: "{ font.style.body.xl.weight } { font.style.body.xl.size }/{ font.style.body.xl.line-height } { font.style.body.xl.family }" l: size: "{ font.scale.20-26.value }" - line-height: "1.50" + line-height: "1.5" family: "{ fontFamilies.mallory-compact.value }" weight: "{ font.weights.mallory-book.value }" value: "{ font.style.body.l.weight } { font.style.body.l.size }/{ font.style.body.l.line-height } { font.style.body.l.family }" @@ -202,25 +202,25 @@ font: value: "{ font.style.body.default.weight } { font.style.body.default.size }/{ font.style.body.default.line-height } { font.style.body.default.family }" default-condensed: size: "{ font.scale.17-20.value }" - line-height: "0.80" + line-height: "1.5" family: "{ fontFamilies.mallory-compact.value }" weight: "{ font.weights.mallory-book.value }" value: "{ font.style.body.default-condensed.weight } { font.style.body.default-condensed.size }/{ font.style.body.default-condensed.line-height } { font.style.body.default-condensed.family }" s: size: "{ font.scale.15-16.value }" - line-height: "1.40" + line-height: "1.8" family: "{ fontFamilies.mallory-compact.value }" weight: "{ font.weights.mallory-book.value }" value: "{ font.style.body.s.weight } { font.style.body.s.size }/{ font.style.body.s.line-height } { font.style.body.s.family }" s-condensed: size: "{ font.scale.15-16.value }" - line-height: "0.9" + line-height: "1.5" family: "{ fontFamilies.mallory-compact.value }" weight: "{ font.weights.mallory-book.value }" value: "{ font.style.body.s-condensed.weight } { font.style.body.s-condensed.size }/{ font.style.body.s-condensed.line-height } { font.style.body.s-condensed.family }" xs: size: "{ font.scale.13-14.value }" - line-height: "1.30" + line-height: "1.4" family: "{ fontFamilies.mallory-compact.value }" weight: "{ font.weights.mallory-book.value }" value: "{ font.style.body.xs.weight } { font.style.body.xs.size }/{ font.style.body.xs.line-height } { font.style.body.xs.family }" From 85edb54e3bcfd6c6143659354a3a29d6946e9f69 Mon Sep 17 00:00:00 2001 From: Joe Tower Date: Wed, 30 Nov 2022 16:08:37 -0600 Subject: [PATCH 3/3] fix: updating line-heights --- tokens/typography/font.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tokens/typography/font.yml b/tokens/typography/font.yml index 67afc49..fd0a217 100644 --- a/tokens/typography/font.yml +++ b/tokens/typography/font.yml @@ -184,37 +184,37 @@ font: body: xl: size: "{ font.scale.23-29.value }" - line-height: "1.8" + line-height: "1.7" family: "{ fontFamilies.mallory-compact.value }" weight: "{ font.weights.mallory-book.value }" value: "{ font.style.body.xl.weight } { font.style.body.xl.size }/{ font.style.body.xl.line-height } { font.style.body.xl.family }" l: size: "{ font.scale.20-26.value }" - line-height: "1.5" + line-height: "1.7" family: "{ fontFamilies.mallory-compact.value }" weight: "{ font.weights.mallory-book.value }" value: "{ font.style.body.l.weight } { font.style.body.l.size }/{ font.style.body.l.line-height } { font.style.body.l.family }" default: size: "{ font.scale.17-20.value }" - line-height: "2" + line-height: "1.7" family: "{ fontFamilies.mallory-compact.value }" weight: "{ font.weights.mallory-book.value }" value: "{ font.style.body.default.weight } { font.style.body.default.size }/{ font.style.body.default.line-height } { font.style.body.default.family }" default-condensed: size: "{ font.scale.17-20.value }" - line-height: "1.5" + line-height: "1.4" family: "{ fontFamilies.mallory-compact.value }" weight: "{ font.weights.mallory-book.value }" value: "{ font.style.body.default-condensed.weight } { font.style.body.default-condensed.size }/{ font.style.body.default-condensed.line-height } { font.style.body.default-condensed.family }" s: size: "{ font.scale.15-16.value }" - line-height: "1.8" + line-height: "1.7" family: "{ fontFamilies.mallory-compact.value }" weight: "{ font.weights.mallory-book.value }" value: "{ font.style.body.s.weight } { font.style.body.s.size }/{ font.style.body.s.line-height } { font.style.body.s.family }" s-condensed: size: "{ font.scale.15-16.value }" - line-height: "1.5" + line-height: "1.4" family: "{ fontFamilies.mallory-compact.value }" weight: "{ font.weights.mallory-book.value }" value: "{ font.style.body.s-condensed.weight } { font.style.body.s-condensed.size }/{ font.style.body.s-condensed.line-height } { font.style.body.s-condensed.family }"