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

Fix TwentyTwenty font sizes & colors #2130

Closed
wants to merge 3 commits into from
Closed

Fix TwentyTwenty font sizes & colors #2130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3aea74f
The global stylesheet should be enqueued for all themes
oandregal Jan 10, 2022
2c9d824
TwentyTwenty: update font size classes
oandregal Jan 10, 2022
6688b17
TwentyTwenty: set WordPress colors
oandregal Jan 10, 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
8 changes: 4 additions & 4 deletions src/wp-content/themes/twentytwenty/assets/css/editor-style-block-rtl.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,20 +351,20 @@ Inter variable font. Usage:
}

.editor-styles-wrapper p.has-small-font-size {
font-size: 0.842em;
--wp--preset--font-size--small: 0.842em;
}

.editor-styles-wrapper p.has-normal-font-size,
.editor-styles-wrapper p.has-regular-font-size {
font-size: 1em;
--wp--preset--font-size--normal: 1em;
}

.editor-styles-wrapper p.has-medium-font-size {
font-size: 1.1em;
--wp--preset--font-size--medium: 1.1em;
}

.editor-styles-wrapper p.has-large-font-size {
font-size: 1.25em;
--wp--preset--font-size--large: 1.25em;
}

.editor-styles-wrapper p.has-larger-font-size {
Expand Down
16 changes: 8 additions & 8 deletions src/wp-content/themes/twentytwenty/assets/css/editor-style-block.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,21 +206,21 @@ Inter variable font. Usage:
/* GENERAL COLORS */

.has-black-background-color {
background-color: #000;
--wp--preset--color--black: #000;
color: #fff;
}

.has-white-background-color {
background-color: #fff;
--wp--preset--color--white: #fff;
color: #000;
}

.has-black-color {
color: #000;
--wp--preset--color--black: #000;
}

.has-white-color {
color: #fff;
--wp--preset--color--white: #fff;
}


Expand Down Expand Up @@ -351,20 +351,20 @@ Inter variable font. Usage:
}

.editor-styles-wrapper p.has-small-font-size {
font-size: 0.842em;
--wp--preset--font-size--small: 0.842em;
}

.editor-styles-wrapper p.has-normal-font-size,
.editor-styles-wrapper p.has-regular-font-size {
font-size: 1em;
--wp--preset--font-size--normal: 1em;
}

.editor-styles-wrapper p.has-medium-font-size {
font-size: 1.1em;
--wp--preset--font-size--medium: 1.1em;
}

.editor-styles-wrapper p.has-large-font-size {
font-size: 1.25em;
--wp--preset--font-size--large: 1.25em;
}

.editor-styles-wrapper p.has-larger-font-size {
Expand Down
8 changes: 4 additions & 4 deletions src/wp-content/themes/twentytwenty/style-rtl.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2836,21 +2836,21 @@ h2.entry-title {
/* Block Font Sizes -------------------------- */

.entry-content .has-small-font-size {
font-size: 0.842em;
--wp--preset--font-size--small: 0.842em;
}

.entry-content .has-normal-font-size,
.entry-content .has-regular-font-size {
font-size: 1em;
--wp--preset--font-size--normal: 1em;
}

.entry-content .has-medium-font-size {
font-size: 1.1em;
--wp--preset--font-size--medium: 1.1em;
line-height: 1.45;
}

.entry-content .has-large-font-size {
font-size: 1.25em;
--wp--preset--font-size--large: 1.25em;
line-height: 1.4;
}

Expand Down
8 changes: 4 additions & 4 deletions src/wp-content/themes/twentytwenty/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2854,21 +2854,21 @@ h2.entry-title {
/* Block Font Sizes -------------------------- */

.entry-content .has-small-font-size {
font-size: 0.842em;
--wp--preset--font-size--small: 0.842em;
}

.entry-content .has-normal-font-size,
.entry-content .has-regular-font-size {
font-size: 1em;
--wp--preset--font-size--normal: 1em;
}

.entry-content .has-medium-font-size {
font-size: 1.1em;
--wp--preset--font-size--medium: 1.1em;
line-height: 1.45;
}

.entry-content .has-large-font-size {
font-size: 1.25em;
--wp--preset--font-size--large: 1.25em;
line-height: 1.4;
}

Expand Down
4 changes: 0 additions & 4 deletions src/wp-includes/script-loader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2307,10 +2307,6 @@ function wp_common_block_scripts_and_styles() {
* @since 5.8.0
*/
function wp_enqueue_global_styles() {
if ( ! WP_Theme_JSON_Resolver::theme_has_support() ) {
return;
}

$separate_assets = wp_should_load_separate_core_block_assets();

/*
Expand Down