From 681647fb45ae80e7ab253780246371b3f7db16ce Mon Sep 17 00:00:00 2001 From: KateMacdonald Date: Mon, 16 Dec 2024 10:52:07 +1100 Subject: [PATCH 1/2] Update src/content/design-system/foundation/font --- .../design/typographic-scale/content.mdoc | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/apps/site/src/content/design-system/foundation/font/design/typographic-scale/content.mdoc b/apps/site/src/content/design-system/foundation/font/design/typographic-scale/content.mdoc index 3bf357f1f..87912a941 100644 --- a/apps/site/src/content/design-system/foundation/font/design/typographic-scale/content.mdoc +++ b/apps/site/src/content/design-system/foundation/font/design/typographic-scale/content.mdoc @@ -6,52 +6,52 @@ The typographic scale has a limited set of type sizes that work together and hel className: 'typography-body-1', fontSize: '60px', rem: '3.75rem', - lineHeight: '1.2' + }, { className: 'typography-body-2', fontSize: '54px', rem: '3.375rem', - lineHeight: '1.2' + }, { className: 'typography-body-3', fontSize: '48px', rem: '3rem', - lineHeight: '1.2' + }, { className: 'typography-body-4', fontSize: '42px', rem: '2.625rem', - lineHeight: '1.2' + }, { className: 'typography-body-5', fontSize: '36px', rem: '2.25rem', - lineHeight: '1.2' + }, { className: 'typography-body-6', fontSize: '30px', rem: '1.875rem', - lineHeight: '1.2' + }, { className: 'typography-body-7', fontSize: '24px', rem: '1.5rem', - lineHeight: '1.2' + }, { className: 'typography-body-8', fontSize: '18px', rem: '1.125rem', - lineHeight: '1.4' + }, { className: 'typography-body-9', fontSize: '16px', rem: '1rem', - lineHeight: '1.4' + }, { className: 'typography-body-10', fontSize: '14px', rem: '0.875rem', - lineHeight: '1.4' + }]; return GEL body typography tokens (Sans serif system font) @@ -60,7 +60,7 @@ The typographic scale has a limited set of type sizes that work together and hel Text sizeTokenRem - Line height + Tailwind class @@ -71,7 +71,7 @@ The typographic scale has a limited set of type sizes that work together and hel {i.className.replace('typography-', '')}{i.rem} - {i.lineHeight} + {i.className})} From ec68a45dcbac86274ce1208c9e98d4b9d91f6166 Mon Sep 17 00:00:00 2001 From: KateMacdonald Date: Mon, 16 Dec 2024 10:53:04 +1100 Subject: [PATCH 2/2] Update src/content/design-system/foundation/font --- .../design/typographic-scale/content.mdoc | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/site/src/content/design-system/foundation/font/design/typographic-scale/content.mdoc b/apps/site/src/content/design-system/foundation/font/design/typographic-scale/content.mdoc index 87912a941..ab4781cbb 100644 --- a/apps/site/src/content/design-system/foundation/font/design/typographic-scale/content.mdoc +++ b/apps/site/src/content/design-system/foundation/font/design/typographic-scale/content.mdoc @@ -85,42 +85,42 @@ The typographic scale has a limited set of type sizes that work together and hel className: 'typography-brand-1', fontSize: '60px', rem: '3.75rem', - lineHeight: '1.2' + }, { className: 'typography-brand-2', fontSize: '54px', rem: '3.375rem', - lineHeight: '1.2' + }, { className: 'typography-brand-3', fontSize: '48px', rem: '3rem', - lineHeight: '1.2' + }, { className: 'typography-brand-4', fontSize: '42px', rem: '2.625rem', - lineHeight: '1.2' + }, { className: 'typography-brand-5', fontSize: '36px', rem: '2.25rem', - lineHeight: '1.2' + }, { className: 'typography-brand-6', fontSize: '30px', rem: '1.875rem', - lineHeight: '1.2' + }, { className: 'typography-brand-7', fontSize: '24px', rem: '1.5rem', - lineHeight: '1.2' + }, { className: 'typography-brand-8', fontSize: '18px', rem: '1.125rem', - lineHeight: '1.4' + }]; return
GEL brand typography tokens @@ -129,7 +129,7 @@ The typographic scale has a limited set of type sizes that work together and hel Text sizeTokenRem - Line height + Tailwind class @@ -140,7 +140,7 @@ The typographic scale has a limited set of type sizes that work together and hel {i.className.replace('typography-', '')}{i.rem} - {i.lineHeight} + {i.className})}