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

Jump to bottom

TwentyTwentyOne: set default font sizes for WordPress 5.9 #2158

Closed
wants to merge 7 commits into from
Closed

TwentyTwentyOne: set default font sizes for WordPress 5.9 #2158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ac419dd
Set small font size
oandregal Jan 13, 2022
b37a4ea
Set medium font size
oandregal Jan 13, 2022
5cc7d77
Set large font size
oandregal Jan 13, 2022
5657f6a
Set normal font size
oandregal Jan 13, 2022
7709510
Set huge font size
oandregal Jan 13, 2022
041f4f1
Update map files
oandregal Jan 13, 2022
f9cb5ed
Set white & black colors
oandregal Jan 14, 2022
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
2 changes: 1 addition & 1 deletion src/wp-content/themes/twentytwentyone/assets/css/ie-editor.css.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/wp-content/themes/twentytwentyone/assets/css/ie.css.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions src/wp-content/themes/twentytwentyone/assets/css/print.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ Andreas Hecht in https://www.jotform.com/blog/css-perfect-print-stylesheet-98272
font-weight: bold;
}

.has-large-font-size {
--wp--preset--font-size--large: 14pt;
}

h2,
h3,
h4,
Expand Down
2 changes: 1 addition & 1 deletion src/wp-content/themes/twentytwentyone/assets/css/print.css.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions src/wp-content/themes/twentytwentyone/assets/css/style-editor.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2145,6 +2145,7 @@ pre.wp-block-verse {

:root .is-small-text,
:root .has-small-font-size {
--wp--preset--font-size--small: var(--global--font-size-sm);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if now that we have variables --wp--preset--font-size--small if it still makes sense to have --global--font-size-sm? Maybe we could remove all --global--font-size variables and use the presets.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wanted to scope down this to the minimal patch that works. Didn't want to rebuild how the theme is built to avoid falling into deep holes.

font-size: var(--global--font-size-sm);
}

Expand All @@ -2153,11 +2154,14 @@ pre.wp-block-verse {
:root .is-normal-font-size,
:root .has-normal-font-size,
:root .has-medium-font-size {
--wp--preset--font-size--normal: var(--global--font-size-base);
--wp--preset--font-size--medium: var(--global--font-size-base);
font-size: var(--global--font-size-base);
}

:root .is-large-text,
:root .has-large-font-size {
--wp--preset--font-size--large: var(--global--font-size-lg);
font-size: var(--global--font-size-lg);
line-height: var(--global--line-height-heading);
}
Expand All @@ -2172,6 +2176,7 @@ pre.wp-block-verse {

:root .is-huge-text,
:root .has-huge-font-size {
--wp--preset--font-size--huge: var(--global--font-size-xxl);
font-size: var(--global--font-size-xxl);
line-height: var(--global--line-height-heading);
font-weight: var(--heading--font-weight-page-title);
Expand Down Expand Up @@ -2238,11 +2243,13 @@ pre.wp-block-verse {
}

.has-white-background-color[class] {
--wp--preset--color--white: var(--global--color-white);
background-color: var(--global--color-white);
color: var(--global--color-secondary);
}

.has-black-background-color[class] {
--wp--preset--color--black: var(--global--color-black);
background-color: var(--global--color-black);
color: var(--global--color-primary);
}
Expand Down Expand Up @@ -2348,11 +2355,13 @@ a {
}

.has-black-color[class] {
--wp--preset--color--black: var(--global--color-black);
color: var(--global--color-black);
}

.has-black-color[class] > [class*=__inner-container] {
--local--color-primary: var(--global--color-black, #000);
--wp--preset--color--black: var(--local--color-primary);
color: var(--local--color-primary);
}

Expand Down Expand Up @@ -2429,11 +2438,13 @@ a {
}

.has-white-color[class] {
--wp--preset--color--white: var(--global--color-white);
color: var(--global--color-white);
}

.has-white-color[class] > [class*=__inner-container] {
--local--color-primary: var(--global--color-white, #fff);
--wp--preset--color--white: var(--local--color-primary);
color: var(--local--color-primary);
}

Expand All @@ -2449,11 +2460,13 @@ a {
}

.has-black-background-color[class] {
--wp--preset--color--black: var(--global--color-black);
background-color: var(--global--color-black);
}

.has-black-background-color[class] > [class*=__inner-container] {
--local--color-background: var(--global--color-black, #000);
--wp--preset--color--black: var(--local--color-background);
background-color: var(--local--color-background);
}

Expand Down Expand Up @@ -2539,11 +2552,13 @@ a {
}

.has-white-background-color[class] {
--wp--preset--color--white: var(--global--color-white);
background-color: var(--global--color-white);
}

.has-white-background-color[class] > [class*=__inner-container] {
--local--color-background: var(--global--color-white, #fff);
--wp--preset--color--white: var(--local--color-background);
background-color: var(--local--color-background);
}

Expand Down
2 changes: 1 addition & 1 deletion src/wp-content/themes/twentytwentyone/assets/css/style-editor.css.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions src/wp-content/themes/twentytwentyone/assets/sass/05-blocks/utilities/_editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,13 @@
}

.has-white-background-color[class] {
--wp--preset--color--white: var(--global--color-white);
background-color: var(--global--color-white);
color: var(--global--color-secondary);
}

.has-black-background-color[class] {
--wp--preset--color--black: var(--global--color-black);
background-color: var(--global--color-black);
color: var(--global--color-primary);
}
Expand Down
5 changes: 5 additions & 0 deletions src/wp-content/themes/twentytwentyone/assets/sass/05-blocks/utilities/_font-sizes.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

.is-small-text,
.has-small-font-size {
--wp--preset--font-size--small: var(--global--font-size-sm);
font-size: var(--global--font-size-sm);
}

Expand All @@ -16,11 +17,14 @@
.is-normal-font-size,
.has-normal-font-size,
.has-medium-font-size {
--wp--preset--font-size--normal: var(--global--font-size-base);
--wp--preset--font-size--medium: var(--global--font-size-base);
font-size: var(--global--font-size-base);
}

.is-large-text,
.has-large-font-size {
--wp--preset--font-size--large: var(--global--font-size-lg);
font-size: var(--global--font-size-lg);
line-height: var(--global--line-height-heading);
}
Expand All @@ -35,6 +39,7 @@

.is-huge-text,
.has-huge-font-size {
--wp--preset--font-size--huge: var(--global--font-size-xxl);
font-size: var(--global--font-size-xxl);
line-height: var(--global--line-height-heading);

Expand Down
12 changes: 10 additions & 2 deletions src/wp-content/themes/twentytwentyone/assets/sass/07-utilities/color-palette.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
// Localize CSS-variables to limit relationship scope
> [class*="__inner-container"] {
--local--color-primary: var(--global--color-black, #000000);
--wp--preset--color--black: var(--local--color-primary);
color: var(--local--color-primary);
}
--wp--preset--color--black: var(--global--color-black);
color: var(--global--color-black);
}

Expand Down Expand Up @@ -85,8 +87,10 @@
// Localize CSS-variables to limit relationship scope
> [class*="__inner-container"] {
--local--color-primary: var(--global--color-white, #FFFFFF);
--wp--preset--color--white: var(--local--color-primary);
color: var(--local--color-primary);
}
--wp--preset--color--white: var(--global--color-white);
color: var(--global--color-white);
}

Expand All @@ -109,8 +113,10 @@
// Localize CSS-variables to limit relationship scope
> [class*="__inner-container"] {
--local--color-background: var(--global--color-black, #000000);
--wp--preset--color--black: var(--local--color-background);
background-color: var(--local--color-background);
}
--wp--preset--color--black: var(--global--color-black);
background-color: var(--global--color-black);
}

Expand Down Expand Up @@ -199,8 +205,10 @@
// Localize CSS-variables to limit relationship scope
> [class*="__inner-container"] {
--local--color-background: var(--global--color-white, #FFFFFF);
--wp--preset--color--white: var(--local--color-background);
background-color: var(--local--color-background);
}
--wp--preset--color--white: var(--global--color-white);
background-color: var(--global--color-white);
}

Expand All @@ -209,7 +217,7 @@
&.has-black-background-color[class],
&.has-gray-background-color[class],
&.has-dark-gray-background-color[class] {
color: var(--global--color-white);
color: var(--global--color-white);

// Localize CSS-variables to limit relationship scope
> [class*="__inner-container"] {
Expand All @@ -229,7 +237,7 @@
&.has-orange-background-color[class],
&.has-yellow-background-color[class],
&.has-white-background-color[class] {
color: var(--global--color-dark-gray);
color: var(--global--color-dark-gray);

// Localize CSS-variables to limit relationship scope
> [class*="__inner-container"] {
Expand Down
4 changes: 4 additions & 0 deletions src/wp-content/themes/twentytwentyone/assets/sass/07-utilities/print.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ Andreas Hecht in https://www.jotform.com/blog/css-perfect-print-stylesheet-98272
font-weight: bold;
}

.has-large-font-size {
--wp--preset--font-size--large: 14pt;
}

h2,
h3,
h4,
Expand Down
14 changes: 6 additions & 8 deletions src/wp-content/themes/twentytwentyone/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions src/wp-content/themes/twentytwentyone/style-rtl.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3602,6 +3602,7 @@ table.wp-calendar-table caption {

:root .is-small-text,
:root .has-small-font-size {
--wp--preset--font-size--small: var(--global--font-size-sm);
font-size: var(--global--font-size-sm);
}

Expand All @@ -3610,11 +3611,14 @@ table.wp-calendar-table caption {
:root .is-normal-font-size,
:root .has-normal-font-size,
:root .has-medium-font-size {
--wp--preset--font-size--normal: var(--global--font-size-base);
--wp--preset--font-size--medium: var(--global--font-size-base);
font-size: var(--global--font-size-base);
}

:root .is-large-text,
:root .has-large-font-size {
--wp--preset--font-size--large: var(--global--font-size-lg);
font-size: var(--global--font-size-lg);
line-height: var(--global--line-height-heading);
}
Expand All @@ -3629,6 +3633,7 @@ table.wp-calendar-table caption {

:root .is-huge-text,
:root .has-huge-font-size {
--wp--preset--font-size--huge: var(--global--font-size-xxl);
font-size: var(--global--font-size-xxl);
line-height: var(--global--line-height-heading);
font-weight: var(--heading--font-weight-page-title);
Expand Down Expand Up @@ -5603,11 +5608,13 @@ h1.page-title {
}

.has-black-color[class] {
--wp--preset--color--black: var(--global--color-black);
color: var(--global--color-black);
}

.has-black-color[class] > [class*=__inner-container] {
--local--color-primary: var(--global--color-black, #000);
--wp--preset--color--black: var(--local--color-primary);
color: var(--local--color-primary);
}

Expand Down Expand Up @@ -5684,11 +5691,13 @@ h1.page-title {
}

.has-white-color[class] {
--wp--preset--color--white: var(--global--color-white);
color: var(--global--color-white);
}

.has-white-color[class] > [class*=__inner-container] {
--local--color-primary: var(--global--color-white, #fff);
--wp--preset--color--white: var(--local--color-primary);
color: var(--local--color-primary);
}

Expand All @@ -5704,11 +5713,13 @@ h1.page-title {
}

.has-black-background-color[class] {
--wp--preset--color--black: var(--global--color-black);
background-color: var(--global--color-black);
}

.has-black-background-color[class] > [class*=__inner-container] {
--local--color-background: var(--global--color-black, #000);
--wp--preset--color--black: var(--local--color-background);
background-color: var(--local--color-background);
}

Expand Down Expand Up @@ -5794,11 +5805,13 @@ h1.page-title {
}

.has-white-background-color[class] {
--wp--preset--color--white: var(--global--color-white);
background-color: var(--global--color-white);
}

.has-white-background-color[class] > [class*=__inner-container] {
--local--color-background: var(--global--color-white, #fff);
--wp--preset--color--white: var(--local--color-background);
background-color: var(--local--color-background);
}

Expand Down
Loading