From 917053a14aedeff969c21facde41e3b7a9481005 Mon Sep 17 00:00:00 2001
From: Staci Cooper <staci.cooper@automattic.com>
Date: Mon, 25 Oct 2021 16:37:04 -0700
Subject: [PATCH] Restore single-column styling for appropriate controls

---
 packages/block-editor/src/hooks/border.scss          | 5 +++++
 packages/block-editor/src/style.scss                 | 1 +
 packages/edit-site/src/components/sidebar/style.scss | 4 ++++
 3 files changed, 10 insertions(+)
 create mode 100644 packages/block-editor/src/hooks/border.scss

diff --git a/packages/block-editor/src/hooks/border.scss b/packages/block-editor/src/hooks/border.scss
new file mode 100644
index 00000000000000..c86c046309d886
--- /dev/null
+++ b/packages/block-editor/src/hooks/border.scss
@@ -0,0 +1,5 @@
+.border-block-support-panel {
+	.single-column {
+		grid-column: span 1;
+	}
+}
diff --git a/packages/block-editor/src/style.scss b/packages/block-editor/src/style.scss
index 9eff84721fcf9c..de72069bcde141 100644
--- a/packages/block-editor/src/style.scss
+++ b/packages/block-editor/src/style.scss
@@ -54,6 +54,7 @@
 @import "./components/warning/style.scss";
 @import "./hooks/anchor.scss";
 @import "./hooks/layout.scss";
+@import "./hooks/border.scss";
 @import "./hooks/typography.scss";
 
 @import "./components/block-toolbar/style.scss";
diff --git a/packages/edit-site/src/components/sidebar/style.scss b/packages/edit-site/src/components/sidebar/style.scss
index a4749729a1cd48..b75fb1a7ed0356 100644
--- a/packages/edit-site/src/components/sidebar/style.scss
+++ b/packages/edit-site/src/components/sidebar/style.scss
@@ -39,6 +39,10 @@
 	border: 0;
 }
 
+.edit-site-global-styles-sidebar .components-tools-panel-item.single-column {
+	grid-column: span 1;
+}
+
 .edit-site-global-styles-sidebar__blocks-group {
 	padding-top: $grid-unit-30;
 	border-top: $border-width solid $gray-200;