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:
parent
4a6513185a
commit
f40872acdd
|
@ -74,8 +74,6 @@ do_action('admin_head');
|
||||||
|
|
||||||
if ( get_user_setting('mfold') == 'f' )
|
if ( get_user_setting('mfold') == 'f' )
|
||||||
$admin_body_class .= ' folded';
|
$admin_body_class .= ' folded';
|
||||||
else
|
|
||||||
$admin_body_class .= ' expanded';
|
|
||||||
|
|
||||||
if ( is_admin_bar_showing() )
|
if ( is_admin_bar_showing() )
|
||||||
$admin_body_class .= ' admin-bar';
|
$admin_body_class .= ' admin-bar';
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -909,8 +909,8 @@ table.widefat .spam a:hover,
|
||||||
border-color: #dfdfdf;
|
border-color: #dfdfdf;
|
||||||
}
|
}
|
||||||
|
|
||||||
.expanded #adminmenu li.wp-not-current-submenu:hover a.menu-top,
|
#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 .wp-menu-arrow {
|
||||||
background-color: #e4e4e4; /* Fallback */
|
background-color: #e4e4e4; /* Fallback */
|
||||||
background-image: -ms-linear-gradient(bottom, #ccc, #e4e4e4); /* IE10 */
|
background-image: -ms-linear-gradient(bottom, #ccc, #e4e4e4); /* IE10 */
|
||||||
background-image: -moz-linear-gradient(bottom, #ccc, #e4e4e4); /* Firefox */
|
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 */
|
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-color: #eaf2fa; /* Fallback */
|
||||||
background-image: -ms-linear-gradient(left, #fff, #eaf2fa 30px); /* IE10 */
|
background-image: -ms-linear-gradient(left, #fff, #eaf2fa 30px); /* IE10 */
|
||||||
background-image: -moz-linear-gradient(left, #fff, #eaf2fa 30px); /* Firefox */
|
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: -webkit-linear-gradient(left, #fff, #eaf2fa 30px); /* new Webkit */
|
||||||
background-image: linear-gradient(left, #fff, #eaf2fa 30px); /* proposed W3C Markup */
|
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.wp-has-current-submenu a.wp-has-current-submenu,
|
||||||
#adminmenu li.current a.menu-top,
|
#adminmenu li.current a.menu-top,
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -1580,7 +1580,7 @@ form.upgrade .hint {
|
||||||
transition: width 200ms ease-out;
|
transition: width 200ms ease-out;
|
||||||
}
|
}
|
||||||
|
|
||||||
.expanded #adminmenu .wp-has-current-submenu .wp-submenu {
|
#adminmenu .wp-has-current-submenu .wp-submenu {
|
||||||
position: relative;
|
position: relative;
|
||||||
z-index: 2;
|
z-index: 2;
|
||||||
width: 145px;
|
width: 145px;
|
||||||
|
@ -1591,7 +1591,7 @@ form.upgrade .hint {
|
||||||
padding: 0;
|
padding: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.expanded #adminmenu .wp-has-current-submenu .wp-submenu-wrap {
|
#adminmenu .wp-has-current-submenu .wp-submenu-wrap {
|
||||||
-moz-box-shadow: none;
|
-moz-box-shadow: none;
|
||||||
-webkit-box-shadow: none;
|
-webkit-box-shadow: none;
|
||||||
box-shadow: none;
|
box-shadow: none;
|
||||||
|
@ -1687,20 +1687,26 @@ body.no-js #adminmenu li.wp-has-current-submenu .wp-submenu {
|
||||||
padding-left: 12px;
|
padding-left: 12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.expanded #adminmenu li.wp-not-current-submenu li {
|
#adminmenu li.wp-not-current-submenu li {
|
||||||
margin-left: 8px;
|
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;
|
padding-left: 12px;
|
||||||
}
|
}
|
||||||
|
.folded #adminmenu li.wp-not-current-submenu li a {
|
||||||
|
padding-left: 0;
|
||||||
|
}
|
||||||
|
|
||||||
.wp-menu-arrow {
|
.wp-menu-arrow {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
#adminmenu li.wp-has-current-submenu .wp-menu-arrow,
|
#adminmenu li.wp-has-current-submenu .wp-menu-arrow,
|
||||||
#adminmenu li.menu-top.current .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;
|
display: block;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
right: -9px;
|
right: -9px;
|
||||||
|
@ -1709,9 +1715,12 @@ body.no-js #adminmenu li.wp-has-current-submenu .wp-submenu {
|
||||||
z-index: 25;
|
z-index: 25;
|
||||||
}
|
}
|
||||||
|
|
||||||
.expanded #adminmenu li.menu-top:hover .wp-menu-arrow {
|
#adminmenu li.menu-top:hover .wp-menu-arrow {
|
||||||
z-index: 1500;
|
z-index: 1500;
|
||||||
}
|
}
|
||||||
|
.folded #adminmenu li.menu-top:hover .wp-menu-arrow {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
#adminmenu .wp-menu-arrow div {
|
#adminmenu .wp-menu-arrow div {
|
||||||
width: 15px;
|
width: 15px;
|
||||||
|
|
|
@ -69,7 +69,6 @@ adminMenu = {
|
||||||
var current = $('#adminmenu li.wp-has-current-submenu');
|
var current = $('#adminmenu li.wp-has-current-submenu');
|
||||||
|
|
||||||
$('body').toggleClass( 'folded', ! off );
|
$('body').toggleClass( 'folded', ! off );
|
||||||
$('body').toggleClass( 'expanded', off );
|
|
||||||
this.flyout( current, off );
|
this.flyout( current, off );
|
||||||
|
|
||||||
// Remove any potentially remaining hoverIntent positioning.
|
// Remove any potentially remaining hoverIntent positioning.
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -61,7 +61,7 @@ function wp_default_scripts( &$scripts ) {
|
||||||
|
|
||||||
$scripts->add( 'utils', "/wp-admin/js/utils$suffix.js", false, '20101110' );
|
$scripts->add( 'utils', "/wp-admin/js/utils$suffix.js", false, '20101110' );
|
||||||
|
|
||||||
$scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), '20110919', 1 );
|
$scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), '20110922', 1 );
|
||||||
$scripts->add_script_data( 'common', 'commonL10n', array(
|
$scripts->add_script_data( 'common', 'commonL10n', array(
|
||||||
'warnDelete' => __("You are about to permanently delete the selected items.\n 'Cancel' to stop, 'OK' to delete.")
|
'warnDelete' => __("You are about to permanently delete the selected items.\n 'Cancel' to stop, 'OK' to delete.")
|
||||||
) );
|
) );
|
||||||
|
@ -406,13 +406,13 @@ function wp_default_styles( &$styles ) {
|
||||||
// Any rtl stylesheets that don't have a .dev version for ltr
|
// Any rtl stylesheets that don't have a .dev version for ltr
|
||||||
$no_suffix = array( 'farbtastic' );
|
$no_suffix = array( 'farbtastic' );
|
||||||
|
|
||||||
$styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20110921a' );
|
$styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20110922' );
|
||||||
|
|
||||||
$styles->add( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20110919' );
|
$styles->add( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20110919' );
|
||||||
$styles->add_data( 'ie', 'conditional', 'lte IE 7' );
|
$styles->add_data( 'ie', 'conditional', 'lte IE 7' );
|
||||||
|
|
||||||
// all colors stylesheets need to have the same query strings (cache manifest compat)
|
// all colors stylesheets need to have the same query strings (cache manifest compat)
|
||||||
$colors_version = '20110919';
|
$colors_version = '20110922';
|
||||||
|
|
||||||
// Register "meta" stylesheet for admin colors. All colors-* style sheets should have the same version string.
|
// Register "meta" stylesheet for admin colors. All colors-* style sheets should have the same version string.
|
||||||
$styles->add( 'colors', true, array('wp-admin'), $colors_version );
|
$styles->add( 'colors', true, array('wp-admin'), $colors_version );
|
||||||
|
|
Loading…
Reference in New Issue