Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Test latest on 43633 #6222

Closed
wants to merge 1 commit into from
Closed

Test latest on 43633 #6222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/wp-includes/admin-bar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ function wp_admin_bar_wp_menu( $wp_admin_bar ) {
__( 'About WordPress' ) .
'</span>',
'href' => $about_url,
'meta' => array(
'meta' => array(
'menu_title' => __( 'About WordPress' ),
),
);
Expand Down Expand Up @@ -286,7 +286,9 @@ function wp_admin_bar_my_account_item( $wp_admin_bar ) {
'href' => $profile_url,
'meta' => array(
'class' => $class,
/* translators: %s: Current user's display name. */
'menu_title' => sprintf( __( 'Howdy, %s' ), $current_user->display_name ),
'tabindex' => ( false !== $profile_url ) ? '' : 0,
),
)
);
Expand Down Expand Up @@ -329,7 +331,9 @@ function wp_admin_bar_my_account_menu( $wp_admin_bar ) {
$user_info .= "<span class='username'>{$current_user->user_login}</span>";
}

$user_info .= "<span class='edit-profile'>" . __( 'Edit Profile' ) . '</span>';
if ( false !== $profile_url ) {
$user_info .= "<span class='display-name edit-profile'>" . __( 'Edit Profile' ) . '</span>';
}

$wp_admin_bar->add_node(
array(
Expand Down Expand Up @@ -389,7 +393,7 @@ function wp_admin_bar_site_menu( $wp_admin_bar ) {
'id' => 'site-name',
'title' => $title,
'href' => ( is_admin() || ! current_user_can( 'read' ) ) ? home_url( '/' ) : admin_url(),
'meta' => array(
'meta' => array(
'menu_title' => $title,
),
)
Expand Down Expand Up @@ -990,7 +994,7 @@ function wp_admin_bar_new_content_menu( $wp_admin_bar ) {
'id' => 'new-content',
'title' => $title,
'href' => admin_url( current( array_keys( $actions ) ) ),
'meta' => array(
'meta' => array(
'menu_title' => _x( 'New', 'admin bar menu group label' ),
),
)
Expand Down
2 changes: 1 addition & 1 deletion src/wp-includes/class-wp-admin-bar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ final protected function _render_container( $node ) {
* @since 6.5.0 Added `$menu_title` parameter to allow an ARIA menu name.
*
* @param object $node
* @param string|bool $menu_title The accessible name of this aria menu or false if not provided.
* @param string|bool $menu_title The accessible name of this ARIA menu or false if not provided.
*/
final protected function _render_group( $node, $menu_title = false ) {
if ( 'container' === $node->type ) {
Expand Down
9 changes: 2 additions & 7 deletions src/wp-includes/css/admin-bar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ html:lang(he-il) .rtl #wpadminbar * {
#wpadminbar.nojs .quicklinks .menupop:hover ul li .ab-item,
#wpadminbar .shortlink-input {
line-height: 2;
height: 26px;
height: 1.875rem;
white-space: nowrap;
min-width: 140px;
}
Expand Down Expand Up @@ -447,11 +447,6 @@ html:lang(he-il) .rtl #wpadminbar * {
background: none;
}

#wpadminbar #wp-admin-bar-user-info a {
display: grid;
row-gap: 12px;
}

#wp-admin-bar-user-info .avatar {
position: absolute;
left: -72px;
Expand All @@ -468,7 +463,7 @@ html:lang(he-il) .rtl #wpadminbar * {
#wpadminbar #wp-admin-bar-user-info span {
background: none;
padding: 0;
height: 18px;
height: 1.125rem;
}

#wpadminbar #wp-admin-bar-user-info .display-name,
Expand Down