From c2a28243f6cb875b5efaa13edcb655e052488b44 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Sat, 10 Nov 2012 19:41:12 +0000
Subject: [PATCH] Admin menu: sync the .folded and @media .auto-fold styles,
 fixes #21998

git-svn-id: https://develop.svn.wordpress.org/trunk@22536 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/css/wp-admin-rtl.css |  9 +++++++--
 wp-admin/css/wp-admin.css     | 24 +++++++++++++-----------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/wp-admin/css/wp-admin-rtl.css b/wp-admin/css/wp-admin-rtl.css
index f76cc5fa37..ebbc0d66d3 100644
--- a/wp-admin/css/wp-admin-rtl.css
+++ b/wp-admin/css/wp-admin-rtl.css
@@ -432,7 +432,7 @@ form.upgrade .hint {
 }
 
 #adminmenu .wp-submenu .wp-submenu-head {
-	padding: 6px 10px 5px 4px;
+	padding: 5px 10px 5px 4px;
 	-webkit-border-top-right-radius: 0;
 	-webkit-border-top-left-radius: 3px;
 	border-top-right-radius: 0;
@@ -475,6 +475,11 @@ form.upgrade .hint {
 		margin-left: 15px;
 		margin-right: 52px;
 	}
+	
+	.auto-fold #adminmenu div.wp-menu-image {
+		float: right;
+		width: 30px;
+	}
 
 	.auto-fold #adminmenu .wp-submenu.sub-open,
 	.auto-fold #adminmenu .opensub .wp-submenu,
@@ -492,7 +497,7 @@ form.upgrade .hint {
 		padding-right: 12px;
 	}
 
-	.auto-fold .wp-menu-arrow {
+	.auto-fold #adminmenu li .wp-menu-arrow {
 		-moz-transform:    translate( -27px );
 		-webkit-transform: translate( -27px );
 		-o-transform:      translate( -27px );
diff --git a/wp-admin/css/wp-admin.css b/wp-admin/css/wp-admin.css
index 00c3c08c21..2809e70ba5 100644
--- a/wp-admin/css/wp-admin.css
+++ b/wp-admin/css/wp-admin.css
@@ -1774,31 +1774,32 @@ form.upgrade .hint {
 
 	.auto-fold #adminmenu div.wp-menu-image {
 		width: 32px;
-		margin-top: 0;
 		position: absolute;
 		z-index: 25;
 	}
 
 	.auto-fold #adminmenu a.menu-top {
-		height: 29px;
+		height: 28px;
 	}
 
-	.auto-fold .wp-menu-arrow {
-		-moz-transform:    translate( 33px );
-		-webkit-transform: translate( 33px );
-		-o-transform:      translate( 33px );
-		-ms-transform:     translate( 33px );
-		transform:         translate( 33px );
+	.auto-fold #adminmenu li .wp-menu-arrow {
+		-moz-transform:    translate( 32px );
+		-webkit-transform: translate( 32px );
+		-o-transform:      translate( 32px );
+		-ms-transform:     translate( 32px );
+		transform:         translate( 32px );
 	}
 
-	.auto-fold #adminmenu li.wp-not-current-submenu .wp-menu-arrow {
+	.auto-fold #adminmenu li .wp-menu-arrow div {
 		display: none;
 	}
 
 	.auto-fold #adminmenu li.current .wp-menu-arrow,
-	.auto-fold #adminmenu li.wp-menu-open .wp-menu-arrow {
+	.auto-fold #adminmenu li.current .wp-menu-arrow div,
+	.auto-fold #adminmenu li.wp-has-current-submenu .wp-menu-arrow div,
+	.auto-fold #adminmenu li.wp-menu-open .wp-menu-arrow,
+	.auto-fold #adminmenu li a:focus .wp-menu-arrow {
 		display: block;
-		top: 1px;
 	}
 
 	.auto-fold #adminmenu li.wp-menu-open {
@@ -1816,6 +1817,7 @@ form.upgrade .hint {
 	.auto-fold #collapse-menu span {
 		display: none;
 	}
+
 }
 
 /* List table styles */