Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix(font): use variable font, add opt-in for legacy font #6073

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

Merged
mcoker merged 1 commit into from
Nov 21, 2023
Merged

fix(font): use variable font, add opt-in for legacy font #6073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions src/patternfly/base/_common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,14 @@
}

// Variable font opt-in
.#{$pf-prefix}m-vf-font {
--#{$pf-global}--FontFamily--text: var(--#{$pf-global}--FontFamily--text--vf);
--#{$pf-global}--FontFamily--heading: var(--#{$pf-global}--FontFamily--heading--vf);
--#{$pf-global}--FontFamily--monospace: var(--#{$pf-global}--FontFamily--monospace--vf);
.#{$pf-prefix}m-legacy-font {
--pf-t--global--font--family--body: var(--pf-t--global--font--family--body--legacy);
--pf-t--global--font--family--heading: var(--pf-t--global--font--family--heading--legacy);
--pf-t--global--font--family--mono: var(--pf-t--global--font--family--mono--legacy);
--pf-t--global--font--weight--body: var(--pf-t--global--font--weight--body--legacy);
--pf-t--global--font--weight--body--bold: var(--pf-t--global--font--weight--body--bold--legacy);
--pf-t--global--font--weight--heading: var(--pf-t--global--font--weight--heading--legacy);
--pf-t--global--font--weight--heading--bold: var(--pf-t--global--font--weight--heading--bold--legacy);
}

// RTL helpers
Expand Down
15 changes: 12 additions & 3 deletions src/patternfly/base/tokens/_tokens-font.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

:root {
// Base tokens for fonts
--pf-t--global--font--family--100: redhattext;
--pf-t--global--font--family--200: redhatdisplay;
--pf-t--global--font--family--300: redhatmono;
--pf-t--global--font--family--100: redhattextvf, redhattext, helvetica, arial, sans-serif;
--pf-t--global--font--family--200: redhatdisplayvf, redhatdisplay, helvetica, arial, sans-serif;
--pf-t--global--font--family--300: redhatmonovf, redhatmono, liberationmono, consolas, sfmono-regular, menlo, monaco, courier new, monospace;
--pf-t--global--font--line-height--100: 1.3;
--pf-t--global--font--line-height--200: 1.5;
--pf-t--global--font--weight--body--100: 400;
Expand Down Expand Up @@ -45,6 +45,15 @@
--pf-t--global--font--size--heading--xl: var(--pf-t--global--font--size--heading--500);
--pf-t--global--font--size--heading--2xl: var(--pf-t--global--font--size--heading--600);

// Legacy/non-variable font opt-in
--pf-t--global--font--family--body--legacy: redhattext, helvetica, arial, sans-serif;
--pf-t--global--font--family--heading--legacy: redhatdisplay, helvetica, arial, sans-serif;
--pf-t--global--font--family--mono--legacy: redhatmono, liberationmono, consolas, sfmono-regular, menlo, monaco, courier new, monospace;
--pf-t--global--font--weight--body--legacy: 400;
--pf-t--global--font--weight--body--bold--legacy: 700;
--pf-t--global--font--weight--heading--legacy: 400;
--pf-t--global--font--weight--heading--bold--legacy: 700;

// Other missing ones
// text-decoration
--pf-t--global--text-decoration--100: none;
Expand Down