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.


Built from https://develop.svn.wordpress.org/trunk@26184


git-svn-id: http://core.svn.wordpress.org/trunk@26093 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Matt Thomas 2013-11-15 00:09:10 +00:00
parent ae1710882c
commit 35557b1393
11 changed files with 30 additions and 30 deletions

View File

@ -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;
}

View File

@ -169,14 +169,14 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
#wpadminbar .ab-item, #wpadminbar a.ab-item, #wpadminbar > #wp-toolbar > #wp-admin-bar-root-default span.ab-label, #wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary span.ab-label, #wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary span.noticon {
color: white; }
#wpadminbar .ab-icon, #wpadminbar .ab-icon:before {
#wpadminbar .ab-icon, #wpadminbar .ab-icon:before, #wpadminbar .ab-item:before {
color: #e5f8ff; }
#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: white;
background: #4796b3; }
#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: white; }
/* Admin Bar: submenu */

File diff suppressed because one or more lines are too long

View File

@ -169,14 +169,14 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
#wpadminbar .ab-item, #wpadminbar a.ab-item, #wpadminbar > #wp-toolbar > #wp-admin-bar-root-default span.ab-label, #wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary span.ab-label, #wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary span.noticon {
color: #333333; }
#wpadminbar .ab-icon, #wpadminbar .ab-icon:before {
#wpadminbar .ab-icon, #wpadminbar .ab-icon:before, #wpadminbar .ab-item:before {
color: #999999; }
#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: white;
background: white; }
#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: #cccccc; }
/* Admin Bar: submenu */

File diff suppressed because one or more lines are too long

View File

@ -169,14 +169,14 @@ ul#adminmenu a.wp-has-current-submenu:after, ul#adminmenu > li.current > a.curre
#wpadminbar .ab-item, #wpadminbar a.ab-item, #wpadminbar > #wp-toolbar > #wp-admin-bar-root-default span.ab-label, #wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary span.ab-label, #wpadminbar > #wp-toolbar > #wp-admin-bar-top-secondary span.noticon {
color: white; }
#wpadminbar .ab-icon, #wpadminbar .ab-icon:before {
#wpadminbar .ab-icon, #wpadminbar .ab-icon:before, #wpadminbar .ab-item:before {
color: #f1f2f3; }
#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: white;
background: #26292c; }
#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: white; }
/* Admin Bar: submenu */

File diff suppressed because one or more lines are too long

View File

@ -223,12 +223,9 @@
margin-left: 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;

File diff suppressed because one or more lines are too long

View File

@ -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;

File diff suppressed because one or more lines are too long