From e86dfe684fee8c16d4f9e725f0fb68329abc1495 Mon Sep 17 00:00:00 2001
From: azaozz <azaozz@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 30 Oct 2008 23:43:08 +0000
Subject: [PATCH] Some dashboard and IE layout fixes

git-svn-id: http://svn.automattic.com/wordpress/trunk@9422 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/css/ie.css    | 99 +++++++++++++-----------------------------
 wp-admin/js/menu.js    |  4 --
 wp-admin/js/postbox.js |  8 ++--
 3 files changed, 36 insertions(+), 75 deletions(-)

diff --git a/wp-admin/css/ie.css b/wp-admin/css/ie.css
index 3d6bd6332c..32e0168855 100644
--- a/wp-admin/css/ie.css
+++ b/wp-admin/css/ie.css
@@ -1,13 +1,10 @@
 /* Fixes for IE bugs */
 
 * html #wpbody-content {
-	margin-left: 160px;
+	float: right;
 }
 
 * html #wpbody {
-	clear: right;
-	float: right;
-	margin-left: -185px;
 	width: 100%;
 }
 
@@ -27,19 +24,12 @@
 	width: 100%;
 }
 
-.metabox-holder .postbox h3 {
-	padding-left: 23px;
-}
-
-input.button, input.button-secondary, input.button-highlighted {
+input.button,
+input.button-secondary,
+input.button-highlighted {
 	padding: 0;
 }
 
-#side-info-column {
-	position: absolute;
-	right: 15px;
-}
-
 #wphead-info {
 	float: right;
 }
@@ -54,68 +44,44 @@ input.button, input.button-secondary, input.button-highlighted {
 }
 */
 
-#adminmenu {
+* html #adminmenu {
 	z-index: 1;
 	width: 125px;
-	float: none;
-	background-color: f1f1f1;
+	margin: 12px;
+	padding: 0;
 }
 
-#adminmenu li.wp-has-submenu {
+* html #wpcontent #adminmenu.folded {
+	width: 28px;
+}
+
+ul#adminmenu li.wp-has-submenu {
 	padding: 0;
 	margin: 0;
 }
 
-#adminmenu a.wp-has-submenu {
-display: block;
-}
-
-#adminmenu,
-#adminmenu .wp-menu-toggle,
-ul.wp-submenu,
-ul.wp-submenu li,
-ul.wp-submenu a,
-#adminmenu a.wp-has-submenu,
-#adminmenu .wp-menu-image  {
-	
-	zoom: 100%;
-}
-
-#adminmenu.folded .wp-submenu {
-	margin: -1px 0 0 4px;
-}
-
-#adminmenu.folded li.wp-has-submenu {
-	height: 24px;
-}
-
-#wpcontent #adminmenu ul.wp-submenu a {
-	padding: 2px 4px 2px 10px;
-	margin: 0;
-	line-height: 18px;
-}
-
-* html #wpcontent #adminmenu {
-	margin: 8px 9px;
-}
-
 #wpcontent #adminmenu ul.wp-submenu li {
 	padding: 0;
 }
+#adminmenu,
+#adminmenu .wp-menu-toggle,
+ul.wp-submenu li,
+ul.wp-submenu {
+	zoom: 100%;
+}
 
-#wpcontent #adminmenu .wp-submenu li.wp-submenu-head {
+#wpcontent #adminmenu.folded li.wp-menu-separator {
+	width: 28px;
+}
+
+#wpcontent #adminmenu ul.wp-submenu li.wp-submenu-head {
 	padding: 3px 4px 4px 10px;
+	zoom: 100%;
 }
 
-/*
-ul#adminmenu li.wp-menu-separator {
-	background-color: #fff;
-	height: 3px;
-	line-height: 3px;
-	font-size: 3px;
+#adminmenu.folded ul.wp-submenu {
+	margin: -1px 0 0 13px;
 }
-*/
-
 
 #template,
 #template div,
@@ -124,12 +90,6 @@ ul#adminmenu li.wp-menu-separator {
 	zoom: 100%;
 }
 
-
-* html #poststuff .postarea,
-* html #poststuff #titlediv {
-	
-}
-
 .submitbox {
 	margin-top: 10px;
 }
@@ -142,7 +102,8 @@ ul#adminmenu li.wp-menu-separator {
 
 #wpwrap,
 #wpcontent,
-#post, #wrap,
+#post,
+#wrap,
 #postdivrich,
 #postdiv,
 #poststuff,
@@ -165,7 +126,9 @@ li.widget-list-control-item h4,
 	zoom: 100%;
 }
 
-#favorite-inside, #favorite-inside a, .favorite-action {
+#favorite-inside,
+#favorite-inside a,
+.favorite-action {
 	z-index: 11;
 	zoom: 100%;
 }
diff --git a/wp-admin/js/menu.js b/wp-admin/js/menu.js
index afd43561f2..a7daebe30e 100644
--- a/wp-admin/js/menu.js
+++ b/wp-admin/js/menu.js
@@ -50,8 +50,6 @@ adminMenu = {
 	
 	fold : function(off) {
 		if (off) {
-			if ( $.browser.msie && $.browser.version.charAt(0) == 6 )
-				$('#wpbody-content').css('marginLeft', '180px');
 			$('#adminmenu').removeClass('folded');
 			$('#adminmenu li.wp-submenu-head').hide();
 			$('#adminmenu a.wp-has-submenu, #adminmenu .wp-menu-open .wp-submenu, #adminmenu div.wp-menu-toggle').show();
@@ -61,8 +59,6 @@ adminMenu = {
 			$('#adminmenu').addClass('folded');
 			$('#adminmenu a.wp-has-submenu, #adminmenu .wp-submenu, #adminmenu div.wp-menu-toggle').hide();
 			$('#adminmenu li.wp-submenu-head').show();
-			if ( $.browser.msie && $.browser.version.charAt(0) == 6 )
-				$('#wpbody-content').css('marginLeft', '60px');
 			$('#adminmenu li.wp-has-submenu').css({'width':'28px'}).hoverIntent({
 				over: function(e){
 					var m = $(this).find('.wp-submenu'), t = e.clientY, H = $(window).height(), h = m.height(), o;
diff --git a/wp-admin/js/postbox.js b/wp-admin/js/postbox.js
index fb30b45134..13be22692f 100644
--- a/wp-admin/js/postbox.js
+++ b/wp-admin/js/postbox.js
@@ -31,11 +31,13 @@
 
 		expandSidebar : function(doIt) {
 			if ( doIt || $('#side-sortables > .postbox:visible').length ) {
-				$('#post-body').addClass('has-sidebar');
-				$('#side-sortables').height( $('#post-body').height() );
+				if ( ! $('#post-body').hasClass('has-sidebar') ) {
+					$('#post-body').addClass('has-sidebar');
+					$('#side-sortables').css({'minHeight':$('#post-body').height()+'px'});
+				}
 			} else {
 				$('#post-body').removeClass('has-sidebar');
-				$('#side-sortables').height('0')
+				$('#side-sortables').css({'minHeight':'0'});
 			}
 		},