From a85eb79e303bbe276d17fecda8d7cfdabaf71048 Mon Sep 17 00:00:00 2001
From: Daniel Richards <daniel.richards@automattic.com>
Date: Thu, 16 Apr 2020 11:03:28 +0800
Subject: [PATCH] Improve submenu indicator styling

---
 packages/block-library/src/navigation-link/edit.js | 10 +++++-----
 packages/block-library/src/navigation/index.php    |  6 +++---
 packages/block-library/src/navigation/style.scss   |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/block-library/src/navigation-link/edit.js b/packages/block-library/src/navigation-link/edit.js
index b20ca1e528eef6..846491929a3a66 100644
--- a/packages/block-library/src/navigation-link/edit.js
+++ b/packages/block-library/src/navigation-link/edit.js
@@ -279,12 +279,12 @@ function NavigationLinkEdit( {
 							/>
 						</Popover>
 					) }
+					{ showSubmenuIcon && (
+						<span className="wp-block-navigation-link__submenu-icon">
+							<ItemSubmenuIcon />
+						</span>
+					) }
 				</div>
-				{ showSubmenuIcon && (
-					<span className="wp-block-navigation-link__submenu-icon">
-						<ItemSubmenuIcon />
-					</span>
-				) }
 				<InnerBlocks
 					allowedBlocks={ [ 'core/navigation-link' ] }
 					renderAppender={
diff --git a/packages/block-library/src/navigation/index.php b/packages/block-library/src/navigation/index.php
index e0332a5ab206d3..f680a931dc7b4f 100644
--- a/packages/block-library/src/navigation/index.php
+++ b/packages/block-library/src/navigation/index.php
@@ -255,9 +255,6 @@ function block_core_navigation_build_html( $attributes, $block, $colors, $font_s
 
 		$html .= '</span>';
 
-		$html .= '</a>';
-		// End anchor tag content.
-
 		// Append submenu icon to top-level item.
 		// it shows the icon as default, when 'showSubmenuIcon' is not set,
 		// or when it's set and also not False.
@@ -271,6 +268,9 @@ function block_core_navigation_build_html( $attributes, $block, $colors, $font_s
 			$html .= '<span class="wp-block-navigation-link__submenu-icon">' . block_core_navigation_render_submenu_icon() . '</span>';
 		}
 
+		$html .= '</a>';
+		// End anchor tag content.
+
 		if ( $has_submenu ) {
 			$html .= block_core_navigation_build_html( $attributes, $block, $colors, $font_sizes );
 		}
diff --git a/packages/block-library/src/navigation/style.scss b/packages/block-library/src/navigation/style.scss
index fad43b7ae895e9..7f3e331a9af1e1 100644
--- a/packages/block-library/src/navigation/style.scss
+++ b/packages/block-library/src/navigation/style.scss
@@ -85,7 +85,7 @@
 }
 
 .wp-block-navigation-link__submenu-icon {
-	padding: $grid-unit-10 * 0.75 $grid-unit-10 * 2;
+	padding-left: 1ch;
 
 	svg {
 		fill: currentColor;