From 5a41c8a06c54a19923bf08f2e02346115064be71 Mon Sep 17 00:00:00 2001
From: Helen Hou-Sandi <helen@git.wordpress.org>
Date: Sat, 29 Mar 2014 02:46:04 +0000
Subject: [PATCH] Correct cascade issues and remove some unused CSS for the
 admin menu. see #18380.

git-svn-id: https://develop.svn.wordpress.org/trunk@27832 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/css/admin-menu.css | 43 ++++++++++++++-------------------
 1 file changed, 18 insertions(+), 25 deletions(-)

diff --git a/src/wp-admin/css/admin-menu.css b/src/wp-admin/css/admin-menu.css
index e77f58df9a..08638af265 100644
--- a/src/wp-admin/css/admin-menu.css
+++ b/src/wp-admin/css/admin-menu.css
@@ -164,6 +164,10 @@
 	color: #eee;
 }
 
+#adminmenu .wp-submenu a {
+	color: #bbb;
+}
+
 #adminmenu a:hover,
 #adminmenu li.menu-top > a:focus,
 #adminmenu .wp-submenu a:hover,
@@ -196,17 +200,6 @@
 	box-shadow: 0 3px 5px rgba(0,0,0,0.2);
 }
 
-#adminmenu .wp-submenu a,
-.folded #adminmenu a.wp-has-current-submenu:focus + .wp-submenu a,
-.folded #adminmenu .wp-has-current-submenu .wp-submenu a {
-	color: #bbb;
-}
-
-#adminmenu .wp-submenu a:hover,
-#adminmenu .wp-submenu a:focus {
-	background: none;
-}
-
 .js #adminmenu .sub-open,
 .js #adminmenu .opensub .wp-submenu,
 #adminmenu a.menu-top:focus + .wp-submenu,
@@ -232,6 +225,20 @@
 	background-color: #333;
 }
 
+/* ensure that wp-submenu's box shadow doesn't appear on top of the focused menu item's background. */
+#adminmenu li.menu-top:hover,
+#adminmenu li.opensub > a.menu-top,
+#adminmenu li > a.menu-top:focus {
+	position: relative;
+	background-color: #111;
+}
+
+.folded #adminmenu li.menu-top:hover,
+.folded #adminmenu li.opensub > a.menu-top,
+.folded #adminmenu li > a.menu-top:focus {
+	z-index: 10000;
+}
+
 #adminmenu li.wp-has-current-submenu a.wp-has-current-submenu,
 #adminmenu li.current a.menu-top,
 .folded #adminmenu li.wp-has-current-submenu,
@@ -455,20 +462,6 @@ ul#adminmenu > li.current > a.current:after {
 	border-right-color: #333;
 }
 
-/* ensure that wp-submenu's box shadow doesn't appear on top of the focused menu item's background. */
-#adminmenu li.menu-top:hover,
-#adminmenu li.opensub > a.menu-top,
-#adminmenu li > a.menu-top:focus {
-	position: relative;
-	background-color: #111;
-}
-
-.folded #adminmenu li.menu-top:hover,
-.folded #adminmenu li.opensub > a.menu-top,
-.folded #adminmenu li > a.menu-top:focus {
-	z-index: 10000;
-}
-
 #adminmenu li.menu-top:hover .wp-menu-image img,
 #adminmenu li.wp-has-current-submenu .wp-menu-image img {
 	opacity: 1;