Remove expanded class from flyout menus. see #18382.

git-svn-id: http://svn.automattic.com/wordpress/trunk@18754 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
koopersmith
2011-09-22 20:24:12 +00:00
parent 4a6513185a
commit f40872acdd
8 changed files with 27 additions and 18 deletions

View File

@@ -74,8 +74,6 @@ do_action('admin_head');
if ( get_user_setting('mfold') == 'f' )
$admin_body_class .= ' folded';
else
$admin_body_class .= ' expanded';
if ( is_admin_bar_showing() )
$admin_body_class .= ' admin-bar';

File diff suppressed because one or more lines are too long

View File

@@ -909,8 +909,8 @@ table.widefat .spam a:hover,
border-color: #dfdfdf;
}
.expanded #adminmenu li.wp-not-current-submenu:hover a.menu-top,
.expanded #adminmenu li.wp-not-current-submenu:hover .wp-menu-arrow {
#adminmenu li.wp-not-current-submenu:hover a.menu-top,
#adminmenu li.wp-not-current-submenu:hover .wp-menu-arrow {
background-color: #e4e4e4; /* Fallback */
background-image: -ms-linear-gradient(bottom, #ccc, #e4e4e4); /* IE10 */
background-image: -moz-linear-gradient(bottom, #ccc, #e4e4e4); /* Firefox */
@@ -940,7 +940,7 @@ table.widefat .spam a:hover,
background-image: linear-gradient(bottom, #6d6d6d, #808080); /* proposed W3C Markup */
}
.expanded #adminmenu li.wp-not-current-submenu li:hover a {
#adminmenu li.wp-not-current-submenu li:hover a {
background-color: #eaf2fa; /* Fallback */
background-image: -ms-linear-gradient(left, #fff, #eaf2fa 30px); /* IE10 */
background-image: -moz-linear-gradient(left, #fff, #eaf2fa 30px); /* Firefox */
@@ -949,6 +949,9 @@ table.widefat .spam a:hover,
background-image: -webkit-linear-gradient(left, #fff, #eaf2fa 30px); /* new Webkit */
background-image: linear-gradient(left, #fff, #eaf2fa 30px); /* proposed W3C Markup */
}
.folded #adminmenu li.wp-not-current-submenu li:hover a {
background-image: none;
}
#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,
#adminmenu li.current a.menu-top,

File diff suppressed because one or more lines are too long

View File

@@ -1580,7 +1580,7 @@ form.upgrade .hint {
transition: width 200ms ease-out;
}
.expanded #adminmenu .wp-has-current-submenu .wp-submenu {
#adminmenu .wp-has-current-submenu .wp-submenu {
position: relative;
z-index: 2;
width: 145px;
@@ -1591,7 +1591,7 @@ form.upgrade .hint {
padding: 0;
}
.expanded #adminmenu .wp-has-current-submenu .wp-submenu-wrap {
#adminmenu .wp-has-current-submenu .wp-submenu-wrap {
-moz-box-shadow: none;
-webkit-box-shadow: none;
box-shadow: none;
@@ -1687,20 +1687,26 @@ body.no-js #adminmenu li.wp-has-current-submenu .wp-submenu {
padding-left: 12px;
}
.expanded #adminmenu li.wp-not-current-submenu li {
#adminmenu li.wp-not-current-submenu li {
margin-left: 8px;
}
.folded #adminmenu li.wp-not-current-submenu li {
margin-left: 0;
}
.expanded #adminmenu li.wp-not-current-submenu li a {
#adminmenu li.wp-not-current-submenu li a {
padding-left: 12px;
}
.folded #adminmenu li.wp-not-current-submenu li a {
padding-left: 0;
}
.wp-menu-arrow {
display: none;
}
#adminmenu li.wp-has-current-submenu .wp-menu-arrow,
#adminmenu li.menu-top.current .wp-menu-arrow,
.expanded #adminmenu li.wp-has-submenu:hover .wp-menu-arrow {
#adminmenu li.wp-has-submenu:hover .wp-menu-arrow {
display: block;
position: absolute;
right: -9px;
@@ -1709,9 +1715,12 @@ body.no-js #adminmenu li.wp-has-current-submenu .wp-submenu {
z-index: 25;
}
.expanded #adminmenu li.menu-top:hover .wp-menu-arrow {
#adminmenu li.menu-top:hover .wp-menu-arrow {
z-index: 1500;
}
.folded #adminmenu li.menu-top:hover .wp-menu-arrow {
display: none;
}
#adminmenu .wp-menu-arrow div {
width: 15px;

View File

@@ -69,7 +69,6 @@ adminMenu = {
var current = $('#adminmenu li.wp-has-current-submenu');
$('body').toggleClass( 'folded', ! off );
$('body').toggleClass( 'expanded', off );
this.flyout( current, off );
// Remove any potentially remaining hoverIntent positioning.

File diff suppressed because one or more lines are too long