From 16f62b9d3f175c92d5dbdcaacb663097ecab6432 Mon Sep 17 00:00:00 2001 From: Kelly Choyce-Dwan Date: Mon, 1 Feb 2021 19:44:13 +0000 Subject: [PATCH] Administration: Use correct color scheme color on admin bar icons when hovered. This also removes a CSS rule in the light scheme which was flagged as temporary and overrides the hover text color. Fixes #52229. git-svn-id: https://develop.svn.wordpress.org/trunk@50125 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/css/colors/_admin.scss | 3 ++- src/wp-admin/css/colors/light/colors.scss | 12 ------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/wp-admin/css/colors/_admin.scss b/src/wp-admin/css/colors/_admin.scss index fd9b29cfcc..743bf7a1e2 100644 --- a/src/wp-admin/css/colors/_admin.scss +++ b/src/wp-admin/css/colors/_admin.scss @@ -339,6 +339,7 @@ ul#adminmenu > li.current > a.current:after { #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, @@ -416,7 +417,7 @@ ul#adminmenu > li.current > a.current:after { #wpadminbar:not(.mobile) li:hover .ab-item:before, #wpadminbar:not(.mobile) li:hover .ab-item:after, #wpadminbar:not(.mobile) li:hover #adminbarsearch:before { - color: $menu-highlight-icon; + color: $menu-submenu-focus-text; } diff --git a/src/wp-admin/css/colors/light/colors.scss b/src/wp-admin/css/colors/light/colors.scss index ab4230b9db..5a75889a55 100644 --- a/src/wp-admin/css/colors/light/colors.scss +++ b/src/wp-admin/css/colors/light/colors.scss @@ -19,18 +19,6 @@ $menu-collapse-focus-icon: #555; @import "../_admin.scss"; -/* temporary fix for admin-bar hover color */ -#wpadminbar .ab-top-menu > li:hover > .ab-item, -#wpadminbar .ab-top-menu > li.hover > .ab-item, -#wpadminbar > #wp-toolbar > #wp-admin-bar-root-default li:hover span.ab-label, -#wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary li.hover span.ab-label, -#wpadminbar .ab-top-menu > li > .ab-item:focus, -#wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus, -#wpadminbar.nojs .ab-top-menu > li.menupop:hover > .ab-item, -#wpadminbar .ab-top-menu > li.menupop.hover > .ab-item { - color: $text-color; -} - /* Override the theme filter highlight color for this scheme */ .theme-section.current, .theme-filter.current {