From b697208eefa3197707a1a9eb5f19e3e07263da0b Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Fri, 19 Oct 2012 21:32:34 +0000
Subject: [PATCH] Adminmenu: fix folded height and shadow inconsistencies,
 props webord, fixes #21998

git-svn-id: https://develop.svn.wordpress.org/trunk@22263 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/css/ie-rtl.css       |  5 -----
 wp-admin/css/ie.css           | 22 +++++++++++++---------
 wp-admin/css/wp-admin-rtl.css | 12 ++++++------
 wp-admin/css/wp-admin.css     | 34 +++++++++++++++++++---------------
 4 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/wp-admin/css/ie-rtl.css b/wp-admin/css/ie-rtl.css
index a62928ab4d..4d0774fa2b 100644
--- a/wp-admin/css/ie-rtl.css
+++ b/wp-admin/css/ie-rtl.css
@@ -34,11 +34,6 @@ body {
 
 .folded #adminmenu .wp-submenu {
 	right: 30px;
-	top: -4px;
-}
-
-#adminmenu .wp-submenu .wp-submenu-head {
-	padding: 6px 10px 6px 4px;
 }
 
 #wpcontent #adminmenu .wp-submenu li.wp-submenu-head {
diff --git a/wp-admin/css/ie.css b/wp-admin/css/ie.css
index 4479d9fe92..16f08e05b5 100644
--- a/wp-admin/css/ie.css
+++ b/wp-admin/css/ie.css
@@ -55,6 +55,11 @@
 	position: relative;
 }
 
+#adminmenu,
+#adminmenu a {
+	cursor: pointer;
+}
+
 #adminmenu li.wp-menu-separator,
 #adminmenu li.wp-menu-separator-last {
 	font-size: 1px;
@@ -75,6 +80,14 @@
 	margin: 0;
 }
 
+.folded #adminmenu .wp-submenu {
+	border-top-color: transparent;
+}
+
+#adminmenu .wp-submenu .wp-submenu-head {
+	border-top-color: #ddd;
+}
+
 .folded #adminmenu .wp-submenu ul {
 	margin-left: 5px;
 }
@@ -87,15 +100,6 @@
 	display: none !important;
 }
 
-#adminmenu .wp-submenu li.wp-submenu-head {
-	padding: 6px 4px 7px 10px;
-	zoom: 100%;
-}
-
-.js.folded #adminmenu .menu-top {
-	height: 30px;
-}
-
 .js.folded #adminmenu li.menu-top {
 	display: block;
 	zoom: 100%;
diff --git a/wp-admin/css/wp-admin-rtl.css b/wp-admin/css/wp-admin-rtl.css
index 246fec0c2c..ef4494a423 100644
--- a/wp-admin/css/wp-admin-rtl.css
+++ b/wp-admin/css/wp-admin-rtl.css
@@ -419,12 +419,12 @@ form.upgrade .hint {
 	transform:         translate( -138px );
 }
 
-.folded .wp-menu-arrow {
-	-moz-transform:    translate( -27px );
-	-webkit-transform: translate( -27px );
-	-o-transform:      translate( -27px );
-	-ms-transform:     translate( -27px );
-	transform:         translate( -27px );
+.folded #adminmenu li .wp-menu-arrow {
+	-moz-transform:    translate( -26px );
+	-webkit-transform: translate( -26px );
+	-o-transform:      translate( -26px );
+	-ms-transform:     translate( -26px );
+	transform:         translate( -26px );
 }
 
 #adminmenu .wp-not-current-submenu .wp-menu-arrow div {
diff --git a/wp-admin/css/wp-admin.css b/wp-admin/css/wp-admin.css
index 5c0e2a4e30..1ca0eef8c3 100644
--- a/wp-admin/css/wp-admin.css
+++ b/wp-admin/css/wp-admin.css
@@ -1502,22 +1502,19 @@ form.upgrade .hint {
 	float: left;
 	width: 28px;
 	height: 28px;
-	margin-top: -1px;
 }
 
 .folded #adminmenu div.wp-menu-image {
 	width: 32px;
-	margin-top: 0;
 	position: absolute;
 	z-index: 25;
 }
 
 .folded #adminmenu a.menu-top {
-	height: 29px;
+	height: 28px;
 }
 
 .wp-menu-arrow {
-	display: none;
 	z-index: 25;
 	position: absolute;
 	right: 100%;
@@ -1533,6 +1530,7 @@ form.upgrade .hint {
 }
 
 #adminmenu .wp-menu-arrow div {
+	display: none;
 	position: absolute;
 	top: 7px;
 	left: -1px;
@@ -1558,19 +1556,23 @@ form.upgrade .hint {
 	top: 0;
 }
 
-.folded .wp-menu-arrow {
-	-moz-transform:    translate( 33px );
-	-webkit-transform: translate( 33px );
-	-o-transform:      translate( 33px );
-	-ms-transform:     translate( 33px );
-	transform:         translate( 33px );
+.folded #adminmenu li .wp-menu-arrow {
+	-moz-transform:    translate( 32px );
+	-webkit-transform: translate( 32px );
+	-o-transform:      translate( 32px );
+	-ms-transform:     translate( 32px );
+	transform:         translate( 32px );
 }
 
 #adminmenu li.current .wp-menu-arrow,
 #adminmenu li.wp-has-current-submenu .wp-menu-arrow,
+#adminmenu li.wp-has-current-submenu .wp-menu-arrow div,
+#adminmenu li.wp-has-submenu .wp-menu-arrow div,
+#adminmenu li.current .wp-menu-arrow div,
 .no-js #adminmenu li.wp-has-submenu:hover .wp-menu-arrow,
 #adminmenu li.wp-has-submenu.opensub .wp-menu-arrow,
-#adminmenu a.wp-has-submenu:focus .wp-menu-arrow {
+#adminmenu a.wp-has-submenu:focus .wp-menu-arrow,
+#adminmenu a:hover .wp-menu-arrow {
 	display: block;
 }
 
@@ -1597,15 +1599,17 @@ form.upgrade .hint {
 }
 
 .wp-menu-arrow,
-.folded #adminmenu li.wp-not-current-submenu .wp-menu-arrow,
+.folded #adminmenu li .wp-menu-arrow div,
 .no-js #adminmenu li.wp-not-current-submenu:hover .wp-menu-arrow {
 	display: none;
 }
 
 .folded #adminmenu li.current .wp-menu-arrow,
-.folded #adminmenu li.wp-menu-open .wp-menu-arrow {
+.folded #adminmenu li.current .wp-menu-arrow div,
+.folded #adminmenu li.wp-has-current-submenu .wp-menu-arrow div,
+.folded #adminmenu li.wp-menu-open .wp-menu-arrow,
+.folded #adminmenu li a:focus .wp-menu-arrow {
 	display: block;
-	top: 1px;
 }
 
 #adminmenu li.menu-top:hover .wp-menu-image img,
@@ -1631,7 +1635,7 @@ form.upgrade .hint {
 }
 
 #adminmenu .wp-submenu .wp-submenu-head {
-	padding: 6px 4px 5px 10px;
+	padding: 5px 4px 5px 10px;
 	margin: -4px -1px 4px;
 	border-width: 1px 0;
 	border-style: solid;