diff --git a/packages/block-library/src/navigation-link/index.php b/packages/block-library/src/navigation-link/index.php
index deeee6adddf42e..c2af68c24ecac2 100644
--- a/packages/block-library/src/navigation-link/index.php
+++ b/packages/block-library/src/navigation-link/index.php
@@ -215,15 +215,14 @@ function render_block_core_navigation_link( $attributes, $content, $block ) {
}
$html .= '';
+ $html .= '';
+ // End anchor tag content.
if ( isset( $block->context['showSubmenuIcon'] ) && $block->context['showSubmenuIcon'] && $has_submenu ) {
// The submenu icon can be hidden by a CSS rule on the Navigation Block.
$html .= '';
}
- $html .= '';
- // End anchor tag content.
-
if ( $has_submenu ) {
$inner_blocks_html = '';
foreach ( $block->inner_blocks as $inner_block ) {
diff --git a/packages/block-library/src/navigation-submenu/edit.js b/packages/block-library/src/navigation-submenu/edit.js
index e6ac37c579dc62..226b3fe430cf7b 100644
--- a/packages/block-library/src/navigation-submenu/edit.js
+++ b/packages/block-library/src/navigation-submenu/edit.js
@@ -657,12 +657,12 @@ export default function NavigationSubmenuEdit( {
/>
) }
- { ( showSubmenuIcon || openSubmenusOnClick ) && (
-
-
-
- ) }
+ { ( showSubmenuIcon || openSubmenusOnClick ) && (
+
+
+
+ ) }
diff --git a/packages/block-library/src/navigation-submenu/index.php b/packages/block-library/src/navigation-submenu/index.php
index 6da79414c4beb3..69c41d66b87465 100644
--- a/packages/block-library/src/navigation-submenu/index.php
+++ b/packages/block-library/src/navigation-submenu/index.php
@@ -245,10 +245,10 @@ function render_block_core_navigation_submenu( $attributes, $content, $block ) {
$html .= '';
- $html .= '';
-
$html .= '';
+ $html .= '';
+
}
if ( $has_submenu ) {
diff --git a/packages/block-library/src/navigation/style.scss b/packages/block-library/src/navigation/style.scss
index 45ef1969ade897..5eeff8a272582a 100644
--- a/packages/block-library/src/navigation/style.scss
+++ b/packages/block-library/src/navigation/style.scss
@@ -85,7 +85,6 @@ $navigation-icon-size: 24px;
align-self: center; // This one affects nested submenu indicators.
line-height: 0;
display: inline-block;
- vertical-align: middle;
font-size: inherit;
// Affect the button as well.
@@ -104,6 +103,9 @@ $navigation-icon-size: 24px;
stroke: currentColor;
width: inherit;
height: inherit;
+
+ // Position the arrow to balance with the the text.
+ margin-top: 0.075em;
}
}
@@ -216,6 +218,11 @@ $navigation-icon-size: 24px;
}
}
+ // Push inwards from right edge of submenu.
+ .wp-block-navigation__submenu-icon {
+ margin-right: 0.25em;
+ }
+
// Reset the submenu indicator for horizontal flyouts.
.wp-block-navigation__submenu-icon svg {
transform: rotate(-90deg);
diff --git a/packages/block-library/src/page-list/edit.js b/packages/block-library/src/page-list/edit.js
index d52ebc3a8764ec..d1a37e4eb80911 100644
--- a/packages/block-library/src/page-list/edit.js
+++ b/packages/block-library/src/page-list/edit.js
@@ -235,14 +235,16 @@ const PageItems = memo( function PageItems( {
function ItemSubmenuToggle( { title } ) {
return (
-
+ >
);
}