From 2a1dc87a362c82d3dc433bf9893a4a67041e569a Mon Sep 17 00:00:00 2001
From: jasmussen <joen@automattic.com>
Date: Mon, 29 Mar 2021 12:38:26 +0200
Subject: [PATCH] Try: Increase specificity of horizontal block margins.

---
 .../src/components/block-list-appender/style.scss |  6 +++++-
 packages/block-library/src/buttons/editor.scss    | 15 +++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/packages/block-editor/src/components/block-list-appender/style.scss b/packages/block-editor/src/components/block-list-appender/style.scss
index ebfeb4c0b090c..3ad6c493035d8 100644
--- a/packages/block-editor/src/components/block-list-appender/style.scss
+++ b/packages/block-editor/src/components/block-list-appender/style.scss
@@ -12,7 +12,11 @@
 
 	// Add a little left margin when used horizontally.
 	// The right margin should be set to auto, so as to not shift layout in flex containers.
-	margin: 0 auto 0 $grid-unit-10;
+	// This needs specificity for non-block-themes.
+	&,
+	.edit-post-layout:not(.supports-layout) & {
+		margin: 0 auto 0 $grid-unit-10;
+	}
 
 	// ... unless it's the only child.
 	&:first-child {
diff --git a/packages/block-library/src/buttons/editor.scss b/packages/block-library/src/buttons/editor.scss
index 29b381ac79465..cf27f46097b05 100644
--- a/packages/block-library/src/buttons/editor.scss
+++ b/packages/block-library/src/buttons/editor.scss
@@ -8,20 +8,27 @@ $blocks-block__margin: 0.5em;
 
 .wp-block-buttons {
 	> .wp-block {
-		// Override editor auto block margins.
-		margin-left: 0;
-		margin-top: $blocks-block__margin;
-		margin-right: $blocks-block__margin;
+
+		&,
+		.edit-post-layout:not(.supports-layout) & {
+			// Override editor auto block margins.
+			margin-left: 0;
+			margin-top: $blocks-block__margin;
+			margin-right: $blocks-block__margin;
+		}
 	}
+
 	> .block-list-appender {
 		display: inline-flex;
 		align-items: center;
 	}
+
 	&.is-vertical {
 		> .block-list-appender .block-list-appender__toggle {
 			justify-content: flex-start;
 		}
 	}
+
 	> .wp-block-button {
 		&:focus {
 			box-shadow: none;