Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-16 07:35:39 +01:00
Code Issues Projects Releases Wiki Activity

Correct cascade issues and remove some unused CSS for the admin menu. see #18380.

Browse Source 
Built from https://develop.svn.wordpress.org/trunk@27832


git-svn-id: http://core.svn.wordpress.org/trunk@27666 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Helen Hou-Sandí 2014-03-29 02:47:14 +00:00
parent aa1505ead2
commit d88315a6f7
4 changed files with 38 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
wp-admin/css/admin-menu-rtl.css
View File

@ -164,6 +164,10 @@
color: #eee; color: #eee;
} }
#adminmenu .wp-submenu a {
color: #bbb;
}
#adminmenu a:hover, #adminmenu a:hover,
#adminmenu li.menu-top > a:focus, #adminmenu li.menu-top > a:focus,
#adminmenu .wp-submenu a:hover, #adminmenu .wp-submenu a:hover,
@ -196,17 +200,6 @@
box-shadow: 0 3px 5px rgba(0,0,0,0.2); box-shadow: 0 3px 5px rgba(0,0,0,0.2);
} }
#adminmenu .wp-submenu a,
.folded #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a,
.folded #adminmenu .wp-has-current-submenu .wp-submenu a {
color: #bbb;
}
#adminmenu .wp-submenu a:hover,
#adminmenu .wp-submenu a:focus {
background: none;
}
.js #adminmenu .sub-open, .js #adminmenu .sub-open,
.js #adminmenu .opensub .wp-submenu, .js #adminmenu .opensub .wp-submenu,
#adminmenu a.menu-top:focus + .wp-submenu, #adminmenu a.menu-top:focus + .wp-submenu,
@ -232,6 +225,20 @@
background-color: #333; background-color: #333;
} }
/* ensure that wp-submenu's box shadow doesn't appear on top of the focused menu item's background. */
#adminmenu li.menu-top:hover,
#adminmenu li.opensub > a.menu-top,
#adminmenu li > a.menu-top:focus {
position: relative;
background-color: #111;
}
.folded #adminmenu li.menu-top:hover,
.folded #adminmenu li.opensub > a.menu-top,
.folded #adminmenu li > a.menu-top:focus {
z-index: 10000;
}
#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, #adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,
#adminmenu li.current a.menu-top, #adminmenu li.current a.menu-top,
.folded #adminmenu li.wp-has-current-submenu, .folded #adminmenu li.wp-has-current-submenu,
@ -455,20 +462,6 @@ ul#adminmenu > li.current > a.current:after {
border-left-color: #333; border-left-color: #333;
} }
/* ensure that wp-submenu's box shadow doesn't appear on top of the focused menu item's background. */
#adminmenu li.menu-top:hover,
#adminmenu li.opensub > a.menu-top,
#adminmenu li > a.menu-top:focus {
position: relative;
background-color: #111;
}
.folded #adminmenu li.menu-top:hover,
.folded #adminmenu li.opensub > a.menu-top,
.folded #adminmenu li > a.menu-top:focus {
z-index: 10000;
}
#adminmenu li.menu-top:hover .wp-menu-image img, #adminmenu li.menu-top:hover .wp-menu-image img,
#adminmenu li.wp-has-current-submenu .wp-menu-image img { #adminmenu li.wp-has-current-submenu .wp-menu-image img {
opacity: 1; opacity: 1;

43
wp-admin/css/admin-menu.css
View File

@ -164,6 +164,10 @@
color: #eee; color: #eee;
} }
#adminmenu .wp-submenu a {
color: #bbb;
}
#adminmenu a:hover, #adminmenu a:hover,
#adminmenu li.menu-top > a:focus, #adminmenu li.menu-top > a:focus,
#adminmenu .wp-submenu a:hover, #adminmenu .wp-submenu a:hover,
@ -196,17 +200,6 @@
box-shadow: 0 3px 5px rgba(0,0,0,0.2); box-shadow: 0 3px 5px rgba(0,0,0,0.2);
} }
#adminmenu .wp-submenu a,
.folded #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a,
.folded #adminmenu .wp-has-current-submenu .wp-submenu a {
color: #bbb;
}
#adminmenu .wp-submenu a:hover,
#adminmenu .wp-submenu a:focus {
background: none;
}
.js #adminmenu .sub-open, .js #adminmenu .sub-open,
.js #adminmenu .opensub .wp-submenu, .js #adminmenu .opensub .wp-submenu,
#adminmenu a.menu-top:focus + .wp-submenu, #adminmenu a.menu-top:focus + .wp-submenu,
@ -232,6 +225,20 @@
background-color: #333; background-color: #333;
} }
/* ensure that wp-submenu's box shadow doesn't appear on top of the focused menu item's background. */
#adminmenu li.menu-top:hover,
#adminmenu li.opensub > a.menu-top,
#adminmenu li > a.menu-top:focus {
position: relative;
background-color: #111;
}
.folded #adminmenu li.menu-top:hover,
.folded #adminmenu li.opensub > a.menu-top,
.folded #adminmenu li > a.menu-top:focus {
z-index: 10000;
}
#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, #adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,
#adminmenu li.current a.menu-top, #adminmenu li.current a.menu-top,
.folded #adminmenu li.wp-has-current-submenu, .folded #adminmenu li.wp-has-current-submenu,
@ -455,20 +462,6 @@ ul#adminmenu > li.current > a.current:after {
border-right-color: #333; border-right-color: #333;
} }
/* ensure that wp-submenu's box shadow doesn't appear on top of the focused menu item's background. */
#adminmenu li.menu-top:hover,
#adminmenu li.opensub > a.menu-top,
#adminmenu li > a.menu-top:focus {
position: relative;
background-color: #111;
}
.folded #adminmenu li.menu-top:hover,
.folded #adminmenu li.opensub > a.menu-top,
.folded #adminmenu li > a.menu-top:focus {
z-index: 10000;
}
#adminmenu li.menu-top:hover .wp-menu-image img, #adminmenu li.menu-top:hover .wp-menu-image img,
#adminmenu li.wp-has-current-submenu .wp-menu-image img { #adminmenu li.wp-has-current-submenu .wp-menu-image img {
opacity: 1; opacity: 1;

2
wp-admin/css/wp-admin-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
wp-admin/css/wp-admin.min.css vendored
View File

File diff suppressed because one or more lines are too long