From e642c0d9f6410b7fbecd092bf2a336e34d557604 Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Mon, 5 Apr 2021 12:37:20 +0100
Subject: [PATCH] Address review feedback

---
 packages/components/src/button/style.scss      | 7 +++++--
 packages/components/src/placeholder/style.scss | 6 +++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/components/src/button/style.scss b/packages/components/src/button/style.scss
index 0698b48a9f11d..ab06c09cd67a3 100644
--- a/packages/components/src/button/style.scss
+++ b/packages/components/src/button/style.scss
@@ -1,5 +1,8 @@
-.block-editor-block-list__layout input.components-button,
-.block-editor-block-list__layout button.components-button,
+// These two first selectors shouldn't be needed ideally,
+// but they are useful in case theme styles conflict with Button styles
+// For example inside the image block placeholder.
+.editor-styles-wrapper input.components-button,
+.editor-styles-wrapper button.components-button,
 .components-button {
 	align-items: center;
 	background: none;
diff --git a/packages/components/src/placeholder/style.scss b/packages/components/src/placeholder/style.scss
index a2e0e8508aec1..b0835e1a7357e 100644
--- a/packages/components/src/placeholder/style.scss
+++ b/packages/components/src/placeholder/style.scss
@@ -96,7 +96,11 @@
 	width: 50%;
 }
 
-.block-editor-block-list__layout .components-placeholder__fieldset button.components-button {
+.components-placeholder__fieldset button.components-button,
+// This selector shouldn't be needed ideally,
+// but they are useful in case theme styles conflict with Button styles
+// For example inside the image block placeholder.
+.editor-styles-wrapper .components-placeholder__fieldset button.components-button {
 	margin-right: $grid-unit-15;
 	margin-bottom: $grid-unit-15; // If buttons wrap we need vertical space between.