From f4a871189a34e5a8d7aa1bb322aa5d32128e79ff Mon Sep 17 00:00:00 2001
From: audrasjb <audrasjb@git.wordpress.org>
Date: Mon, 14 Feb 2022 21:55:08 +0000
Subject: [PATCH] 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
---
 .../twentytwentyone/assets/css/ie-editor.css      | 13 -------------
 .../twentytwentyone/assets/css/style-editor.css   | 13 -------------
 .../assets/sass/05-blocks/button/_editor.scss     | 15 ---------------
 wp-includes/version.php                           |  2 +-
 4 files changed, 1 insertion(+), 42 deletions(-)

diff --git a/wp-content/themes/twentytwentyone/assets/css/ie-editor.css b/wp-content/themes/twentytwentyone/assets/css/ie-editor.css
index 5afd750a7a..e91a00d68e 100644
--- a/wp-content/themes/twentytwentyone/assets/css/ie-editor.css
+++ b/wp-content/themes/twentytwentyone/assets/css/ie-editor.css
@@ -398,19 +398,6 @@ a:hover {
 /**
  * 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) {
 	color: #d1e4dd;
 }
diff --git a/wp-content/themes/twentytwentyone/assets/css/style-editor.css b/wp-content/themes/twentytwentyone/assets/css/style-editor.css
index d6019c45bb..22cf90dd98 100644
--- a/wp-content/themes/twentytwentyone/assets/css/style-editor.css
+++ b/wp-content/themes/twentytwentyone/assets/css/style-editor.css
@@ -586,19 +586,6 @@ a:hover {
 /**
  * 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) {
 	color: var(--global--color-background);
 }
diff --git a/wp-content/themes/twentytwentyone/assets/sass/05-blocks/button/_editor.scss b/wp-content/themes/twentytwentyone/assets/sass/05-blocks/button/_editor.scss
index d932f7e6a7..1aed34cf11 100644
--- a/wp-content/themes/twentytwentyone/assets/sass/05-blocks/button/_editor.scss
+++ b/wp-content/themes/twentytwentyone/assets/sass/05-blocks/button/_editor.scss
@@ -7,21 +7,6 @@
  * 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 {
 
 	// Target the default and filled button states.
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 66e77513b8..e6155451f5 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @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.