From 6020b9450c5aa03c549b457ba9b45323ed5b62ce Mon Sep 17 00:00:00 2001
From: Tetsuaki Hamano <tetsuaki.hamano@gmail.com>
Date: Sat, 20 Jan 2024 14:10:41 +0900
Subject: [PATCH] Fix border position when "Show button text labels" is enabled

---
 packages/edit-post/src/components/header/style.scss        | 7 +++----
 .../edit-site/src/components/header-edit-mode/style.scss   | 7 +++----
 packages/edit-widgets/src/components/header/style.scss     | 3 +--
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/packages/edit-post/src/components/header/style.scss b/packages/edit-post/src/components/header/style.scss
index 0ca55041ff91a..0dc8881434acb 100644
--- a/packages/edit-post/src/components/header/style.scss
+++ b/packages/edit-post/src/components/header/style.scss
@@ -117,8 +117,7 @@
 			@include break-small() {
 				&:not(.is-horizontal) .block-editor-block-mover__move-button-container {
 					position: relative;
-					top: -6px;
-					justify-content: flex-start;
+					top: -10px;
 				}
 			}
 		}
@@ -234,9 +233,9 @@
 		&::before {
 			content: "";
 			width: $border-width;
-			margin-top: $grid-unit-15;
-			margin-bottom: $grid-unit-15;
+			height: $grid-unit-30;
 			background-color: $gray-300;
+			margin-top: $grid-unit-05;
 			margin-left: $grid-unit;
 		}
 
diff --git a/packages/edit-site/src/components/header-edit-mode/style.scss b/packages/edit-site/src/components/header-edit-mode/style.scss
index 0740955d083d2..adc4d9ac52d3a 100644
--- a/packages/edit-site/src/components/header-edit-mode/style.scss
+++ b/packages/edit-site/src/components/header-edit-mode/style.scss
@@ -149,9 +149,9 @@ $header-toolbar-min-width: 335px;
 		&::before {
 			content: "";
 			width: $border-width;
-			margin-top: $grid-unit-15;
-			margin-bottom: $grid-unit-15;
+			height: $grid-unit-30;
 			background-color: $gray-300;
+			margin-top: $grid-unit-05;
 			margin-left: $grid-unit;
 		}
 
@@ -232,8 +232,7 @@ $header-toolbar-min-width: 335px;
 			@include break-small() {
 				&:not(.is-horizontal) .block-editor-block-mover__move-button-container {
 					position: relative;
-					top: -6px;
-					justify-content: flex-start;
+					top: -10px;
 				}
 			}
 		}
diff --git a/packages/edit-widgets/src/components/header/style.scss b/packages/edit-widgets/src/components/header/style.scss
index a3e819737d19d..c4a77330cc921 100644
--- a/packages/edit-widgets/src/components/header/style.scss
+++ b/packages/edit-widgets/src/components/header/style.scss
@@ -67,8 +67,7 @@
 			@include break-small() {
 				&:not(.is-horizontal) .block-editor-block-mover__move-button-container {
 					position: relative;
-					top: -6px;
-					justify-content: flex-start;
+					top: -10px;
 				}
 			}
 		}