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

Twenty Twenty-One: Allow editor styles to control block margins. 

This change removes some overrides that prevented site editor updates in 5.9 from controlling vertical margins via `var(--global--spacing-vertical)`.

Props stacimc, Boniu91, aristath, ironprogrammer, nidhidhandhukiya.
Fixes #54250.

Built from https://develop.svn.wordpress.org/trunk@52726


git-svn-id: http://core.svn.wordpress.org/trunk@52315 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
audrasjb 2022-02-14 21:55:08 +00:00
parent 21a51e9993
commit f4a871189a
4 changed files with 1 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wp-content/themes/twentytwentyone/assets/css/ie-editor.css
View File

@ -398,19 +398,6 @@ a:hover {
/** /**
* Block Options * Block Options
*/ */
[data-block].wp-block-buttons {
margin-top: 0;
margin-bottom: 0;
}
[data-block].wp-block-buttons .wp-block-button:first-child {
margin-top: 30px;
}
[data-block].wp-block-buttons .wp-block-button:last-child {
margin-bottom: 30px;
}
.wp-block-button:not(.is-style-outline) .wp-block-button__link:not(:hover):not(:active):not(.has-text-color) { .wp-block-button:not(.is-style-outline) .wp-block-button__link:not(:hover):not(:active):not(.has-text-color) {
color: #d1e4dd; color: #d1e4dd;
} }

13
wp-content/themes/twentytwentyone/assets/css/style-editor.css
View File

@ -586,19 +586,6 @@ a:hover {
/** /**
* Block Options * Block Options
*/ */
[data-block].wp-block-buttons {
margin-top: 0;
margin-bottom: 0;
}
[data-block].wp-block-buttons .wp-block-button:first-child {
margin-top: var(--global--spacing-vertical);
}
[data-block].wp-block-buttons .wp-block-button:last-child {
margin-bottom: var(--global--spacing-vertical);
}
.wp-block-button:not(.is-style-outline) .wp-block-button__link:not(:hover):not(:active):not(.has-text-color) { .wp-block-button:not(.is-style-outline) .wp-block-button__link:not(:hover):not(:active):not(.has-text-color) {
color: var(--global--color-background); color: var(--global--color-background);
} }

15
wp-content/themes/twentytwentyone/assets/sass/05-blocks/button/_editor.scss
View File

@ -7,21 +7,6 @@
* Block Options * Block Options
*/ */
// The parent container does not need outer margins applied.
// The children should all have top and bottom margins.
[data-block].wp-block-buttons {
margin-top: 0;
margin-bottom: 0;
.wp-block-button:first-child {
margin-top: var(--global--spacing-vertical);
}
.wp-block-button:last-child {
margin-bottom: var(--global--spacing-vertical);
}
}
.wp-block-button { .wp-block-button {
// Target the default and filled button states. // Target the default and filled button states.

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.0-alpha-52725'; $wp_version = '6.0-alpha-52726';
/** /**
* 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.