Index: wp-admin/admin-header.php =================================================================== --- wp-admin/admin-header.php (revision 21420) +++ wp-admin/admin-header.php (working copy) @@ -76,6 +76,9 @@ if ( get_user_setting('mfold') == 'f' ) $admin_body_class .= ' folded'; +if ( !get_user_setting('unfold') ) + $admin_body_class .= ' auto-fold'; + if ( is_admin_bar_showing() ) $admin_body_class .= ' admin-bar'; Index: wp-admin/css/colors-classic.dev.css =================================================================== --- wp-admin/css/colors-classic.dev.css (revision 21420) +++ wp-admin/css/colors-classic.dev.css (working copy) @@ -454,7 +454,7 @@ #adminmenu a:hover, #adminmenu li.menu-top > a:focus, -#adminmenu ul.wp-submenu a:hover, +#adminmenu .wp-submenu a:hover, #the-comment-list .comment a:hover, #rightnow a:hover, #media-upload a.del-link:hover, @@ -1294,18 +1294,7 @@ border-color: #D1E5EE; } -#adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle, -#adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle { - background: transparent url(../images/arrows-dark-vs.png) no-repeat -1px 6px; -} - -#adminmenu .wp-has-submenu:hover .wp-menu-toggle, -#adminmenu .wp-menu-open .wp-menu-toggle { - background: transparent url(../images/arrows-vs.png) no-repeat -2px 6px; -} - #adminmenu a.menu-top, -.folded #adminmenu li.menu-top, #adminmenu .wp-submenu .wp-submenu-head { border-top-color: #ffffff; border-bottom-color: #cae6ff; @@ -1315,10 +1304,12 @@ border-color: #d1e5ee; } -#adminmenu li.menu-top:hover > a, -#adminmenu li.menu-top.focused > a, -#adminmenu li.menu-top > a:focus { +#adminmenu a.menu-top:hover, +#adminmenu li.opensub > a.menu-top, +#adminmenu li.opensub > a.menu-top, +#adminmenu li > a.menu-top:focus { background-color: #e0f1ff; + color: #d54e21; text-shadow: 0 1px 0 rgba( 255, 255, 255, 0.4 ); } @@ -1328,23 +1319,21 @@ .folded #adminmenu li.current.menu-top, #adminmenu .wp-menu-arrow, #adminmenu .wp-has-current-submenu .wp-submenu .wp-submenu-head { - background-color: #5589AA; /* Fallback */ - background-image: -ms-linear-gradient(bottom, #5589AA, #619bbb); /* IE10 */ - background-image: -moz-linear-gradient(bottom, #5589AA, #619bbb); /* Firefox */ - background-image: -o-linear-gradient(bottom, #5589AA, #619bbb); /* Opera */ - background-image: -webkit-gradient(linear, left bottom, left top, from(#5589AA), to(#619bbb)); /* old Webkit */ - background-image: -webkit-linear-gradient(bottom, #5589AA, #619bbb); /* new Webkit */ - background-image: linear-gradient(bottom, #5589AA, #619bbb); /* proposed W3C Markup */ + background-color: #5589AA; + background-image: -webkit-gradient(linear, left bottom, left top, from(#5589AA), to(#619bbb)); + background-image: -webkit-linear-gradient(bottom, #5589AA, #619bbb); + background-image: -moz-linear-gradient(bottom, #5589AA, #619bbb); + background-image: -o-linear-gradient(bottom, #5589AA, #619bbb); + background-image: linear-gradient(bottom, #5589AA, #619bbb); } #adminmenu .wp-menu-arrow div { - background-color: #5589AA; /* Fallback */ - background-image: -ms-linear-gradient(right bottom, #5589AA, #619bbb); /* IE10 */ - background-image: -moz-linear-gradient(right bottom, #5589AA, #619bbb); /* Firefox */ - background-image: -o-linear-gradient(right bottom, #5589AA, #619bbb); /* Opera */ - background-image: -webkit-gradient(linear, right bottom, left top, from(#5589AA), to(#619bbb)); /* old Webkit */ - background-image: -webkit-linear-gradient(right bottom, #5589AA, #619bbb); /* new Webkit */ - background-image: linear-gradient(right bottom, #5589AA, #619bbb); /* proposed W3C Markup */ + background-color: #5589AA; + background-image: -webkit-gradient(linear, right bottom, left top, from(#5589AA), to(#619bbb)); + background-image: -webkit-linear-gradient(right bottom, #5589AA, #619bbb); + background-image: -moz-linear-gradient(right bottom, #5589AA, #619bbb); + background-image: -o-linear-gradient(right bottom, #5589AA, #619bbb); + background-image: linear-gradient(right bottom, #5589AA, #619bbb); } #adminmenu li.wp-not-current-submenu .wp-menu-arrow { @@ -1389,34 +1378,25 @@ color: #333; } -#adminmenu .wp-submenu ul { +#adminmenu .wp-submenu, +.folded #adminmenu a.wp-has-current-submenu:focus + .wp-submenu, +.folded #adminmenu .wp-has-current-submenu .wp-submenu { background-color: #fff; -} - -#adminmenu .wp-submenu-wrap, -#adminmenu .wp-submenu ul { border-color: #d0dfe9; + -moz-box-shadow: 2px 3px 6px rgba(0, 0, 0, 0.4); + -webkit-box-shadow: 2px 3px 6px rgba(0, 0, 0, 0.4); + box-shadow: 2px 3px 6px rgba(0, 0, 0, 0.4); } -#adminmenu .wp-submenu-wrap, -.folded #adminmenu .wp-has-current-submenu .wp-submenu-wrap { - -moz-box-shadow: 2px 2px 5px rgba( 0, 0, 0, 0.4 ); - -webkit-box-shadow: 2px 2px 5px rgba( 0, 0, 0, 0.4 ); - box-shadow: 2px 2px 5px rgba( 0, 0, 0, 0.4 ); -} - #adminmenu .wp-submenu .wp-submenu-head { - border-right-color: #e8eff4; - background-color: #EFF8FF; + border-right-color: #dfdfdf; + background-color: #e4e4e4; } -#adminmenu div.wp-submenu { - background-color: transparent; -} - /* collapse menu button */ #collapse-menu { color: #A0C3D5; + border-top-color: #f9f9f9; } #collapse-menu:hover { @@ -1425,59 +1405,54 @@ #collapse-button { border-color: #d0dfe9; - background-color: #eff8ff; /* Fallback */ - background-image: -ms-linear-gradient(bottom, #eff8ff, #fff); /* IE10 */ - background-image: -moz-linear-gradient(bottom, #eff8ff, #fff); /* Firefox */ - background-image: -o-linear-gradient(bottom, #eff8ff, #fff); /* Opera */ - background-image: -webkit-gradient(linear, left bottom, left top, from(#eff8ff), to(#fff)); /* old Webkit */ - background-image: -webkit-linear-gradient(bottom, #eff8ff, #fff); /* new Webkit */ - background-image: linear-gradient(bottom, #eff8ff, #fff); /* proposed W3C Markup */ + background-color: #eff8ff; + background-image: -webkit-gradient(linear, left bottom, left top, from(#eff8ff), to(#fff)); + background-image: -webkit-linear-gradient(bottom, #eff8ff, #fff); + background-image: -moz-linear-gradient(bottom, #eff8ff, #fff); + background-image: -o-linear-gradient(bottom, #eff8ff, #fff); + background-image: linear-gradient(bottom, #eff8ff, #fff); } + #collapse-menu:hover #collapse-button { border-color: #A0C3D5; } + #collapse-button div { background: transparent url(../images/arrows-vs.png) no-repeat 0 -72px; } + .folded #collapse-button div { background-position: 0 -108px; } /* Auto-folding of the admin menu */ @media only screen and (max-width: 900px) { - #adminmenu li.menu-top { - border-top-color: #ffffff; - border-bottom-color: #cae6ff; + .auto-fold #adminmenu li.wp-has-current-submenu, + .auto-fold #adminmenu li.current.menu-top { + background-color: #5589AA; + background-image: -webkit-gradient(linear, left bottom, left top, from(#5589AA), to(#619bbb)); + background-image: -webkit-linear-gradient(bottom, #5589AA, #619bbb); + background-image: -moz-linear-gradient(bottom, #5589AA, #619bbb); + background-image: -o-linear-gradient(bottom, #5589AA, #619bbb); + background-image: linear-gradient(bottom, #5589AA, #619bbb); } - #adminmenu li.wp-has-current-submenu, - #adminmenu li.current.menu-top { - background-color: #5589AA; /* Fallback */ - background-image: -ms-linear-gradient(bottom, #5589AA, #619bbb); /* IE10 */ - background-image: -moz-linear-gradient(bottom, #5589AA, #619bbb); /* Firefox */ - background-image: -o-linear-gradient(bottom, #5589AA, #619bbb); /* Opera */ - background-image: -webkit-gradient(linear, left bottom, left top, from(#5589AA), to(#619bbb)); /* old Webkit */ - background-image: -webkit-linear-gradient(bottom, #5589AA, #619bbb); /* new Webkit */ - background-image: linear-gradient(bottom, #5589AA, #619bbb); /* proposed W3C Markup */ - } - - #adminmenu li.menu-top li:hover a { - background-image: none; - } - - #adminmenu li.wp-has-current-submenu, - #adminmenu li.current.menu-top { + .auto-fold #adminmenu li.wp-has-current-submenu, + .auto-fold #adminmenu li.current.menu-top { border-top-color: #5A8FAD; border-bottom-color: #5589AA; } - #adminmenu .wp-has-current-submenu .wp-submenu-wrap { - -moz-box-shadow: 2px 2px 5px rgba( 0, 0, 0, 0.4 ); - -webkit-box-shadow: 2px 2px 5px rgba( 0, 0, 0, 0.4 ); - box-shadow: 2px 2px 5px rgba( 0, 0, 0, 0.4 ); + .auto-fold #adminmenu a.wp-has-current-submenu:focus + .wp-submenu, + .auto-fold #adminmenu .wp-has-current-submenu .wp-submenu { + background-color: #fff; + border-color: #D0DFE9; + -moz-box-shadow: 2px 3px 6px rgba(0, 0, 0, 0.4); + -webkit-box-shadow: 2px 3px 6px rgba(0, 0, 0, 0.4); + box-shadow: 2px 3px 6px rgba(0, 0, 0, 0.4); } - #collapse-button div { + .auto-fold #collapse-button div { background-position: 0 -108px; } } @@ -2461,13 +2436,19 @@ border-left-color: #d1e5ee; } -.rtl #adminmenu .wp-submenu-wrap, -.rtl.folded #adminmenu .wp-has-current-submenu .wp-submenu-wrap{ +.rtl #adminmenu .wp-submenu, +.rtl.folded #adminmenu .wp-has-current-submenu .wp-submenu { -moz-box-shadow: -2px 2px 5px rgba( 0, 0, 0, 0.4 ); -webkit-box-shadow: -2px 2px 5px rgba( 0, 0, 0, 0.4 ); box-shadow: -2px 2px 5px rgba( 0, 0, 0, 0.4 ); } +.rtl #adminmenu .wp-has-current-submenu .wp-submenu { + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; +} + /* Collapse Menu Button */ .rtl #collapse-button div { background-position: 0 -108px; @@ -2479,13 +2460,13 @@ /* Auto-folding of the admin menu for RTL */ @media only screen and (max-width: 900px) { - .rtl #adminmenu .wp-has-current-submenu .wp-submenu-wrap{ + .rtl.auto-fold #adminmenu .wp-has-current-submenu .wp-submenu { -moz-box-shadow: -2px 2px 5px rgba( 0, 0, 0, 0.4 ); -webkit-box-shadow: -2px 2px 5px rgba( 0, 0, 0, 0.4 ); box-shadow: -2px 2px 5px rgba( 0, 0, 0, 0.4 ); } - .rtl #collapse-button div { + .rtl.auto-fold #collapse-button div { background-position: 0 -72px; } } Index: wp-admin/css/colors-fresh.dev.css =================================================================== --- wp-admin/css/colors-fresh.dev.css (revision 21420) +++ wp-admin/css/colors-fresh.dev.css (working copy) @@ -445,7 +445,7 @@ #adminmenu a:hover, #adminmenu li.menu-top > a:focus, -#adminmenu ul.wp-submenu a:hover, +#adminmenu .wp-submenu a:hover, #the-comment-list .comment a:hover, #rightnow a:hover, #media-upload a.del-link:hover, @@ -968,18 +968,7 @@ border-color: #e1e1e1; } -#adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle, -#adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle { - background: transparent url(../images/arrows-dark.png) no-repeat -1px 6px; -} - -#adminmenu .wp-has-submenu:hover .wp-menu-toggle, -#adminmenu .wp-menu-open .wp-menu-toggle { - background: transparent url(../images/arrows.png) no-repeat -2px 6px; -} - #adminmenu a.menu-top, -.folded #adminmenu li.menu-top, #adminmenu .wp-submenu .wp-submenu-head { border-top-color: #f9f9f9; border-bottom-color: #dfdfdf; @@ -989,10 +978,11 @@ border-color: #dfdfdf; } -#adminmenu li.menu-top:hover > a, -#adminmenu li.menu-top.focused > a, -#adminmenu li.menu-top > a:focus { +#adminmenu li.menu-top:hover, +#adminmenu li.opensub > a.menu-top, +#adminmenu li > a.menu-top:focus { background-color: #e4e4e4; + color: #d54e21; text-shadow: 0 1px 0 rgba( 255, 255, 255, 0.4 ); } @@ -1002,23 +992,21 @@ .folded #adminmenu li.current.menu-top, #adminmenu .wp-menu-arrow, #adminmenu .wp-has-current-submenu .wp-submenu .wp-submenu-head { - background-color: #777; /* Fallback */ - background-image: -ms-linear-gradient(bottom, #6d6d6d, #808080); /* IE10 */ - background-image: -moz-linear-gradient(bottom, #6d6d6d, #808080); /* Firefox */ - background-image: -o-linear-gradient(bottom, #6d6d6d, #808080); /* Opera */ - background-image: -webkit-gradient(linear, left bottom, left top, from(#6d6d6d), to(#808080)); /* old Webkit */ - background-image: -webkit-linear-gradient(bottom, #6d6d6d, #808080); /* new Webkit */ - background-image: linear-gradient(bottom, #6d6d6d, #808080); /* proposed W3C Markup */ + background-color: #777; + background-image: -webkit-gradient(linear, left bottom, left top, from(#6d6d6d), to(#808080)); + background-image: -webkit-linear-gradient(bottom, #6d6d6d, #808080); + background-image: -moz-linear-gradient(bottom, #6d6d6d, #808080); + background-image: -o-linear-gradient(bottom, #6d6d6d, #808080); + background-image: linear-gradient(bottom, #6d6d6d, #808080); } #adminmenu .wp-menu-arrow div { - background-color: #777; /* Fallback */ - background-image: -ms-linear-gradient(right bottom, #6d6d6d, #808080); /* IE10 */ - background-image: -moz-linear-gradient(right bottom, #6d6d6d, #808080); /* Firefox */ - background-image: -o-linear-gradient(right bottom, #6d6d6d, #808080); /* Opera */ - background-image: -webkit-gradient(linear, right bottom, left top, from(#6d6d6d), to(#808080)); /* old Webkit */ - background-image: -webkit-linear-gradient(right bottom, #6d6d6d, #808080); /* new Webkit */ - background-image: linear-gradient(right bottom, #6d6d6d, #808080); /* proposed W3C Markup */ + background-color: #777; + background-image: -webkit-gradient(linear, right bottom, left top, from(#6d6d6d), to(#808080)); + background-image: -webkit-linear-gradient(right bottom, #6d6d6d, #808080); + background-image: -moz-linear-gradient(right bottom, #6d6d6d, #808080); + background-image: -o-linear-gradient(right bottom, #6d6d6d, #808080); + background-image: linear-gradient(right bottom, #6d6d6d, #808080); } #adminmenu li.wp-not-current-submenu .wp-menu-arrow { @@ -1063,34 +1051,25 @@ color: #333; } -#adminmenu .wp-submenu ul { +#adminmenu .wp-submenu, +.folded #adminmenu a.wp-has-current-submenu:focus + .wp-submenu, +.folded #adminmenu .wp-has-current-submenu .wp-submenu { background-color: #fff; -} - -#adminmenu .wp-submenu-wrap, -#adminmenu .wp-submenu ul { border-color: #dfdfdf; + -moz-box-shadow: 2px 3px 6px rgba(0, 0, 0, 0.4); + -webkit-box-shadow: 2px 3px 6px rgba(0, 0, 0, 0.4); + box-shadow: 2px 3px 6px rgba(0, 0, 0, 0.4); } -#adminmenu .wp-submenu-wrap, -.folded #adminmenu .wp-has-current-submenu .wp-submenu-wrap { - -moz-box-shadow: 2px 2px 5px rgba( 0, 0, 0, 0.4 ); - -webkit-box-shadow: 2px 2px 5px rgba( 0, 0, 0, 0.4 ); - box-shadow: 2px 2px 5px rgba( 0, 0, 0, 0.4 ); -} - #adminmenu .wp-submenu .wp-submenu-head { - border-right-color: #dfdfdf; - background-color: #ececec; + background-color: #e4e4e4; + color: #333; } -#adminmenu div.wp-submenu { - background-color: transparent; -} - /* collapse menu button */ #collapse-menu { color: #aaa; + border-top-color: #f9f9f9; } #collapse-menu:hover { @@ -1099,13 +1078,12 @@ #collapse-button { border-color: #ccc; - background-color: #f4f4f4; /* Fallback */ - background-image: -ms-linear-gradient(bottom, #dfdfdf, #fff); /* IE10 */ - background-image: -moz-linear-gradient(bottom, #dfdfdf, #fff); /* Firefox */ - background-image: -o-linear-gradient(bottom, #dfdfdf, #fff); /* Opera */ - background-image: -webkit-gradient(linear, left bottom, left top, from(#dfdfdf), to(#fff)); /* old Webkit */ - background-image: -webkit-linear-gradient(bottom, #dfdfdf, #fff); /* new Webkit */ - background-image: linear-gradient(bottom, #dfdfdf, #fff); /* proposed W3C Markup */ + background-color: #f4f4f4; + background-image: -webkit-gradient(linear, left bottom, left top, from(#dfdfdf), to(#fff)); + background-image: -webkit-linear-gradient(bottom, #dfdfdf, #fff); + background-image: -moz-linear-gradient(bottom, #dfdfdf, #fff); + background-image: -o-linear-gradient(bottom, #dfdfdf, #fff); + background-image: linear-gradient(bottom, #dfdfdf, #fff); } #collapse-menu:hover #collapse-button { @@ -1122,39 +1100,32 @@ /* Auto-folding of the admin menu */ @media only screen and (max-width: 900px) { - #adminmenu li.menu-top { - border-top-color: #f9f9f9; - border-bottom-color: #dfdfdf; + .auto-fold #adminmenu li.wp-has-current-submenu, + .auto-fold #adminmenu li.current.menu-top { + background-color: #777; + background-image: -webkit-gradient(linear, left bottom, left top, from(#6d6d6d), to(#808080)); + background-image: -webkit-linear-gradient(bottom, #6d6d6d, #808080); + background-image: -moz-linear-gradient(bottom, #6d6d6d, #808080); + background-image: -o-linear-gradient(bottom, #6d6d6d, #808080); + background-image: linear-gradient(bottom, #6d6d6d, #808080); } - #adminmenu li.wp-has-current-submenu, - #adminmenu li.current.menu-top { - background-color: #777; /* Fallback */ - background-image: -ms-linear-gradient(bottom, #6d6d6d, #808080); /* IE10 */ - background-image: -moz-linear-gradient(bottom, #6d6d6d, #808080); /* Firefox */ - background-image: -o-linear-gradient(bottom, #6d6d6d, #808080); /* Opera */ - background-image: -webkit-gradient(linear, left bottom, left top, from(#6d6d6d), to(#808080)); /* old Webkit */ - background-image: -webkit-linear-gradient(bottom, #6d6d6d, #808080); /* new Webkit */ - background-image: linear-gradient(bottom, #6d6d6d, #808080); /* proposed W3C Markup */ - } - - #adminmenu li.menu-top li:hover a { - background-image: none; - } - - #adminmenu li.wp-has-current-submenu, - #adminmenu li.current.menu-top { + .auto-fold #adminmenu li.wp-has-current-submenu, + .auto-fold #adminmenu li.current.menu-top { border-top-color: #808080; border-bottom-color: #6d6d6d; } - #adminmenu .wp-has-current-submenu .wp-submenu-wrap { - -moz-box-shadow: 2px 2px 5px rgba( 0, 0, 0, 0.4 ); - -webkit-box-shadow: 2px 2px 5px rgba( 0, 0, 0, 0.4 ); - box-shadow: 2px 2px 5px rgba( 0, 0, 0, 0.4 ); + .auto-fold #adminmenu a.wp-has-current-submenu:focus + .wp-submenu, + .auto-fold #adminmenu .wp-has-current-submenu .wp-submenu { + background-color: #fff; + border-color: #dfdfdf; + -moz-box-shadow: 2px 3px 6px rgba(0, 0, 0, 0.4); + -webkit-box-shadow: 2px 3px 6px rgba(0, 0, 0, 0.4); + box-shadow: 2px 3px 6px rgba(0, 0, 0, 0.4); } - #collapse-button div { + .auto-fold #collapse-button div { background-position: 0 -108px; } } @@ -2033,28 +2004,24 @@ background-position: top left; } -.rtl #adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle, -.rtl #adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle { - background: transparent url(../images/arrows-dark.png) no-repeat 8px 6px; -} - -.rtl #adminmenu .wp-has-submenu:hover .wp-menu-toggle, -.rtl #adminmenu .wp-menu-open .wp-menu-toggle { - background: transparent url(../images/arrows.png) no-repeat 8px 6px; -} - .rtl #adminmenu .wp-submenu .wp-submenu-head { border-right-color: transparent; border-left-color: #dfdfdf; } -.rtl #adminmenu .wp-submenu-wrap, -.rtl.folded #adminmenu .wp-has-current-submenu .wp-submenu-wrap{ +.rtl #adminmenu .wp-submenu, +.rtl.folded #adminmenu .wp-has-current-submenu .wp-submenu { -moz-box-shadow: -2px 2px 5px rgba( 0, 0, 0, 0.4 ); -webkit-box-shadow: -2px 2px 5px rgba( 0, 0, 0, 0.4 ); box-shadow: -2px 2px 5px rgba( 0, 0, 0, 0.4 ); } +.rtl #adminmenu .wp-has-current-submenu .wp-submenu { + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; +} + /* Collapse Menu Button */ .rtl #collapse-button div { background-position: 0 -108px; @@ -2066,13 +2033,14 @@ /* Auto-folding of the admin menu for RTL */ @media only screen and (max-width: 900px) { - .rtl #adminmenu .wp-has-current-submenu .wp-submenu-wrap{ + .rtl.auto-fold #adminmenu a.wp-has-current-submenu:focus + .wp-submenu, + .rtl.auto-fold #adminmenu .wp-has-current-submenu .wp-submenu { -moz-box-shadow: -2px 2px 5px rgba( 0, 0, 0, 0.4 ); -webkit-box-shadow: -2px 2px 5px rgba( 0, 0, 0, 0.4 ); box-shadow: -2px 2px 5px rgba( 0, 0, 0, 0.4 ); } - .rtl #collapse-button div { + .rtl.auto-fold #collapse-button div { background-position: 0 -72px; } } Index: wp-admin/css/ie-rtl.dev.css =================================================================== --- wp-admin/css/ie-rtl.dev.css (revision 21420) +++ wp-admin/css/ie-rtl.dev.css (working copy) @@ -27,8 +27,8 @@ width: 99%; } -#adminmenu .wp-submenu .wp-submenu .wp-submenu-wrap, -#adminmenu .wp-menu-open .wp-submenu .wp-submenu-wrap { +#adminmenu .wp-submenu .wp-submenu .wp-submenu, +#adminmenu .wp-menu-open .wp-submenu .wp-submenu { border: 1px solid #dfdfdf; } @@ -41,10 +41,6 @@ padding: 6px 10px 6px 4px; } -#adminmenu .wp-menu-arrow { - display: none !important; -} - #wpcontent #adminmenu .wp-submenu li.wp-submenu-head { padding: 3px 10px 4px 4px; } Index: wp-admin/css/ie.dev.css =================================================================== --- wp-admin/css/ie.dev.css (revision 21420) +++ wp-admin/css/ie.dev.css (working copy) @@ -74,12 +74,12 @@ margin-bottom: -2px; } -#adminmenu li.wp-not-current-submenu:hover .wp-menu-arrow { - display: none; +#adminmenu .wp-menu-arrow { + display: none !important; } -#wpcontent #adminmenu .wp-submenu li.wp-submenu-head { - padding: 3px 4px 4px 10px; +#adminmenu .wp-submenu li.wp-submenu-head { + padding: 6px 4px 7px 10px; zoom: 100%; } @@ -87,10 +87,6 @@ height: 30px; } -.js.folded #adminmenu .wp-submenu { - margin: -1px 0 0 0; -} - .js.folded #adminmenu li.menu-top { display: block; zoom: 100%; Index: wp-admin/css/wp-admin-rtl.dev.css =================================================================== --- wp-admin/css/wp-admin-rtl.dev.css (revision 21420) +++ wp-admin/css/wp-admin-rtl.dev.css (working copy) @@ -342,6 +342,16 @@ 7.0 - Main Navigation (Right Menu) (RTL: Left Menu) ------------------------------------------------------------------------------*/ +.folded #wpcontent { + margin-left: 0; + margin-right: 52px; +} + +.folded.wp-admin #footer { + margin-left: 15px; + margin-right: 52px; +} + #adminmenuback, #adminmenuwrap { border-width: 0 0 0 1px; @@ -357,30 +367,24 @@ right: 146px; } -.folded #adminmenu .wp-submenu, -.folded #adminmenu .wp-has-current-submenu .wp-submenu { - left: auto; - right: 26px; -} -#adminmenu .wp-submenu.sub-open, -#adminmenu li.focused.wp-not-current-submenu .wp-submenu, -.folded #adminmenu li.focused.wp-has-current-submenu .wp-submenu, +.folded #adminmenu .wp-submenu.sub-open, +.folded #adminmenu .opensub .wp-submenu, .folded #adminmenu .wp-has-current-submenu .wp-submenu.sub-open, -.no-js #adminmenu .wp-has-submenu:hover .wp-submenu, -.no-js.folded #adminmenu .wp-has-current-submenu:hover .wp-submenu { - padding: 0 0 8px 8px; +.folded #adminmenu .wp-has-current-submenu.opensub .wp-submenu, +.folded #adminmenu a.menu-top:focus + .wp-submenu, +.folded #adminmenu .wp-has-current-submenu a.menu-top:focus + .wp-submenu, +.no-js.folded #adminmenu .wp-has-submenu:hover .wp-submenu { + left: auto; + right: 32px; } -#adminmenu div.wp-menu-image { +#adminmenu div.wp-menu-image, +.folded #adminmenu div.wp-menu-image { float: right; + width: 30px; } -#adminmenu li li { - margin-left: 0; - margin-right: 8px -} - #adminmenu .wp-submenu a, #adminmenu li li a, .folded #adminmenu .wp-not-current-submenu li a { @@ -393,16 +397,6 @@ padding-right: 18px; } -.folded #adminmenu li li { - margin-left: inherit; - margin-right: 0 -} - -.folded #adminmenu li li a { - padding-left: inherit; - padding-right: 0 -} - .wp-menu-arrow { right: 0; @@ -444,17 +438,20 @@ } #adminmenu .wp-menu-image img { - float: right; - padding: 5px 2px 0 0; + padding: 7px 7px 0 0; } #adminmenu .wp-submenu .wp-submenu-head { padding: 6px 10px 5px 4px; + -webkit-border-top-right-radius: 0; + -webkit-border-top-left-radius: 3px; + border-top-right-radius: 0; + border-top-left-radius: 3px; } -#adminmenu li .wp-submenu-wrap { - border-width: 1px 0 1px 1px; - border-style: solid none solid solid; +.folded #adminmenu li.wp-has-current-submenu .wp-submenu { + border-width: 1px; + border-style: solid; -webkit-border-bottom-right-radius: 0; -webkit-border-bottom-left-radius: 3px; -webkit-border-top-right-radius: 0; @@ -465,26 +462,6 @@ border-top-left-radius: 3px; } -.folded #adminmenu .wp-submenu ul { - border-width: 0 1px 0 0; -} - -.folded #adminmenu .wp-submenu a { - padding-left: 0; - padding-right: 10px; -} - -.folded #adminmenu a.wp-has-submenu { - margin-left: 0; - margin-right: 40px; -} - -#adminmenu .wp-menu-toggle { - clear: left; - float: left; - padding: 1px 0 0 2px; -} - #adminmenu .awaiting-mod, #adminmenu span.update-plugins, #sidemenu li a span.update-plugins { @@ -499,29 +476,33 @@ /* Auto-folding of the admin menu */ @media only screen and (max-width: 900px) { - #adminmenu li .wp-submenu, - #adminmenu .wp-has-current-submenu .wp-submenu { - left: auto; - right: 26px; + .auto-fold #wpcontent { + margin-left: 0; + margin-right: 52px; } - #adminmenu li.focused.wp-has-current-submenu .wp-submenu, - #adminmenu .wp-has-current-submenu .wp-submenu.sub-open { - padding: 0 0 8px 8px; + .auto-fold.wp-admin #footer { + margin-left: 15px; + margin-right: 52px; } - .folded #adminmenu .wp-not-current-submenu li a { + .auto-fold #adminmenu .wp-submenu.sub-open, + .auto-fold #adminmenu .opensub .wp-submenu, + .auto-fold #adminmenu .wp-has-current-submenu .wp-submenu.sub-open, + .auto-fold #adminmenu .wp-has-current-submenu.opensub .wp-submenu, + .auto-fold #adminmenu a.menu-top:focus + .wp-submenu, + .auto-fold #adminmenu .wp-has-current-submenu a.menu-top:focus + .wp-submenu, + .no-js.auto-fold #adminmenu .wp-has-submenu:hover .wp-submenu { + left: auto; + right: 32px; + } + + .auto-fold #adminmenu .wp-not-current-submenu li a { padding-left: 0; padding-right: 12px; } - #adminmenu li li, - #adminmenu li li a { - padding-left: inherit; - padding-right: 0 - } - - .wp-menu-arrow { + .auto-fold .wp-menu-arrow { -moz-transform: translate( -27px ); -webkit-transform: translate( -27px ); -o-transform: translate( -27px ); @@ -529,29 +510,18 @@ transform: translate( -27px ); } - #adminmenu .wp-submenu ul { - border-width: 0 1px 0 0; + .auto-fold #adminmenu li.wp-has-current-submenu .wp-submenu { + border-width: 1px; + border-style: solid; + -webkit-border-bottom-right-radius: 0; + -webkit-border-bottom-left-radius: 3px; + -webkit-border-top-right-radius: 0; + -webkit-border-top-left-radius: 3px; + border-bottom-right-radius: 0; + border-bottom-left-radius: 3px; + border-top-right-radius: 0; + border-top-left-radius: 3px; } - - #adminmenu .wp-submenu a { - padding-left: 0; - padding-right: 10px; - } - - #adminmenu a.wp-has-submenu { - margin-left: 0; - margin-right: 40px; - } - - body #wpcontent { - margin-left: 0; - margin-right: 52px; - } - - body .wp-admin #footer { - margin-left: 15px; - margin-right: 52px; - } } /* List table styles */ @@ -1647,16 +1617,6 @@ margin-right: 165px; } -.folded #wpcontent { - margin-left: 0; - margin-right: 52px; -} - -.folded.wp-admin #footer { - margin-left: 15px; - margin-right: 52px; -} - #wpbody-content { float: right; } Index: wp-admin/css/wp-admin.dev.css =================================================================== --- wp-admin/css/wp-admin.dev.css (revision 21420) +++ wp-admin/css/wp-admin.dev.css (working copy) @@ -76,9 +76,7 @@ #adminmenuback, #adminmenuwrap, #adminmenu, -#adminmenu .wp-submenu, -#adminmenu .wp-submenu-wrap, -.folded #adminmenu .wp-has-current-submenu .wp-submenu { +#adminmenu .wp-submenu { width: 145px; } @@ -1318,166 +1316,158 @@ user-select: none; } +#adminmenu li { + margin: 0; + padding: 0; + cursor: pointer; +} + +#adminmenu a { + display: block; + line-height: 18px; + padding: 2px 5px; +} + +#adminmenu li.menu-top { + min-height: 28px; + position: relative; +} + #adminmenu .wp-submenu { list-style: none; - padding: 0; + padding: 4px 0; margin: 0; - overflow: hidden; -} - -#adminmenu li .wp-submenu, -.folded #adminmenu .wp-has-current-submenu .wp-submenu { - display: none; position: absolute; - top: -1px; + top: -1000em; left: 146px; z-index: 999; - overflow: hidden; + overflow: visible; + border-width: 1px; + border-style: solid; + -webkit-border-bottom-right-radius: 3px; + -webkit-border-top-right-radius: 3px; + border-bottom-right-radius: 3px; + border-top-right-radius: 3px; } -.js #adminmenu .wp-submenu.sub-open, -.folded #adminmenu .wp-has-current-submenu .wp-submenu.sub-open, -.no-js #adminmenu .wp-has-submenu:hover .wp-submenu, -#adminmenu .wp-has-current-submenu .wp-submenu, -#adminmenu li.focused .wp-submenu { - display: block; +.js #adminmenu .sub-open, +.js #adminmenu .opensub .wp-submenu, +#adminmenu a.menu-top:focus + .wp-submenu, +.no-js li.wp-has-submenu:hover .wp-submenu { + top: -1px; } -#adminmenu .wp-has-current-submenu .wp-submenu { +#adminmenu .wp-has-current-submenu .wp-submenu, +.no-js li.wp-has-current-submenu:hover .wp-submenu, +#adminmenu a.wp-has-current-submenu:focus + .wp-submenu, +#adminmenu .wp-has-current-submenu .wp-submenu.sub-open, +#adminmenu .wp-has-current-submenu.opensub .wp-submenu { position: relative; z-index: 2; top: auto; left: auto; right: auto; bottom: auto; - padding: 0; -} + border: 0 none; -#adminmenu .wp-has-current-submenu .wp-submenu-wrap { -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; } -.folded #adminmenu .wp-submenu, -.folded #adminmenu .wp-has-current-submenu .wp-submenu { - top: -5px; - left: 26px; -} - -#adminmenu .wp-submenu.sub-open, -#adminmenu li.focused.wp-not-current-submenu .wp-submenu, -.folded #adminmenu li.focused.wp-has-current-submenu .wp-submenu, +.folded #adminmenu .wp-submenu.sub-open, +.folded #adminmenu .opensub .wp-submenu, .folded #adminmenu .wp-has-current-submenu .wp-submenu.sub-open, -.no-js #adminmenu .wp-has-submenu:hover .wp-submenu, -.no-js.folded #adminmenu .wp-has-current-submenu:hover .wp-submenu { - padding: 0 8px 8px 0; +.folded #adminmenu .wp-has-current-submenu.opensub .wp-submenu, +.folded #adminmenu a.menu-top:focus + .wp-submenu, +.folded #adminmenu .wp-has-current-submenu a.menu-top:focus + .wp-submenu, +.no-js.folded #adminmenu .wp-has-submenu:hover .wp-submenu { + top: -1px; + left: 32px; } -.no-js #adminmenu .wp-has-current-submenu:hover .wp-submenu, -#adminmenu .wp-has-current-submenu .wp-submenu { - padding: 0; +.folded #adminmenu a.wp-has-current-submenu:focus + .wp-submenu, +.folded #adminmenu .wp-has-current-submenu .wp-submenu { + border-width: 1px; + border-style: solid; + position: absolute; + top: -1000em; } #adminmenu .wp-submenu a { font-size: 12px; line-height: 18px; + margin: 0; + padding-left: 12px; } +#adminmenu .wp-not-current-submenu li > a { + padding-left: 16px; +} + +#adminmenu .wp-has-current-submenu ul > li > a, +.folded #adminmenu li.menu-top .wp-submenu > li > a { + padding-left: 12px; +} + #adminmenu a.menu-top, #adminmenu .wp-submenu-head { font-size: 13px; + font-weight: bold; line-height: 18px; + padding: 0; } -#adminmenu div.wp-submenu-head { +#adminmenu .wp-submenu-head, +.folded #adminmenu .wp-menu-name { display: none; } -.folded #adminmenu div.wp-submenu-head { +.folded #adminmenu .wp-submenu-head { display: block; } -.folded #adminmenu a.menu-top, -body.no-js #adminmenu .wp-menu-toggle, -.folded #adminmenu div.wp-menu-toggle { - display: none; -} - -#adminmenu div.wp-menu-image { - float: left; - width: 28px; - height: 28px; -} - -.folded #adminmenu div.wp-menu-image { - width: 30px; -} - -#adminmenu li { +#adminmenu .wp-submenu li { + padding: 0; margin: 0; - padding: 0; - cursor: pointer; + overflow: hidden; } -#adminmenu a { - display: block; - line-height: 18px; - padding: 2px 5px; -} - -#adminmenu li.menu-top { - min-height: 29px; - position: relative; -} - #adminmenu a.menu-top { - font-weight: bold; - line-height: 18px; - min-width: 10em; - padding: 5px 5px; - border-width: 1px 0 1px; - border-style: solid; + border-width: 1px 0; + border-style: solid none; } -#adminmenu li.wp-menu-open { - border-width: 0 0 1px; - border-style: solid; +#adminmenu .wp-menu-image img { + padding: 7px 0 0 7px; + opacity: 0.6; + filter: alpha(opacity=60); } -#adminmenu .wp-submenu ul { - padding: 4px 0; +#adminmenu div.wp-menu-name { + padding: 5px; } -#adminmenu .wp-submenu a { - margin: 0; +#adminmenu div.wp-menu-image { + float: left; + width: 28px; + height: 28px; + margin-top: -1px; } -#adminmenu li li { - margin-left: 8px; +.folded #adminmenu div.wp-menu-image { + width: 32px; + margin-top: 0; + position: absolute; + z-index: 25; } -#adminmenu .wp-submenu a, -#adminmenu li li a, -.folded #adminmenu .wp-not-current-submenu li a { - padding-left: 12px; +.folded #adminmenu a.menu-top { + height: 29px; } -#adminmenu .wp-not-current-submenu li a { - padding-left: 18px; -} - -.folded #adminmenu li li { - margin-left: 0; -} - -.folded #adminmenu li li a { - padding-left: 0; -} - .wp-menu-arrow { display: none; - cursor: auto; z-index: 25; position: absolute; right: 100%; @@ -1492,27 +1482,6 @@ transform: translate( 146px ); } -#adminmenu li.wp-has-current-submenu .wp-menu-arrow, -#adminmenu li.menu-top:hover .wp-menu-arrow, -#adminmenu li.current .wp-menu-arrow, -#adminmenu li.focused .wp-menu-arrow, -#adminmenu li.menu-top.wp-has-submenu:hover .wp-menu-arrow div { - display: block; -} - -#adminmenu li.wp-not-current-submenu:hover .wp-menu-arrow div { - display: none; -} - -#adminmenu li.menu-top:hover .wp-menu-arrow, -#adminmenu li.menu-top.focused .wp-menu-arrow { - z-index: 1001; -} - -.ie8 #adminmenu li.menu-top:hover .wp-menu-arrow { - display: none; -} - #adminmenu .wp-menu-arrow div { position: absolute; top: 7px; @@ -1536,6 +1505,7 @@ height: 28px; border-width: 1px 0; border-style: solid; + top: 0; } .folded .wp-menu-arrow { @@ -1546,6 +1516,29 @@ transform: translate( 33px ); } +#adminmenu li.wp-has-current-submenu .wp-menu-arrow, +#adminmenu a.menu-top:focus .wp-menu-arrow, +.no-js #adminmenu li.wp-has-submenu:hover .wp-menu-arrow, +#adminmenu li.current .wp-menu-arrow, +#adminmenu li.wp-has-submenu.opensub .wp-menu-arrow { + display: block; +} + +#adminmenu li.current .wp-menu-arrow, +#adminmenu li.wp-menu-open .wp-menu-arrow { + top: 0; +} + +.no-js #adminmenu li.wp-has-submenu:hover .wp-menu-arrow, +#adminmenu .opensub a.wp-has-submenu .wp-menu-arrow, +#adminmenu a.wp-has-submenu:focus .wp-menu-arrow { + z-index: 1001; +} + +.ie8 #adminmenu li.menu-top:hover .wp-menu-arrow { + display: none; +} + #adminmenu .wp-not-current-submenu .wp-menu-arrow div { width: 15px; top: 6px; @@ -1554,33 +1547,17 @@ } .wp-menu-arrow, -.folded #adminmenu li.menu-top:hover .wp-menu-arrow { +.folded #adminmenu li.wp-not-current-submenu .wp-menu-arrow, +.no-js #adminmenu li.wp-not-current-submenu:hover .wp-menu-arrow { display: none; } -.folded #adminmenu li.current:hover .wp-menu-arrow, -.folded #adminmenu li.menu-top.wp-menu-open:hover .wp-menu-arrow { +.folded #adminmenu li.current .wp-menu-arrow, +.folded #adminmenu li.wp-menu-open .wp-menu-arrow { display: block; - z-index: 125; + top: 1px; } -#adminmenu .wp-submenu li { - padding: 0; - margin: 0; -} - -.folded #adminmenu li.menu-top { - border-width: 1px 0; - border-style: solid none; -} - -#adminmenu .wp-menu-image img { - float: left; - padding: 5px 0 0 2px; - opacity: 0.6; - filter: alpha(opacity=60); -} - #adminmenu li.menu-top:hover .wp-menu-image img, #adminmenu li.wp-has-current-submenu .wp-menu-image img { opacity: 1; @@ -1605,30 +1582,24 @@ #adminmenu .wp-submenu .wp-submenu-head { padding: 6px 4px 5px 10px; - cursor: default; + margin: -4px -1px 4px; border-width: 1px 0; border-style: solid; -} - -#adminmenu li .wp-submenu-wrap { - border-width: 1px 1px 1px 0; - border-style: solid solid solid none; - position: relative; - -webkit-border-bottom-right-radius: 3px; -webkit-border-top-right-radius: 3px; - border-bottom-right-radius: 3px; border-top-right-radius: 3px; } -#adminmenu li.wp-menu-open .wp-submenu-wrap { - border: 0 none; +#adminmenu li.wp-menu-open { + border-width: 0 0 1px; + border-style: solid; } -.folded #adminmenu .wp-submenu .wp-submenu-wrap { - margin-top: 3px; +#adminmenu li.current, +.folded #adminmenu li.wp-menu-open { + border: 0 none; } -.folded #adminmenu .wp-has-current-submenu { +.folded #adminmenu li.wp-has-current-submenu { margin-bottom: 1px; } @@ -1636,37 +1607,6 @@ margin-bottom: 0; } -.folded #adminmenu .wp-has-current-submenu .wp-submenu-wrap { - margin-top: 4px; -} - -.folded #adminmenu .wp-submenu ul { - border-width: 0 0 0 1px; - border-style: solid; -} - -.folded #adminmenu .wp-submenu a { - padding-left: 10px; -} - -.folded #adminmenu a.wp-has-submenu { - margin-left: 40px; -} - -#adminmenu .wp-menu-toggle { - width: 18px; - clear: right; - float: right; - margin: 1px 0 0; - height: 27px; - padding: 1px 2px 0 0; - cursor: pointer; -} - -#adminmenu .wp-menu-image a { - height: 24px; -} - #adminmenu .awaiting-mod, #adminmenu span.update-plugins, #sidemenu li a span.update-plugins { @@ -1697,6 +1637,8 @@ #collapse-menu { font-size: 12px; line-height: 34px; + border-width: 1px 0 0; + border-style: solid; } .folded #collapse-menu span { @@ -1720,67 +1662,60 @@ /* Auto-folding of the admin menu */ @media only screen and (max-width: 900px) { - #wpcontent, - #footer { + .auto-fold #wpcontent, + .auto-fold #footer { margin-left: 52px; } - #adminmenuback, - #adminmenuwrap, - #adminmenu, - #adminmenu li.menu-top { + .auto-fold #adminmenuback, + .auto-fold #adminmenuwrap, + .auto-fold #adminmenu, + .auto-fold #adminmenu li.menu-top { width: 32px; } - #adminmenu .wp-has-current-submenu .wp-submenu { - display: none; - position: absolute; - width: 145px; - z-index: 999; - overflow: hidden; + .auto-fold #adminmenu .wp-submenu.sub-open, + .auto-fold #adminmenu .opensub .wp-submenu, + .auto-fold #adminmenu .wp-has-current-submenu .wp-submenu.sub-open, + .auto-fold #adminmenu .wp-has-current-submenu.opensub .wp-submenu, + .auto-fold #adminmenu a.menu-top:focus + .wp-submenu, + .auto-fold #adminmenu .wp-has-current-submenu a.menu-top:focus + .wp-submenu { + top: -1px; + left: 32px; } - #adminmenu .wp-has-current-submenu .wp-submenu.sub-open { - display: block; + .auto-fold #adminmenu a.wp-has-current-submenu:focus + .wp-submenu, + .auto-fold #adminmenu .wp-has-current-submenu .wp-submenu { + border-width: 1px; + border-style: solid; + position: absolute; + top: -1000em; } - #adminmenu li .wp-submenu, - #adminmenu .wp-has-current-submenu .wp-submenu { - top: -5px; - left: 26px; + .auto-fold #adminmenu li.menu-top .wp-submenu > li > a { + padding-left: 12px; } - #adminmenu li.focused.wp-has-current-submenu .wp-submenu, - #adminmenu .wp-has-current-submenu .wp-submenu.sub-open { - padding: 0 8px 8px 0; + .auto-fold #adminmenu .wp-menu-name { + display: none; } - #adminmenu div.wp-submenu-head { + .auto-fold #adminmenu .wp-submenu-head { display: block; } - #adminmenu a.menu-top, - #adminmenu div.wp-menu-toggle { - display: none; + .auto-fold #adminmenu div.wp-menu-image { + width: 32px; + margin-top: 0; + position: absolute; + z-index: 25; } - #adminmenu div.wp-menu-image { - width: 30px; + .auto-fold #adminmenu a.menu-top { + height: 29px; } - #adminmenu .wp-not-current-submenu li a { - padding-left: 12px; - } - - #adminmenu li li { - margin-left: 0; - } - - #adminmenu li li a { - padding-left: 0; - } - - .wp-menu-arrow { + .auto-fold .wp-menu-arrow { -moz-transform: translate( 33px ); -webkit-transform: translate( 33px ); -o-transform: translate( 33px ); @@ -1788,51 +1723,29 @@ transform: translate( 33px ); } - #adminmenu li.menu-top:hover .wp-menu-arrow { + .auto-fold #adminmenu li.wp-not-current-submenu .wp-menu-arrow { display: none; } - #adminmenu li.current:hover .wp-menu-arrow, - #adminmenu li.menu-top.wp-menu-open:hover .wp-menu-arrow { + .auto-fold #adminmenu li.current .wp-menu-arrow, + .auto-fold #adminmenu li.wp-menu-open .wp-menu-arrow { display: block; - z-index: 125; + top: 1px; } - #adminmenu li.menu-top { - border-width: 1px 0; - border-style: solid none; + .auto-fold #adminmenu li.wp-menu-open { + border: 0 none; } - #adminmenu .wp-submenu .wp-submenu-wrap { - margin-top: 3px; - } - - #adminmenu .wp-has-current-submenu { + .auto-fold #adminmenu li.wp-has-current-submenu { margin-bottom: 1px; } - #adminmenu .wp-has-current-submenu.menu-top-last { + .auto-fold #adminmenu .wp-has-current-submenu.menu-top-last { margin-bottom: 0; } - #adminmenu .wp-has-current-submenu .wp-submenu-wrap { - margin-top: 4px; - } - - #adminmenu .wp-submenu ul { - border-width: 0 0 0 1px; - border-style: solid; - } - - #adminmenu .wp-submenu a { - padding-left: 10px; - } - - #adminmenu a.wp-has-submenu { - margin-left: 40px; - } - - #collapse-menu { + .auto-fold #collapse-menu span { display: none; } } Index: wp-admin/js/common.dev.js =================================================================== --- wp-admin/js/common.dev.js (revision 21420) +++ wp-admin/js/common.dev.js (working copy) @@ -160,36 +160,45 @@ $(document).ready( function() { var lastClicked = false, checks, first, last, checked, menu = $('#adminmenu'), - pageInput = $('input.current-page'), currentPage = pageInput.val(), refresh; + pageInput = $('input.current-page'), currentPage = pageInput.val(); - // admin menu - refresh = function(i, el){ // force the browser to refresh the tabbing index - var node = $(el), tab = node.attr('tabindex'); - if ( tab ) - node.attr('tabindex', '0').attr('tabindex', tab); - }; + // when the menu is folded, make the fly-out submenu header clickable + $('.wp-submenu-head', menu).bind('click.wp-submenu-head', function(e){ + $(this).parent().siblings('a').get(0).click(); + }); - $('#collapse-menu', menu).click(function(){ + $('#collapse-menu', menu).bind('click.collapse-menu', function(e){ var body = $(document.body); // reset any compensation for submenus near the bottom of the screen $('#adminmenu div.wp-submenu').css('margin-top', ''); - if ( body.hasClass('folded') ) { - body.removeClass('folded'); - setUserSetting('mfold', 'o'); + if ( $(window).width() < 900 ) { + if ( body.hasClass('auto-fold') ) { + body.removeClass('auto-fold'); + setUserSetting('unfold', 1); + body.removeClass('folded'); + deleteUserSetting('mfold'); + } else { + body.addClass('auto-fold'); + deleteUserSetting('unfold'); + } } else { - body.addClass('folded'); - setUserSetting('mfold', 'f'); + if ( body.hasClass('folded') ) { + body.removeClass('folded'); + deleteUserSetting('mfold'); + } else { + body.addClass('folded'); + setUserSetting('mfold', 'f'); + } } - return false; }); $('li.wp-has-submenu', menu).hoverIntent({ over: function(e){ var b, h, o, f, m = $(this).find('.wp-submenu'), menutop, wintop, maxtop; - if ( m.is(':visible') ) + if ( parseInt( m.css('top'), 10 ) > -5 ) return; menutop = $(this).offset().top; @@ -212,41 +221,21 @@ else m.css('margin-top', ''); - menu.find('.wp-submenu').removeClass('sub-open'); - m.addClass('sub-open'); + menu.find('li.menu-top').removeClass('opensub'); + $(this).addClass('opensub'); }, out: function(){ - $(this).find('.wp-submenu').removeClass('sub-open').css('margin-top', ''); + $(this).removeClass('opensub').find('.wp-submenu').css('margin-top', ''); }, timeout: 200, sensitivity: 7, interval: 90 }); - // Tab to select, Enter to open sub, Esc to close sub and focus the top menu - $('li.wp-has-submenu > a.wp-not-current-submenu', menu).bind('keydown.adminmenu', function(e){ - if ( e.which != 13 ) - return; - - var target = $(e.target); - - e.stopPropagation(); - e.preventDefault(); - - menu.find('.wp-submenu').removeClass('sub-open'); - target.siblings('.wp-submenu').toggleClass('sub-open').find('a[role="menuitem"]').each(refresh); - }).each(refresh); - - $('a[role="menuitem"]', menu).bind('keydown.adminmenu', function(e){ - if ( e.which != 27 ) - return; - - var target = $(e.target); - - e.stopPropagation(); - e.preventDefault(); - - target.add( target.siblings() ).closest('.sub-open').removeClass('sub-open').siblings('a.wp-not-current-submenu').focus(); + $('.wp-submenu a', menu).bind('focus.adminmenu', function(e){ + $(e.target).closest('li.menu-top').addClass('opensub'); + }).bind('blur.adminmenu', function(e){ + $(e.target).closest('li.menu-top').removeClass('opensub'); }); // Move .updated and .error alert boxes. Don't move boxes designed to be inline. Index: wp-admin/menu-header.php =================================================================== --- wp-admin/menu-header.php (revision 21420) +++ wp-admin/menu-header.php (working copy) @@ -87,9 +87,9 @@ $menu_file = substr( $menu_file, 0, $pos ); if ( ! empty( $menu_hook ) || ( ('index.php' != $submenu_items[0][2]) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) ) ) { $admin_is_parent = true; - echo "
$img
$arrow$title"; + echo "$arrow
$img
$title
"; } else { - echo "\n\t
$img
$arrow$title"; + echo "\n\t$arrow
$img
$title
"; } } elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) { $menu_hook = get_plugin_page_hook( $item[2], 'admin.php' ); @@ -98,15 +98,16 @@ $menu_file = substr( $menu_file, 0, $pos ); if ( ! empty( $menu_hook ) || ( ('index.php' != $item[2]) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) ) ) { $admin_is_parent = true; - echo "\n\t
$img
$arrow{$item[0]}"; + echo "\n\t$arrow
$img
{$item[0]}
"; } else { - echo "\n\t
$img
$arrow{$item[0]}"; + echo "\n\t$arrow
$img
{$item[0]}
"; } } if ( ! empty( $submenu_items ) ) { - echo "\n\t
"; - echo "
{$item[0]}
"; + echo ""; } echo ""; }