From 5237f454bd7b4c2a264a666d2a3c78ca2fe52bdc Mon Sep 17 00:00:00 2001
From: Peter Wilson <wilson@peterwilson.cc>
Date: Tue, 14 Feb 2023 04:03:18 +0000
Subject: [PATCH] Bundled themes: Fix row variation nested in group block.

Remove the `display` property from the custom group block styles to prevent the flex layout in the row variation from been removed.

Props abirhasandipu, poena, robinwpdeveloper.
Fixes #56226.


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


git-svn-id: http://core.svn.wordpress.org/trunk@54862 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 .../twentytwentyone/assets/css/ie-editor.css      | 13 -------------
 .../twentytwentyone/assets/css/style-editor.css   | 13 -------------
 .../assets/sass/05-blocks/group/_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 47e0ac3533..954d0dcb8a 100644
--- a/wp-content/themes/twentytwentyone/assets/css/ie-editor.css
+++ b/wp-content/themes/twentytwentyone/assets/css/ie-editor.css
@@ -863,19 +863,6 @@ a:hover {
 	color: #fff;
 }
 
-.wp-block-group {
-	display: block;
-	clear: both;
-	display: flow-root;
-}
-
-.wp-block-group:before,
-.wp-block-group:after {
-	content: "";
-	display: block;
-	clear: both;
-}
-
 .wp-block-group.has-background {
 	padding: 30px;
 }
diff --git a/wp-content/themes/twentytwentyone/assets/css/style-editor.css b/wp-content/themes/twentytwentyone/assets/css/style-editor.css
index 9ff76a5234..ccd7195d5e 100644
--- a/wp-content/themes/twentytwentyone/assets/css/style-editor.css
+++ b/wp-content/themes/twentytwentyone/assets/css/style-editor.css
@@ -931,19 +931,6 @@ a:hover {
 	color: var(--global--color-white);
 }
 
-.wp-block-group {
-	display: block;
-	clear: both;
-	display: flow-root;
-}
-
-.wp-block-group:before,
-.wp-block-group:after {
-	content: "";
-	display: block;
-	clear: both;
-}
-
 .wp-block-group.has-background {
 	padding: var(--global--spacing-vertical);
 }
diff --git a/wp-content/themes/twentytwentyone/assets/sass/05-blocks/group/_editor.scss b/wp-content/themes/twentytwentyone/assets/sass/05-blocks/group/_editor.scss
index c3f2bd6260..5f28b46e0a 100644
--- a/wp-content/themes/twentytwentyone/assets/sass/05-blocks/group/_editor.scss
+++ b/wp-content/themes/twentytwentyone/assets/sass/05-blocks/group/_editor.scss
@@ -1,19 +1,4 @@
 .wp-block-group {
-	// Start IE clearfix.
-	// This hack is only necessary because we want to support IE11.
-	// If we don't want to support IE11, then "display: flow-root" would suffice.
-	display: block;
-	clear: both;
-
-	display: flow-root; // stylelint-disable-line declaration-block-no-duplicate-properties
-
-	&:before,
-	&:after {
-		content: "";
-		display: block;
-		clear: both;
-	}
-	// End IE clearfix.
 
 	&.has-background {
 		padding: var(--global--spacing-vertical);
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 81433d9416..db074c10f6 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.2-beta1-55328';
+$wp_version = '6.2-beta1-55329';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.