diff --git a/src/wp-includes/class-wp-admin-bar.php b/src/wp-includes/class-wp-admin-bar.php index 49986ac225..b0a5e5d733 100644 --- a/src/wp-includes/class-wp-admin-bar.php +++ b/src/wp-includes/class-wp-admin-bar.php @@ -474,20 +474,27 @@ class WP_Admin_Bar { if ( $node->type != 'item' ) return; - $is_parent = ! empty( $node->children ); - $has_link = ! empty( $node->href ); + $is_parent = ! empty( $node->children ); + $has_link = ! empty( $node->href ); + $is_root_top_item = 'root-default' === $node->parent; + $is_top_secondary_item = 'top-secondary' === $node->parent; // Allow only numeric values, then casted to integers, and allow a tabindex value of `0` for a11y. $tabindex = ( isset( $node->meta['tabindex'] ) && is_numeric( $node->meta['tabindex'] ) ) ? (int) $node->meta['tabindex'] : ''; $aria_attributes = ( '' !== $tabindex ) ? ' tabindex="' . $tabindex . '"' : ''; - $menuclass = ''; + $menuclass = $arrow_right = ''; if ( $is_parent ) { $menuclass = 'menupop '; $aria_attributes .= ' aria-haspopup="true"'; } + // Print the right arrow icon for the primary menu children with children. + if ( ! $is_root_top_item && ! $is_top_secondary_item && $is_parent ) { + $arrow_right = ''; + } + if ( ! empty( $node->meta['class'] ) ) $menuclass .= $node->meta['class']; @@ -532,7 +539,7 @@ class WP_Admin_Bar { ?>>title; + echo $arrow_right . $node->title; if ( $has_link ) : ?> #wp-toolbar > #wp-admin-bar-root-default .ab-icon, #wpadminbar .ab-icon, -#wpadminbar .ab-item:before { +#wpadminbar .ab-item:before, +.wp-admin-bar-arrow-right { position: relative; float: left; font: normal 20px/1 dashicons; @@ -312,7 +313,7 @@ html:lang(he-il) .rtl #wpadminbar * { color: #00b9eb; } -#wpadminbar .menupop .menupop > .ab-item:before, +#wpadminbar .menupop .menupop > .ab-item .wp-admin-bar-arrow-right:before, #wpadminbar .ab-top-secondary .menupop .menupop > .ab-item:before { position: absolute; font: normal 17px/1 dashicons; @@ -326,9 +327,10 @@ html:lang(he-il) .rtl #wpadminbar * { padding-right: 2em; } -#wpadminbar .menupop .menupop > .ab-item:before { +#wpadminbar .menupop .menupop > .ab-item .wp-admin-bar-arrow-right:before { top: 1px; - right: 4px; + right: 10px; + padding: 4px 0; content: "\f139"; color: inherit; }