Ticket #37513: 37513.2.diff

src/wp-includes/class-wp-admin-bar.php

@@ -474 +474 @@
                 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 ';
@@ -488 +490 @@
                         $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 = '<span class="wp-admin-bar-arrow-right" aria-hidden="true"></span>';
+                }
+
                 if ( ! empty( $node->meta['class'] ) )
                         $menuclass .= $node->meta['class'];
 
@@ -532 +539 @@
                                 ?>><?php
                         endif;
 
-                        echo $node->title;
+                        echo $arrow_right . $node->title;
 
                         if ( $has_link ) :
                                 ?></a><?php

src/wp-includes/css/admin-bar.css

@@ -234 +234 @@
 
 #wpadminbar > #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 +313 @@
         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 +327 @@
         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;
 }