From da36e6ad2cd0d5ea312110d39e9541e1af6b3c1b Mon Sep 17 00:00:00 2001
From: Joen A <1204802+jasmussen@users.noreply.github.com>
Date: Wed, 1 Sep 2021 09:48:30 +0200
Subject: [PATCH] Fix padding regression. (#34435)

---
 .../src/components/media-replace-flow/style.scss   | 14 ++++----------
 .../src/components/tool-selector/style.scss        | 10 +++++-----
 packages/components/src/dropdown-menu/style.scss   | 12 ++++++------
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/packages/block-editor/src/components/media-replace-flow/style.scss b/packages/block-editor/src/components/media-replace-flow/style.scss
index 110194f490b46f..f9547779548296 100644
--- a/packages/block-editor/src/components/media-replace-flow/style.scss
+++ b/packages/block-editor/src/components/media-replace-flow/style.scss
@@ -5,22 +5,16 @@
 	display: none;
 }
 
-// Forcing some space above the list of options in
-// the dropdown to visually balance them.
-.block-editor-media-replace-flow__options .components-popover__content > div {
-	padding-top: $grid-unit-20;
-}
-
 .block-editor-media-replace-flow__indicator {
 	margin-left: 4px;
 }
 
 .block-editor-media-flow__url-input {
 	border-top: $border-width solid $gray-900;
-	margin-top: $grid-unit-15;
-	margin-right: -$grid-unit-15;
-	margin-left: -$grid-unit-15;
-	padding: $grid-unit-15 $grid-unit-30 0;
+	margin-top: $grid-unit-10;
+	margin-right: -$grid-unit-10;
+	margin-left: -$grid-unit-10;
+	padding: $grid-unit-20;
 
 	.block-editor-media-replace-flow__image-url-label {
 		display: block;
diff --git a/packages/block-editor/src/components/tool-selector/style.scss b/packages/block-editor/src/components/tool-selector/style.scss
index ad605ef037fe79..03774fe0f6b9d3 100644
--- a/packages/block-editor/src/components/tool-selector/style.scss
+++ b/packages/block-editor/src/components/tool-selector/style.scss
@@ -1,10 +1,10 @@
 .block-editor-tool-selector__help {
 	margin-top: $grid-unit-10;
-	margin-left: -$grid-unit-15;
-	margin-right: -$grid-unit-15;
-	margin-bottom: -$grid-unit-15;
-	padding: $grid-unit-15 ($grid-unit-15 + $grid-unit-10);
-	border-top: 1px solid $gray-300;
+	margin-left: -$grid-unit-10;
+	margin-right: -$grid-unit-10;
+	margin-bottom: -$grid-unit-10;
+	padding: $grid-unit-20;
+	border-top: $border-width solid $gray-300;
 	color: $gray-700;
 	min-width: 280px;
 }
diff --git a/packages/components/src/dropdown-menu/style.scss b/packages/components/src/dropdown-menu/style.scss
index 60e1a91270294f..64303ea9049eb7 100644
--- a/packages/components/src/dropdown-menu/style.scss
+++ b/packages/components/src/dropdown-menu/style.scss
@@ -61,25 +61,25 @@
 	}
 
 	.components-menu-group {
-		padding: $grid-unit-15;
+		padding: $grid-unit-10;
 		margin-top: 0;
 		margin-bottom: 0;
-		margin-left: -$grid-unit-15;
-		margin-right: -$grid-unit-15;
+		margin-left: -$grid-unit-10;
+		margin-right: -$grid-unit-10;
 
 		&:first-child {
-			margin-top: -$grid-unit-15;
+			margin-top: -$grid-unit-10;
 		}
 
 		&:last-child {
-			margin-bottom: -$grid-unit-15;
+			margin-bottom: -$grid-unit-10;
 		}
 	}
 
 	.components-menu-group + .components-menu-group {
 		margin-top: 0;
 		border-top: $border-width solid $gray-400;
-		padding: $grid-unit-15;
+		padding: $grid-unit-10;
 
 		.is-alternate & {
 			border-color: $gray-900;