From bee7eda2aa5ab4c9b1f9c18fa70f91399700a635 Mon Sep 17 00:00:00 2001 From: Matt Thomas Date: Fri, 15 Nov 2013 00:08:38 +0000 Subject: [PATCH] Fixing some inconsistent behavior on toolbar icons: - Use .ab-icon:before, .ab-item:before, and #adminbarsearch:before to select all toolbar icons. - Rewrite the selector for toolbar icon hover styles so they're not overridden by default colors. - Add #adminbarsearch:before to color schemes, so its icon color is changed with the others. - Remove duplicate color rule on #adminbarsearch:before. See #25858. git-svn-id: https://develop.svn.wordpress.org/trunk@26184 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/css/color-schemes/_admin.scss | 8 +++++--- src/wp-includes/css/admin-bar.css | 15 +++++++-------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/wp-admin/css/color-schemes/_admin.scss b/src/wp-admin/css/color-schemes/_admin.scss index f9674b4df6..f7a4bc27c3 100644 --- a/src/wp-admin/css/color-schemes/_admin.scss +++ b/src/wp-admin/css/color-schemes/_admin.scss @@ -259,7 +259,8 @@ ul#adminmenu > li.current > a.current:after { } #wpadminbar .ab-icon, -#wpadminbar .ab-icon:before { +#wpadminbar .ab-icon:before, +#wpadminbar .ab-item:before { color: $menu-icon; } @@ -275,8 +276,9 @@ ul#adminmenu > li.current > a.current:after { background: $menu-submenu-background; } -#wpadminbar li:hover .ab-icon, -#wpadminbar li:hover > .ab-item:before { +#wpadminbar li:hover .ab-icon:before, +#wpadminbar li:hover .ab-item:before, +#wpadminbar li:hover #adminbarsearch:before { color: $menu-highlight-icon; } diff --git a/src/wp-includes/css/admin-bar.css b/src/wp-includes/css/admin-bar.css index 31d2695e7b..0f1f5d89a6 100644 --- a/src/wp-includes/css/admin-bar.css +++ b/src/wp-includes/css/admin-bar.css @@ -223,12 +223,9 @@ margin-right: 6px; } -#wpadminbar li:hover .ab-icon, -#wpadminbar li:hover > .ab-item:before { - color: #2ea2cc; -} - -#wpadminbar .ab-icon:before { +#wpadminbar .ab-icon:before, +#wpadminbar .ab-item:before, +#wpadminbar #adminbarsearch:before { color: #999; position: relative; -moz-transition: all .1s ease-in-out; @@ -255,7 +252,10 @@ #wpadminbar .quicklinks .menupop ul li a:hover, #wpadminbar .quicklinks .menupop ul li a:hover strong, #wpadminbar .quicklinks .menupop.hover ul li a:hover, -#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover { +#wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover, +#wpadminbar li:hover .ab-icon:before, +#wpadminbar li:hover .ab-item:before, +#wpadminbar li:hover #adminbarsearch:before { color: #2ea2cc; } @@ -521,7 +521,6 @@ z-index: 20; font: normal 20px/1 'dashicons' !important; content: '\f179'; - color: #999; speak: none; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale;