mirror of
https://github.com/gosticks/wordpress-develop.git
synced 2026-08-12 21:00:21 +00:00
Fix menu hover when loaded folded, simplify menu JS and auto-folding, see #18382
git-svn-id: https://develop.svn.wordpress.org/trunk@18901 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
File diff suppressed because one or more lines are too long
@@ -944,19 +944,10 @@ table.widefat .spam a:hover,
|
||||
border-color: #dfdfdf;
|
||||
}
|
||||
|
||||
#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 */
|
||||
background-image: -o-linear-gradient(bottom, #ccc, #e4e4e4); /* Opera */
|
||||
background-image: -webkit-gradient(linear, left bottom, left top, from(#ccc), to(#e4e4e4)); /* old Webkit */
|
||||
background-image: -webkit-linear-gradient(bottom, #ccc, #e4e4e4); /* new Webkit */
|
||||
background-image: linear-gradient(bottom, #ccc, #e4e4e4); /* proposed W3C Markup */
|
||||
border-top-color: #e4e4e4;
|
||||
border-bottom-color: #ccc;
|
||||
#adminmenu li.menu-top:hover > a,
|
||||
#adminmenu li.menu-top:hover > .wp-menu-arrow {
|
||||
background-color: #e4e4e4;
|
||||
text-shadow: 0 1px 0 rgba( 255, 255, 255, 0.4 );
|
||||
color: #d54e21;
|
||||
}
|
||||
|
||||
#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,
|
||||
@@ -965,6 +956,8 @@ table.widefat .spam a:hover,
|
||||
.folded #adminmenu li.current.menu-top,
|
||||
#adminmenu .wp-has-current-submenu .wp-menu-arrow,
|
||||
#adminmenu .current .wp-menu-arrow,
|
||||
#adminmenu li.wp-has-current-submenu:hover > .wp-menu-arrow,
|
||||
#adminmenu li.current:hover > .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 */
|
||||
@@ -975,16 +968,7 @@ table.widefat .spam a:hover,
|
||||
background-image: linear-gradient(bottom, #6d6d6d, #808080); /* proposed W3C Markup */
|
||||
}
|
||||
|
||||
#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 */
|
||||
background-image: -o-linear-gradient(left, #fff, #eaf2fa 30px); /* Opera */
|
||||
background-image: -webkit-gradient(linear, left bottom, right bottom, from(#fff), color-stop(0.1, #eaf2fa)); /* old Webkit */
|
||||
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 {
|
||||
.folded #adminmenu li.menu-top li:hover a {
|
||||
background-image: none;
|
||||
}
|
||||
|
||||
@@ -1004,8 +988,8 @@ table.widefat .spam a:hover,
|
||||
}
|
||||
|
||||
#adminmenu .wp-submenu a:hover {
|
||||
background-color: #EAF2FA !important;
|
||||
color: #333 !important;
|
||||
background-color: #EAF2FA;
|
||||
color: #333;
|
||||
}
|
||||
|
||||
#adminmenu .wp-submenu li.current,
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -1661,7 +1661,7 @@ form.upgrade .hint {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
#adminmenu .wp-not-current-submenu .wp-submenu,
|
||||
#adminmenu li .wp-submenu,
|
||||
.folded #adminmenu .wp-has-current-submenu .wp-submenu {
|
||||
display: none;
|
||||
position: absolute;
|
||||
@@ -1679,6 +1679,7 @@ form.upgrade .hint {
|
||||
|
||||
#adminmenu .wp-has-current-submenu .wp-submenu {
|
||||
position: relative;
|
||||
display: block;
|
||||
z-index: 2;
|
||||
top: auto;
|
||||
left: auto;
|
||||
@@ -1700,12 +1701,14 @@ form.upgrade .hint {
|
||||
}
|
||||
|
||||
#adminmenu .wp-submenu.sub-open,
|
||||
.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;
|
||||
}
|
||||
|
||||
.no-js #adminmenu .wp-has-current-submenu:hover .wp-submenu {
|
||||
.no-js #adminmenu .wp-has-current-submenu:hover .wp-submenu,
|
||||
#adminmenu .wp-has-current-submenu .wp-submenu {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
@@ -1762,7 +1765,7 @@ body.no-js #adminmenu .wp-menu-toggle,
|
||||
}
|
||||
|
||||
#adminmenu li.menu-top {
|
||||
min-height: 26px;
|
||||
min-height: 29px;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
@@ -1785,18 +1788,22 @@ body.no-js #adminmenu .wp-menu-toggle,
|
||||
padding-left: 12px;
|
||||
}
|
||||
|
||||
#adminmenu li.wp-not-current-submenu li {
|
||||
#adminmenu li li {
|
||||
margin-left: 8px;
|
||||
}
|
||||
|
||||
.folded #adminmenu li.wp-not-current-submenu li {
|
||||
.js.folded #adminmenu li li {
|
||||
margin-left: 0;
|
||||
}
|
||||
|
||||
#adminmenu li.wp-not-current-submenu li a {
|
||||
#adminmenu li li a {
|
||||
padding-left: 12px;
|
||||
}
|
||||
|
||||
.folded #adminmenu li li a {
|
||||
padding-left: 0;
|
||||
}
|
||||
|
||||
.wp-menu-arrow {
|
||||
display: none;
|
||||
}
|
||||
@@ -1813,13 +1820,18 @@ body.no-js #adminmenu .wp-menu-toggle,
|
||||
}
|
||||
|
||||
#adminmenu li.menu-top:hover .wp-menu-arrow {
|
||||
z-index: 1500;
|
||||
z-index: 1001;
|
||||
}
|
||||
|
||||
.folded #adminmenu li.menu-top:hover .wp-menu-arrow {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.folded #adminmenu li.menu-top.wp-menu-open:hover .wp-menu-arrow {
|
||||
display: block;
|
||||
z-index: 125;
|
||||
}
|
||||
|
||||
#adminmenu .wp-menu-arrow div {
|
||||
width: 15px;
|
||||
height: 30px;
|
||||
@@ -1832,10 +1844,8 @@ body.no-js #adminmenu .wp-menu-toggle,
|
||||
}
|
||||
|
||||
.folded #adminmenu li.menu-top {
|
||||
width: 32px;
|
||||
height: 29px;
|
||||
border-width: 1px 0;
|
||||
border-style: solid;
|
||||
border-style: solid none;
|
||||
}
|
||||
|
||||
#adminmenu .wp-menu-image img {
|
||||
@@ -1874,9 +1884,9 @@ body.no-js #adminmenu .wp-menu-toggle,
|
||||
border-style: solid;
|
||||
}
|
||||
|
||||
#adminmenu .wp-not-current-submenu .wp-submenu-wrap {
|
||||
#adminmenu li .wp-submenu-wrap {
|
||||
border-width: 1px 1px 1px 0;
|
||||
border-style: solid;
|
||||
border-style: solid solid solid none;
|
||||
position: relative;
|
||||
-webkit-border-bottom-right-radius: 3px;
|
||||
-webkit-border-top-right-radius: 3px;
|
||||
@@ -1884,10 +1894,12 @@ body.no-js #adminmenu .wp-menu-toggle,
|
||||
border-top-right-radius: 3px;
|
||||
}
|
||||
|
||||
#adminmenu li.wp-menu-open .wp-submenu-wrap {
|
||||
border: 0 none;
|
||||
}
|
||||
|
||||
.folded #adminmenu .wp-submenu .wp-submenu-wrap {
|
||||
margin-top: 4px;
|
||||
border-width: 0 1px 1px 0;
|
||||
border-style: solid;
|
||||
}
|
||||
|
||||
.folded #adminmenu .wp-submenu ul {
|
||||
|
||||
Reference in New Issue
Block a user