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

Content fonts lineheight #950

Merged
merged 2 commits into from
Dec 16, 2024
Merged

Content fonts lineheight #950

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
681647f
Update src/content/design-system/foundation/font
KateMacdonald Dec 15, 2024
ec68a45
Update src/content/design-system/foundation/font
KateMacdonald Dec 15, 2024
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
44 changes: 22 additions & 22 deletions apps/site/src/content/design-system/foundation/font/design/typographic-scale/content.mdoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <Table className="w-max sm:w-full whitespace-pre">
<TableCaption>GEL body typography tokens (Sans serif system font)</TableCaption>
Expand All @@ -60,7 +60,7 @@ The typographic scale has a limited set of type sizes that work together and hel
<TableHeaderCell className='w-100'>Text size</TableHeaderCell>
<TableHeaderCell>Token</TableHeaderCell>
<TableHeaderCell>Rem</TableHeaderCell>
<TableHeaderCell>Line height</TableHeaderCell>

<TableHeaderCell>Tailwind class</TableHeaderCell>
</TableHeaderRow>
</TableHeader>
Expand All @@ -71,7 +71,7 @@ The typographic scale has a limited set of type sizes that work together and hel
<span className={i.className}>{i.className.replace('typography-', '')}</span>
</TableCell>
<TableCell>{i.rem}</TableCell>
<TableCell>{i.lineHeight}</TableCell>

<TableCell>{i.className}</TableCell>
</TableRow>)}
</TableBody>
Expand All @@ -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 <Table className="w-max sm:w-full whitespace-pre">
<TableCaption>GEL brand typography tokens</TableCaption>
Expand All @@ -129,7 +129,7 @@ The typographic scale has a limited set of type sizes that work together and hel
<TableHeaderCell>Text size</TableHeaderCell>
<TableHeaderCell>Token</TableHeaderCell>
<TableHeaderCell>Rem</TableHeaderCell>
<TableHeaderCell>Line height</TableHeaderCell>

<TableHeaderCell>Tailwind class</TableHeaderCell>
</TableHeaderRow>
</TableHeader>
Expand All @@ -140,7 +140,7 @@ The typographic scale has a limited set of type sizes that work together and hel
<span className={i.className}>{i.className.replace('typography-', '')}</span>
</TableCell>
<TableCell>{i.rem}</TableCell>
<TableCell>{i.lineHeight}</TableCell>

<TableCell>{i.className}</TableCell>
</TableRow>)}
</TableBody>
Expand Down
Loading