From 122a455a72f153cbdfb874d9f93701d9713662a7 Mon Sep 17 00:00:00 2001
From: Matt Sherman <matt@jam123.com>
Date: Fri, 17 May 2024 07:34:12 -0400
Subject: [PATCH 1/3] Move styles to inserter

---
 .../block-editor/src/components/inserter/style.scss | 13 +++++++++++++
 .../src/components/inserter-sidebar/style.scss      | 13 -------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/block-editor/src/components/inserter/style.scss b/packages/block-editor/src/components/inserter/style.scss
index 604268fb1fe431..6108bca3ddc8d4 100644
--- a/packages/block-editor/src/components/inserter/style.scss
+++ b/packages/block-editor/src/components/inserter/style.scss
@@ -115,6 +115,19 @@ $block-inserter-tabs-height: 44px;
 	flex-direction: column;
 	overflow: hidden;
 
+	.block-editor-inserter-sidebar__header {
+		border-bottom: $border-width solid $gray-300;
+		padding-right: $grid-unit-10;
+		display: flex;
+		justify-content: space-between;
+
+		.block-editor-inserter-sidebar__close-button {
+			/* stylelint-disable-next-line property-disallowed-list -- This should be refactored to avoid order if possible */
+			order: 1;
+			align-self: center;
+		}
+	}
+
 	.block-editor-inserter__tablist {
 		width: 100%;
 
diff --git a/packages/editor/src/components/inserter-sidebar/style.scss b/packages/editor/src/components/inserter-sidebar/style.scss
index c33e6eb7751c90..796bdebe221a6b 100644
--- a/packages/editor/src/components/inserter-sidebar/style.scss
+++ b/packages/editor/src/components/inserter-sidebar/style.scss
@@ -6,19 +6,6 @@
 	flex-direction: column;
 }
 
-.block-editor-inserter-sidebar__header {
-	border-bottom: $border-width solid $gray-300;
-	padding-right: $grid-unit-15;
-	display: flex;
-	justify-content: space-between;
-
-	.block-editor-inserter-sidebar__close-button {
-		/* stylelint-disable-next-line property-disallowed-list -- This should be refactored to avoid order if possible */
-		order: 1;
-		align-self: center;
-	}
-}
-
 .editor-inserter-sidebar__content {
 	// Leave space for the close button
 	height: calc(100% - #{$button-size} - #{$grid-unit-10});

From babdbfd63525c9967d452363e73014bf7321a5bf Mon Sep 17 00:00:00 2001
From: Matt Sherman <matt@jam123.com>
Date: Fri, 17 May 2024 07:59:55 -0400
Subject: [PATCH 2/3] Rename styles to be clearer

---
 .../block-editor/src/components/inserter/style.scss  | 12 ++++++------
 .../block-editor/src/components/inserter/tabs.js     |  4 ++--
 .../edit-widgets/src/components/layout/style.scss    |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/block-editor/src/components/inserter/style.scss b/packages/block-editor/src/components/inserter/style.scss
index 6108bca3ddc8d4..bebed230095ce0 100644
--- a/packages/block-editor/src/components/inserter/style.scss
+++ b/packages/block-editor/src/components/inserter/style.scss
@@ -115,17 +115,17 @@ $block-inserter-tabs-height: 44px;
 	flex-direction: column;
 	overflow: hidden;
 
-	.block-editor-inserter-sidebar__header {
+	.block-editor-inserter__tablist-and-close {
 		border-bottom: $border-width solid $gray-300;
 		padding-right: $grid-unit-10;
 		display: flex;
 		justify-content: space-between;
+	}
 
-		.block-editor-inserter-sidebar__close-button {
-			/* stylelint-disable-next-line property-disallowed-list -- This should be refactored to avoid order if possible */
-			order: 1;
-			align-self: center;
-		}
+	.block-editor-inserter__close-button {
+		/* stylelint-disable-next-line property-disallowed-list -- This should be refactored to avoid order if possible */
+		order: 1;
+		align-self: center;
 	}
 
 	.block-editor-inserter__tablist {
diff --git a/packages/block-editor/src/components/inserter/tabs.js b/packages/block-editor/src/components/inserter/tabs.js
index d3ce5d80993d3f..2bc20e76d4abba 100644
--- a/packages/block-editor/src/components/inserter/tabs.js
+++ b/packages/block-editor/src/components/inserter/tabs.js
@@ -39,9 +39,9 @@ function InserterTabs( { onSelect, children, onClose, selectedTab }, ref ) {
 	return (
 		<div className="block-editor-inserter__tabs" ref={ ref }>
 			<Tabs onSelect={ onSelect } selectedTabId={ selectedTab }>
-				<div className="block-editor-inserter-sidebar__header">
+				<div className="block-editor-inserter__tablist-and-close">
 					<Button
-						className="block-editor-inserter-sidebar__close-button"
+						className="block-editor-inserter__close-button"
 						icon={ closeSmall }
 						label={ __( 'Close block inserter' ) }
 						onClick={ () => onClose() }
diff --git a/packages/edit-widgets/src/components/layout/style.scss b/packages/edit-widgets/src/components/layout/style.scss
index 4f5bb8834593da..14d74e4db9248c 100644
--- a/packages/edit-widgets/src/components/layout/style.scss
+++ b/packages/edit-widgets/src/components/layout/style.scss
@@ -18,7 +18,7 @@
 	// Leave space for the close button
 	height: calc(100% - #{$button-size} - #{$grid-unit-10});
 
-	.block-editor-inserter-sidebar__header {
+	.block-editor-inserter__tablist-and-close {
 		display: none;
 	}
 

From 29f2b25a12a26682f4d3bb9bd37c7b3f8ecbda7f Mon Sep 17 00:00:00 2001
From: Matt Sherman <matt@jam123.com>
Date: Fri, 24 May 2024 15:41:11 -0400
Subject: [PATCH 3/3] Update padding right and class name

---
 packages/block-editor/src/components/inserter/style.scss | 4 ++--
 packages/block-editor/src/components/inserter/tabs.js    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/block-editor/src/components/inserter/style.scss b/packages/block-editor/src/components/inserter/style.scss
index bebed230095ce0..c588561b4f9c4d 100644
--- a/packages/block-editor/src/components/inserter/style.scss
+++ b/packages/block-editor/src/components/inserter/style.scss
@@ -115,9 +115,9 @@ $block-inserter-tabs-height: 44px;
 	flex-direction: column;
 	overflow: hidden;
 
-	.block-editor-inserter__tablist-and-close {
+	.block-editor-inserter__tablist-and-close-button {
 		border-bottom: $border-width solid $gray-300;
-		padding-right: $grid-unit-10;
+		padding-right: $grid-unit-15;
 		display: flex;
 		justify-content: space-between;
 	}
diff --git a/packages/block-editor/src/components/inserter/tabs.js b/packages/block-editor/src/components/inserter/tabs.js
index 2bc20e76d4abba..b46e4bfdaf0148 100644
--- a/packages/block-editor/src/components/inserter/tabs.js
+++ b/packages/block-editor/src/components/inserter/tabs.js
@@ -39,7 +39,7 @@ function InserterTabs( { onSelect, children, onClose, selectedTab }, ref ) {
 	return (
 		<div className="block-editor-inserter__tabs" ref={ ref }>
 			<Tabs onSelect={ onSelect } selectedTabId={ selectedTab }>
-				<div className="block-editor-inserter__tablist-and-close">
+				<div className="block-editor-inserter__tablist-and-close-button">
 					<Button
 						className="block-editor-inserter__close-button"
 						icon={ closeSmall }