From d90c6b3ed068f99ebc19c13069af69f89856de3a Mon Sep 17 00:00:00 2001
From: Aaron Robertshaw <60436221+aaronrobertshaw@users.noreply.github.com>
Date: Tue, 27 Sep 2022 15:47:59 +1000
Subject: [PATCH] Make radius control match border and grid

---
 .../components/border-radius-control/style.scss  | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/packages/block-editor/src/components/border-radius-control/style.scss b/packages/block-editor/src/components/border-radius-control/style.scss
index 4dbd8fcbea134..a28f5550921c3 100644
--- a/packages/block-editor/src/components/border-radius-control/style.scss
+++ b/packages/block-editor/src/components/border-radius-control/style.scss
@@ -11,9 +11,9 @@
 		align-items: flex-start;
 
 		> .components-unit-control-wrapper {
-			width: 120px;
+			width: 116px;
 			margin-bottom: 0;
-			margin-right: #{$grid-unit-15};
+			margin-right: #{$grid-unit-20};
 			flex-shrink: 0;
 		}
 
@@ -51,14 +51,10 @@
 	}
 
 	.components-border-radius-control__input-controls-wrapper {
-		display: flex;
-		flex-wrap: wrap;
-
-		.components-border-radius-control__tooltip-wrapper {
-			width: calc(50% - #{$grid-unit-10});
-			margin-bottom: $grid-unit-10;
-			margin-right: $grid-unit-10;
-		}
+		display: grid;
+		gap: $grid-unit-20;
+		grid-template-columns: repeat(2, minmax(0, 1fr));
+		margin-right: $grid-unit-15;
 	}
 
 	.component-border-radius-control__linked-button.has-icon {