From fe9c974f65ab1b162c4d0866fc64f17eb9338b84 Mon Sep 17 00:00:00 2001
From: Lena Morita <lena@jaguchi.com>
Date: Thu, 21 Jul 2022 21:00:16 +0900
Subject: [PATCH] Remove bottom margin using prop

---
 .../block-editor/src/components/colors-gradients/control.js | 1 +
 .../block-editor/src/components/colors-gradients/style.scss | 6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/block-editor/src/components/colors-gradients/control.js b/packages/block-editor/src/components/colors-gradients/control.js
index 199d5e6942daa..12d519aa474d3 100644
--- a/packages/block-editor/src/components/colors-gradients/control.js
+++ b/packages/block-editor/src/components/colors-gradients/control.js
@@ -115,6 +115,7 @@ function ColorGradientControlInner( {
 
 	return (
 		<BaseControl
+			__nextHasNoMarginBottom
 			className={ classnames(
 				'block-editor-color-gradient-control',
 				className
diff --git a/packages/block-editor/src/components/colors-gradients/style.scss b/packages/block-editor/src/components/colors-gradients/style.scss
index 3a4ca14867acd..f60fe265d4a31 100644
--- a/packages/block-editor/src/components/colors-gradients/style.scss
+++ b/packages/block-editor/src/components/colors-gradients/style.scss
@@ -7,10 +7,6 @@ $swatch-gap: 12px;
 	.block-editor-color-gradient-control__color-indicator {
 		margin-bottom: $grid-unit-15;
 	}
-
-	> .components-base-control__field {
-		margin-bottom: 0;
-	}
 }
 
 .block-editor-color-gradient-control__fieldset {
@@ -45,7 +41,7 @@ $swatch-gap: 12px;
 }
 
 .block-editor-panel-color-gradient-settings__dropdown-content .components-popover__content {
-	width: ( $swatch-size * 6 ) + ( $swatch-gap * 5 ) + ( $grid-unit-20 * 2 ); // Ensure the popover perfectly wraps the swatches. 
+	width: ( $swatch-size * 6 ) + ( $swatch-gap * 5 ) + ( $grid-unit-20 * 2 ); // Ensure the popover perfectly wraps the swatches.
 	padding: $grid-unit-20;
 }