From aa24b6d94fd3e6e2d8abfe5b17cdeee63978ccb6 Mon Sep 17 00:00:00 2001 From: Helen Hou-Sandi Date: Wed, 8 Apr 2015 16:37:13 +0000 Subject: [PATCH] Admin menu: fix colors for focus state and in IE8. props afercia. fixes #31345. git-svn-id: https://develop.svn.wordpress.org/trunk@32075 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/css/admin-menu.css | 22 ++++++++++++++++------ src/wp-admin/css/colors/_admin.scss | 9 ++++++++- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/src/wp-admin/css/admin-menu.css b/src/wp-admin/css/admin-menu.css index a2493e730b..d1c0f9c382 100644 --- a/src/wp-admin/css/admin-menu.css +++ b/src/wp-admin/css/admin-menu.css @@ -359,14 +359,15 @@ } div.wp-menu-image:before { - color: #999; + color: #a0a5aa; + color: rgba(240,245,250,0.6); padding: 7px 0; -webkit-transition: all .1s ease-in-out; transition: all .1s ease-in-out; } #adminmenu div.wp-menu-image:before { - color: #00b9eb; + color: #a0a5aa; color: rgba(240,245,250,0.6); } @@ -374,14 +375,23 @@ 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 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 { color: #fff; } -#adminmenu li:hover 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 { color: #00b9eb; } +/* IE8 doesn't redraw the pseudo elements unless you make a change to the content, this restore the initial color after hover */ +.ie8 #adminmenu li.opensub div.wp-menu-image:before { + color: #a0a5aa; +} + .folded #adminmenu div.wp-menu-image { width: 35px; height: 30px; @@ -537,7 +547,7 @@ ul#adminmenu > li.current > a.current:after { font-size: 13px; line-height: 34px; margin-top: 10px; - color: #00b9eb; + color: #a0a5aa; color: rgba(240,245,250,0.6); -webkit-transition: all .1s ease-in-out; transition: all .1s ease-in-out; @@ -577,7 +587,7 @@ ul#adminmenu > li.current > a.current:after { line-height: 15px; left: -3px; top: -3px; - color: #00b9eb; + color: #a0a5aa; color: rgba(240,245,250,0.6); font: normal 20px/1 'dashicons' !important; speak: none; diff --git a/src/wp-admin/css/colors/_admin.scss b/src/wp-admin/css/colors/_admin.scss index 443a4f28a1..20ac8f09c9 100644 --- a/src/wp-admin/css/colors/_admin.scss +++ b/src/wp-admin/css/colors/_admin.scss @@ -211,7 +211,14 @@ ul#adminmenu > li.current > a.current:after { background: $menu-current-background; } -#adminmenu li.wp-has-current-submenu div.wp-menu-image:before { +#adminmenu li.wp-has-current-submenu 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:hover div.wp-menu-image:before, +#adminmenu li a:focus div.wp-menu-image:before, +#adminmenu li.opensub div.wp-menu-image:before, +.ie8 #adminmenu li.opensub div.wp-menu-image:before { color: $menu-current-icon; }