From 02335dc99ee55c3e4587dbe9ce1242b4d501f0f6 Mon Sep 17 00:00:00 2001
From: Staci Cooper <63313398+stacimc@users.noreply.github.com>
Date: Tue, 16 Nov 2021 16:21:38 -0800
Subject: [PATCH] Border panel: Update panel layout (#35938)

* Restore single-column styling for appropriate controls

* Remove clear button from Color picker in ToolsPanel
---
 packages/block-editor/src/hooks/border.scss                  | 5 +++++
 .../edit-site/src/components/global-styles/border-panel.js   | 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/edit-site/src/components/global-styles/border-panel.js b/packages/edit-site/src/components/global-styles/border-panel.js
index 23cdaa88b7b0e4..f39d9d99b8367b 100644
--- a/packages/edit-site/src/components/global-styles/border-panel.js
+++ b/packages/edit-site/src/components/global-styles/border-panel.js
@@ -176,6 +176,7 @@ export default function BorderPanel( { name } ) {
 						disableCustomColors={ disableCustomColors }
 						disableCustomGradients={ disableCustomGradients }
 						onColorChange={ handleOnChange( setBorderColor ) }
+						clearable={ false }
 					/>
 				</ToolsPanelItem>
 			) }
diff --git a/packages/edit-site/src/components/sidebar/style.scss b/packages/edit-site/src/components/sidebar/style.scss
index 36a0155a281183..b6189e4d914417 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;