Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 60 additions & 39 deletions src/wp-admin/css/admin-menu.css
Original file line number Diff line number Diff line change
Expand Up @@ -280,31 +280,46 @@
background-size: 20px auto;
}

#adminmenu div.wp-menu-image.svg-icon {
display: flex;
align-items: center;
justify-content: center;
}

#adminmenu div.wp-menu-image.svg-icon svg {
width: 24px;
height: 24px;
fill: currentColor;
}

div.wp-menu-image::before {
color: #a7aaad;
color: rgba(240, 246, 252, 0.6);
padding: 7px 0;
transition: all 0.1s ease-in-out;
}

#adminmenu div.wp-menu-image::before {
#adminmenu div.wp-menu-image {
color: #a7aaad;
color: rgba(240, 246, 252, 0.6);
transition: color 0.1s ease-in-out;
}

#adminmenu div.wp-menu-image::before {
color: inherit;
}

#adminmenu li.wp-has-current-submenu:hover div.wp-menu-image::before,
#adminmenu .wp-has-current-submenu div.wp-menu-image::before,
#adminmenu .current div.wp-menu-image::before,
#adminmenu a.wp-has-current-submenu:hover div.wp-menu-image::before,
#adminmenu a.current:hover div.wp-menu-image::before,
#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image::before,
#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image::before {
#adminmenu li.wp-has-current-submenu:hover div.wp-menu-image,
#adminmenu .wp-has-current-submenu div.wp-menu-image,
#adminmenu .current div.wp-menu-image,
#adminmenu a.wp-has-current-submenu:hover div.wp-menu-image,
#adminmenu a.current:hover div.wp-menu-image,
#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image,
#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image {
color: #fff;
}

#adminmenu li:hover div.wp-menu-image::before,
#adminmenu li a:focus div.wp-menu-image::before,
#adminmenu li.opensub div.wp-menu-image::before {
#adminmenu li:hover div.wp-menu-image,
#adminmenu li a:focus div.wp-menu-image,
#adminmenu li.opensub div.wp-menu-image {
color: #72aee6;
}

Expand All @@ -315,6 +330,10 @@ div.wp-menu-image::before {
z-index: 25;
}

.folded #adminmenu div.wp-menu-image.svg-icon {
height: 34px;
}

.folded #adminmenu a.menu-top {
height: 34px;
}
Expand Down Expand Up @@ -492,35 +511,34 @@ ul#adminmenu > li.current > a.current::after {
#collapse-button .collapse-button-icon {
width: 36px;
height: 34px;
display: flex;
align-items: center;
justify-content: center;
}

.folded #collapse-button .collapse-button-label {
display: none;
}

#collapse-button .collapse-button-icon::after {
content: "\f148";
content: "\f148" / "";
display: block;
#collapse-button .collapse-button-icon svg {
width: 24px;
height: 24px;
fill: currentColor;
position: relative;
top: 7px;
text-align: center;
font: 400 20px/1 dashicons !important;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
top: -1px;
}

/* rtl:ignore */
.folded #collapse-button .collapse-button-icon::after,
.rtl #collapse-button .collapse-button-icon::after {
.folded #collapse-button .collapse-button-icon svg,
.rtl #collapse-button .collapse-button-icon svg {
transform: rotate(180deg);
}

.rtl.folded #collapse-button .collapse-button-icon::after {
.rtl.folded #collapse-button .collapse-button-icon svg {
transform: none;
}

#collapse-button .collapse-button-icon::after,
#collapse-button .collapse-button-icon svg,
#collapse-button .collapse-button-label {
transition: all 0.1s ease-in-out;
}
Expand Down Expand Up @@ -600,6 +618,10 @@ li#wp-admin-bar-menu-toggle {
z-index: 25;
}

.auto-fold #adminmenu div.wp-menu-image.svg-icon {
height: 34px;
}

.auto-fold #adminmenu a.menu-top {
min-height: 34px;
}
Expand Down Expand Up @@ -641,11 +663,11 @@ li#wp-admin-bar-menu-toggle {
}

/* rtl:ignore */
.auto-fold #collapse-button .collapse-button-icon::after {
.auto-fold #collapse-button .collapse-button-icon svg {
transform: rotate(180deg);
}

.rtl.auto-fold #collapse-button .collapse-button-icon::after {
.rtl.auto-fold #collapse-button .collapse-button-icon svg {
transform: none;
}

Expand Down Expand Up @@ -806,26 +828,25 @@ li#wp-admin-bar-menu-toggle {
border: 1px solid transparent;
}

#wpadminbar #wp-admin-bar-menu-toggle .ab-icon::before {
content: "\f228";
display: inline-block;
#wpadminbar #wp-admin-bar-menu-toggle .ab-icon {
display: flex;
align-items: center;
justify-content: center;
float: left;
font: 400 40px/45px dashicons;
vertical-align: middle;
outline: none;
margin: 0;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
height: 44px;
width: 50px;
padding: 0;
border: none;
text-align: center;
text-decoration: none;
box-sizing: border-box;
}

.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon::before {
#wpadminbar #wp-admin-bar-menu-toggle .ab-icon svg {
width: 36px;
height: 36px;
}

.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon {
color: #72aee6;
}
}
Expand Down
49 changes: 21 additions & 28 deletions src/wp-admin/css/colors/_admin.scss
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ input[type="radio"]:focus {
color: variables.$menu-text;
}

#adminmenu div.wp-menu-image:before {
#adminmenu div.wp-menu-image {
color: variables.$menu-icon;
}

Expand All @@ -273,8 +273,8 @@ input[type="radio"]:focus {
background-color: variables.$menu-highlight-background;
}

#adminmenu li.menu-top:hover div.wp-menu-image:before,
#adminmenu li.opensub > a.menu-top div.wp-menu-image:before {
#adminmenu li.menu-top:hover div.wp-menu-image,
#adminmenu li.opensub > a.menu-top div.wp-menu-image {
color: variables.$menu-highlight-icon;
}

Expand Down Expand Up @@ -344,14 +344,14 @@ ul#adminmenu > li.current > a.current:after {
background: variables.$menu-current-background;
}

#adminmenu li.wp-has-current-submenu div.wp-menu-image:before,
#adminmenu a.current:hover div.wp-menu-image:before,
#adminmenu li.current div.wp-menu-image:before,
#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image:before,
#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image:before,
#adminmenu li:hover div.wp-menu-image:before,
#adminmenu li a:focus div.wp-menu-image:before,
#adminmenu li.opensub div.wp-menu-image:before {
#adminmenu li.wp-has-current-submenu div.wp-menu-image,
#adminmenu a.current:hover div.wp-menu-image,
#adminmenu li.current div.wp-menu-image,
#adminmenu li.wp-has-current-submenu a:focus div.wp-menu-image,
#adminmenu li.wp-has-current-submenu.opensub div.wp-menu-image,
#adminmenu li:hover div.wp-menu-image,
#adminmenu li a:focus div.wp-menu-image,
#adminmenu li.opensub div.wp-menu-image {
color: variables.$menu-current-icon;
}

Expand Down Expand Up @@ -401,7 +401,6 @@ ul#adminmenu > li.current > a.current:after {
}

#wpadminbar .ab-icon,
#wpadminbar .ab-icon:before,
#wpadminbar .ab-item:before,
#wpadminbar .ab-item:after {
color: variables.$menu-icon;
Expand All @@ -422,10 +421,9 @@ ul#adminmenu > li.current > a.current:after {
color: variables.$menu-submenu-focus-text;
}

#wpadminbar:not(.mobile) li:hover .ab-icon:before,
#wpadminbar:not(.mobile) li:hover .ab-icon,
#wpadminbar:not(.mobile) li:hover .ab-item:before,
#wpadminbar:not(.mobile) li:hover .ab-item:after,
#wpadminbar:not(.mobile) li:hover #adminbarsearch:before {
#wpadminbar:not(.mobile) li:hover .ab-item:after {
color: variables.$menu-submenu-focus-text;
}

Expand Down Expand Up @@ -462,39 +460,34 @@ ul#adminmenu > li.current > a.current:after {
#wpadminbar .quicklinks .menupop.hover ul li a:focus,
#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover,
#wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus,
#wpadminbar li:hover .ab-icon:before,
#wpadminbar li:hover .ab-icon,
#wpadminbar li:hover .ab-item:before,
#wpadminbar li a:focus .ab-icon:before,
#wpadminbar li a:focus .ab-icon,
#wpadminbar li .ab-item:focus:before,
#wpadminbar li .ab-item:focus .ab-icon:before,
#wpadminbar li.hover .ab-icon:before,
#wpadminbar li .ab-item:focus .ab-icon,
#wpadminbar li.hover .ab-icon,
#wpadminbar li.hover .ab-item:before,
#wpadminbar li:hover #adminbarsearch:before,
#wpadminbar li #adminbarsearch.adminbar-focused:before {
#wpadminbar li #adminbarsearch.adminbar-focused .ab-icon {
color: variables.$menu-submenu-focus-text;
}

#wpadminbar .quicklinks li a:hover .blavatar,
#wpadminbar .quicklinks li a:focus .blavatar,
#wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a .blavatar,
#wpadminbar .menupop .menupop > .ab-item:hover:before,
#wpadminbar.mobile .quicklinks .hover .ab-icon:before,
#wpadminbar.mobile .quicklinks .hover .ab-icon,
#wpadminbar.mobile .quicklinks .hover .ab-item:before {
color: variables.$menu-submenu-focus-text;
}

#wpadminbar.mobile .quicklinks .ab-icon:before,
#wpadminbar.mobile .quicklinks .ab-icon,
#wpadminbar.mobile .quicklinks .ab-item:before {
color: variables.$menu-icon;
}


/* Admin Bar: search */

#wpadminbar #adminbarsearch:before {
color: variables.$menu-icon;
}

#wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary > #wp-admin-bar-search #adminbarsearch input.adminbar-input:focus {
color: variables.$menu-text;
background: variables.$adminbar-input-background;
Expand Down Expand Up @@ -658,7 +651,7 @@ div#wp-responsive-toggle a:before {
background: variables.$menu-submenu-background;
}

.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before {
.wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon {
color: variables.$menu-icon;
}

Expand Down
11 changes: 9 additions & 2 deletions src/wp-admin/menu-header.php
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
* If the string 'none' (previously 'div') is passed instead of a URL, don't output
* the default menu image so an icon can be added to div.wp-menu-image as background
* with CSS. Dashicons and base64-encoded data:image/svg_xml URIs are also handled
* as special cases.
* as special cases. Any other value is looked up as a registered icon name and, if
* found, rendered as inline SVG; otherwise it is treated as an image URL.
*/
if ( ! empty( $item[6] ) ) {
$img = '<img src="' . esc_url( $item[6] ) . '" alt="" />';
Expand All @@ -140,6 +141,12 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
} elseif ( str_starts_with( $item[6], 'dashicons-' ) ) {
$img = '<br />';
$img_class = ' dashicons-before ' . sanitize_html_class( $item[6] );
} else {
$icon = wp_get_icon( $item[6] );
if ( '' !== $icon ) {
$img = $icon;
$img_class = ' svg-icon';
}
}
}

Expand Down Expand Up @@ -283,7 +290,7 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {

echo '<li id="collapse-menu" class="hide-if-no-js">' .
'<button type="button" id="collapse-button" aria-label="' . esc_attr__( 'Collapse Main Menu' ) . '" aria-expanded="true">' .
'<span class="collapse-button-icon" aria-hidden="true"></span>' .
'<span class="collapse-button-icon" aria-hidden="true">' . wp_get_icon( 'core-admin/chevron-left' ) . '</span>' .
'<span class="collapse-button-label">' . __( 'Collapse Menu' ) . '</span>' .
'</button></li>';
}
Expand Down
Loading
Loading