From f6bb90ec9b1c784fe236984f2e3dfec1a5964d2d Mon Sep 17 00:00:00 2001
From: Andrew Serong <14988353+andrewserong@users.noreply.github.com>
Date: Thu, 9 Dec 2021 17:31:51 +1100
Subject: [PATCH 1/3] Border Style Control: Update line-height, bottom-margin,
 and padding for consistency with Width control

---
 .../src/components/border-style-control/style.scss           | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/block-editor/src/components/border-style-control/style.scss b/packages/block-editor/src/components/border-style-control/style.scss
index 0a094490210fc0..5d4164c7664cf1 100644
--- a/packages/block-editor/src/components/border-style-control/style.scss
+++ b/packages/block-editor/src/components/border-style-control/style.scss
@@ -1,7 +1,8 @@
 .components-border-style-control {
 	legend {
-		line-height: 1.2;
-		padding-bottom: $grid-unit-05;
+		line-height: 1.4;
+		margin-bottom: $grid-unit-10;
+		padding: 0;
 	}
 
 	.components-border-style-control__buttons {

From f5eee41d778ab7b2808703a3233c5eec00d69cc9 Mon Sep 17 00:00:00 2001
From: Andrew Serong <14988353+andrewserong@users.noreply.github.com>
Date: Thu, 9 Dec 2021 17:40:19 +1100
Subject: [PATCH 2/3] Add changelog entry

---
 packages/components/CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index 4b0846f906731c..13ea4dc6d45c4b 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -15,6 +15,7 @@
 
 ### Bug Fix
 
+-   Fix alignment of `BorderStyleControl` legend with border width control's label ([#37244](https://github.com/WordPress/gutenberg/pull/37244)).
 -   Improve accessibility and visibility in `ColorPallete` ([#36925](https://github.com/WordPress/gutenberg/pull/36925))
 -   Fixed spacing between `BaseControl` fields and help text within the `ToolsPanel` ([#36334](https://github.com/WordPress/gutenberg/pull/36334))
 -   Replaced hardcoded blue in `ColorPicker` with UI theme color ([#36153](https://github.com/WordPress/gutenberg/pull/36153)).

From fac480ba7b2c2d50bbd68886e996b8322e326af6 Mon Sep 17 00:00:00 2001
From: Andrew Serong <14988353+andrewserong@users.noreply.github.com>
Date: Fri, 10 Dec 2021 10:10:05 +1100
Subject: [PATCH 3/3] Remove changelog entry

---
 packages/components/CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index 13ea4dc6d45c4b..4b0846f906731c 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -15,7 +15,6 @@
 
 ### Bug Fix
 
--   Fix alignment of `BorderStyleControl` legend with border width control's label ([#37244](https://github.com/WordPress/gutenberg/pull/37244)).
 -   Improve accessibility and visibility in `ColorPallete` ([#36925](https://github.com/WordPress/gutenberg/pull/36925))
 -   Fixed spacing between `BaseControl` fields and help text within the `ToolsPanel` ([#36334](https://github.com/WordPress/gutenberg/pull/36334))
 -   Replaced hardcoded blue in `ColorPicker` with UI theme color ([#36153](https://github.com/WordPress/gutenberg/pull/36153)).