WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix: Update some default presets in use by default themes to the new format. 

Themes that use the same preset slugs as WordPress uses need to be updated.
From the devnote https://make.wordpress.org/core/2022/01/08/updates-for-settings-styles-and-theme-json/
The CSS for some of the presets defined by WordPress (font sizes, colors, and gradients) was loaded twice for most themes in WordPress 5.8: in the block-library stylesheet plus in the global stylesheet. Additionally, there were slight differences in the CSS in both places.
In WordPress 5.9 those were consolidated into a single place, the global stylesheet whose name is global-styles-inline-css that is now loaded for all themes in the front-end.
For themes to override the default values they can use the theme.json and provide the same slug. Themes that do not use a theme.json can still override the default values by enqueuing some CSS that sets the corresponding CSS Custom Property. This commit does the second for the twenty twenty theme.

Props oandregal.
Fixes #54782.
Built from https://develop.svn.wordpress.org/trunk@52549


git-svn-id: http://core.svn.wordpress.org/trunk@52139 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
jorgefilipecosta 2022-01-10 18:29:02 +00:00
parent 6d30d2a5d6
commit 83dc7c318b
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-content/themes/twentytwenty/assets/css/editor-style-block-rtl.css
View File

@ -351,20 +351,20 @@ Inter variable font. Usage:
} }
.editor-styles-wrapper p.has-small-font-size { .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-normal-font-size,
.editor-styles-wrapper p.has-regular-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 { .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 { .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 { .editor-styles-wrapper p.has-larger-font-size {

16
wp-content/themes/twentytwenty/assets/css/editor-style-block.css
View File

@ -206,21 +206,21 @@ Inter variable font. Usage:
/* GENERAL COLORS */ /* GENERAL COLORS */
.has-black-background-color { .has-black-background-color {
background-color: #000; --wp--preset--color--black: #000;
color: #fff; color: #fff;
} }
.has-white-background-color { .has-white-background-color {
background-color: #fff; --wp--preset--color--white: #fff;
color: #000; color: #000;
} }
.has-black-color { .has-black-color {
color: #000; --wp--preset--color--black: #000;
} }
.has-white-color { .has-white-color {
color: #fff; --wp--preset--color--white: #fff;
} }
@ -351,20 +351,20 @@ Inter variable font. Usage:
} }
.editor-styles-wrapper p.has-small-font-size { .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-normal-font-size,
.editor-styles-wrapper p.has-regular-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 { .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 { .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 { .editor-styles-wrapper p.has-larger-font-size {

8
wp-content/themes/twentytwenty/style-rtl.css
View File

@ -2836,21 +2836,21 @@ h2.entry-title {
/* Block Font Sizes -------------------------- */ /* Block Font Sizes -------------------------- */
.entry-content .has-small-font-size { .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-normal-font-size,
.entry-content .has-regular-font-size { .entry-content .has-regular-font-size {
font-size: 1em; --wp--preset--font-size--normal: 1em;
} }
.entry-content .has-medium-font-size { .entry-content .has-medium-font-size {
font-size: 1.1em; --wp--preset--font-size--medium: 1.1em;
line-height: 1.45; line-height: 1.45;
} }
.entry-content .has-large-font-size { .entry-content .has-large-font-size {
font-size: 1.25em; --wp--preset--font-size--large: 1.25em;
line-height: 1.4; line-height: 1.4;
} }

8
wp-content/themes/twentytwenty/style.css
View File

@ -2854,21 +2854,21 @@ h2.entry-title {
/* Block Font Sizes -------------------------- */ /* Block Font Sizes -------------------------- */
.entry-content .has-small-font-size { .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-normal-font-size,
.entry-content .has-regular-font-size { .entry-content .has-regular-font-size {
font-size: 1em; --wp--preset--font-size--normal: 1em;
} }
.entry-content .has-medium-font-size { .entry-content .has-medium-font-size {
font-size: 1.1em; --wp--preset--font-size--medium: 1.1em;
line-height: 1.45; line-height: 1.45;
} }
.entry-content .has-large-font-size { .entry-content .has-large-font-size {
font-size: 1.25em; --wp--preset--font-size--large: 1.25em;
line-height: 1.4; line-height: 1.4;
} }

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.0-alpha-52547'; $wp_version = '6.0-alpha-52549';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.