From e157d406241deeaf26bfd92ce7652d311dab3e92 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Fri, 21 Nov 2008 06:26:23 +0000
Subject: [PATCH] Fix base css blocks for easier horizontal scrolling, fixes
 #8092

git-svn-id: https://develop.svn.wordpress.org/trunk@9827 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/css/colors-classic.css |  9 ++----
 wp-admin/css/colors-fresh.css   |  4 +--
 wp-admin/css/global.css         | 29 +++++++++++++------
 wp-admin/css/ie.css             | 50 +++++++++------------------------
 wp-admin/js/common.js           |  6 ++--
 wp-admin/wp-admin.css           | 47 ++++++++++++-------------------
 wp-includes/script-loader.php   |  2 +-
 7 files changed, 60 insertions(+), 87 deletions(-)

diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css
index dd3b02eb28..6080dc83a2 100644
--- a/wp-admin/css/colors-classic.css
+++ b/wp-admin/css/colors-classic.css
@@ -304,11 +304,6 @@ td.help {
 	background: #f2f2f2 url(../images/white-grad.png) repeat-x scroll left top;
 }
 
-#wpcontent select {
-	background: url(../images/white-grad.png) repeat-x scroll left top;
-	color: #555;
-}
-
 .button-secondary,
 .submit .button-secondary {
 	border-color: #CFE1EF;
@@ -1046,7 +1041,7 @@ abbr.required,
 	background: transparent url(../images/menu-arrows.gif) no-repeat scroll left 5px;
 }
 
-#adminmenu.folded li.wp-menu-separator {
+.folded #adminmenu li.wp-menu-separator {
 	background: transparent url(../images/menu-arrows.gif) no-repeat scroll right -34px;
 }
 
@@ -1121,7 +1116,7 @@ abbr.required,
 	background-color: #fff;
 }
 
-#adminmenu.folded li.menu-top,
+.folded #adminmenu li.menu-top,
 #adminmenu .wp-submenu .wp-submenu-head {
 	background-color: #F1F1F1;
 }
diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css
index 2982a03302..6080dc83a2 100644
--- a/wp-admin/css/colors-fresh.css
+++ b/wp-admin/css/colors-fresh.css
@@ -1041,7 +1041,7 @@ abbr.required,
 	background: transparent url(../images/menu-arrows.gif) no-repeat scroll left 5px;
 }
 
-#adminmenu.folded li.wp-menu-separator {
+.folded #adminmenu li.wp-menu-separator {
 	background: transparent url(../images/menu-arrows.gif) no-repeat scroll right -34px;
 }
 
@@ -1116,7 +1116,7 @@ abbr.required,
 	background-color: #fff;
 }
 
-#adminmenu.folded li.menu-top,
+.folded #adminmenu li.menu-top,
 #adminmenu .wp-submenu .wp-submenu-head {
 	background-color: #F1F1F1;
 }
diff --git a/wp-admin/css/global.css b/wp-admin/css/global.css
index c75ab41ab7..950575affe 100644
--- a/wp-admin/css/global.css
+++ b/wp-admin/css/global.css
@@ -69,17 +69,31 @@ table {
 	padding-bottom: 50px;
 }
 
+#wpbody {
+	clear: both;
+	margin-left: 175px;
+} 
+
+div.folded #wpbody {
+	margin-left: 60px;
+}
+
 #wpbody-content {
-	overflow: hidden;
+	float: left;
+	width: 100%;
 }
 
 #adminmenu {
 	float: left;
 	clear: left;
-	margin: 15px 5px 15px 18px;
+	margin: 15px 5px 15px -160px;
 	position: relative;
 }
 
+div.folded #adminmenu {
+	margin-left: -45px;
+}
+
 #footer {
 	clear: both;
 	position: relative;
@@ -347,11 +361,8 @@ h6 {
 	vertical-align: middle;
 }
 
-.wrap,
-.updated,
-.error {
-	margin: 0 15px;
-	padding: 0;
+.wrap {
+	margin: 0 15px 0 5px;
 }
 
 .updated,
@@ -359,7 +370,7 @@ h6 {
 	border-width: 1px;
 	border-style: solid;
 	padding: 0 0.6em;
-	margin: 3px 15px 5px;
+	margin: 5px 15px 2px;
 	-moz-border-radius: 3px;
 	-khtml-border-radius: 3px;
 	-webkit-border-radius: 3px;
@@ -379,7 +390,7 @@ h6 {
 .wrap h2 {
 	font: italic normal normal 24px/29px Georgia, "Times New Roman", Times, serif;
 	margin: 0;
-	padding: 14px 15px 1px 0;
+	padding: 12px 15px 1px 0;
 }
 
 .wrap h2.long-header {
diff --git a/wp-admin/css/ie.css b/wp-admin/css/ie.css
index f0fb783778..9a96c10fa7 100644
--- a/wp-admin/css/ie.css
+++ b/wp-admin/css/ie.css
@@ -1,29 +1,4 @@
 /* Fixes for IE bugs */
-
-* html #wpbody-content {
-	float: right;
-}
-
-* html #wpbody {
-	width: 100%;
-}
-
-* html body {
-	background-color: #464646;
-}
-
-* html #wpwrap {
-	background-color: #fff;
-}
-
-#footer {
-	overflow: hidden;
-}
-
-* html #footer {
-	width: 100%;
-}
-
 input.button,
 input.button-secondary,
 input.button-highlighted {
@@ -75,18 +50,13 @@ input.button-highlighted {
 	_width: expression(document.documentElement.clientWidth > 982 ? "980px" : "99.9%");
 }
 */
-ul#adminmenu {
-	z-index: 99;
-}
 
 * html #adminmenu {
-	width: 145px;
-	margin: 12px;
-	padding: 0;
+	margin-left: -80px;
 }
 
-#wpcontent #adminmenu.folded li.menu-top {
-	display: block;
+* html div.folded #adminmenu {
+	margin-left: -22px;
 }
 
 * html #wpcontent #adminmenu li.menu-top {
@@ -95,6 +65,14 @@ ul#adminmenu {
 	margin: 0;
 }
 
+#wpcontent.folded #adminmenu li.menu-top {
+	display: block;
+}
+
+ul#adminmenu {
+	z-index: 99;
+}
+
 #adminmenu li.menu-top a.menu-top {
 	min-width: auto;
 	width: auto;
@@ -131,7 +109,7 @@ ul#adminmenu {
 	zoom: 100%;
 }
 
-#wpcontent #adminmenu.folded li.wp-menu-separator {
+#wpcontent.folded #adminmenu li.wp-menu-separator {
 	width: 28px;
 }
 
@@ -140,11 +118,11 @@ ul#adminmenu {
 	zoom: 100%;
 }
 
-#wpcontent #adminmenu.folded .menu-top {
+#wpcontent.folded #adminmenu .menu-top {
 	height: 30px;
 }
 
-#adminmenu.folded .wp-submenu {
+.folded #adminmenu .wp-submenu {
 	margin: -1px 0 0 0;
 }
 
diff --git a/wp-admin/js/common.js b/wp-admin/js/common.js
index c601a173a6..10ed2f2601 100644
--- a/wp-admin/js/common.js
+++ b/wp-admin/js/common.js
@@ -245,7 +245,7 @@ adminMenu = {
 		this.favorites();
 
 		$('.wp-menu-separator').click(function(){
-			if ( $('#adminmenu').hasClass('folded') ) {
+			if ( $('#wpcontent').hasClass('folded') ) {
 				adminMenu.fold(1);
 				setUserSetting( 'mfold', 'o' );
 			} else {
@@ -285,10 +285,10 @@ adminMenu = {
 	
 	fold : function(off) {
 		if (off) {
-			$('#adminmenu').removeClass('folded');
+			$('#wpcontent').removeClass('folded');
 			$('#adminmenu li.wp-has-submenu').unbind();
 		} else {
-			$('#adminmenu').addClass('folded');
+			$('#wpcontent').addClass('folded');
 			$('#adminmenu li.wp-has-submenu').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/wp-admin.css b/wp-admin/wp-admin.css
index d755ee8ca1..af8e9957c4 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -1,6 +1,3 @@
-#wpbody {
-	clear: both;
-}
 
 p, ul, ol, blockquote { font-size: 12px; }
 
@@ -929,8 +926,8 @@ a#view-site-link {
 	font: normal 13px/18px Georgia, "Times New Roman", Times, serif;
 }
 
-#adminmenu.folded,
-#adminmenu.folded li.menu-top {
+.folded #adminmenu,
+.folded #adminmenu li.menu-top {
 	width: 28px;
 }
 
@@ -938,15 +935,15 @@ a#view-site-link {
 	display: none;
 }
 
-#adminmenu.folded div.wp-submenu-head,
-#adminmenu.folded li.wp-has-submenu div.sub-open {
+.folded #adminmenu div.wp-submenu-head,
+.folded #adminmenu li.wp-has-submenu div.sub-open {
 	display: block;
 }
 
-#adminmenu.folded a.menu-top,
-#adminmenu.folded .wp-submenu,
-#adminmenu.folded li.wp-menu-open .wp-submenu,
-#adminmenu.folded div.wp-menu-toggle {
+.folded #adminmenu a.menu-top,
+.folded #adminmenu .wp-submenu,
+.folded #adminmenu li.wp-menu-open .wp-submenu,
+.folded #adminmenu div.wp-menu-toggle {
 	display: none;
 }
 
@@ -1000,7 +997,7 @@ a#view-site-link {
 	margin: 0;
 }
 
-#adminmenu.folded li.menu-top {
+.folded #adminmenu li.menu-top {
 	width: 28px;
 	height: 30px;
 	overflow: hidden;
@@ -1009,7 +1006,7 @@ a#view-site-link {
 }
 
 #adminmenu .menu-top-first a.menu-top,
-#adminmenu.folded li.menu-top-first,
+.folded #adminmenu li.menu-top-first,
 #adminmenu .wp-submenu .wp-submenu-head {
 	border-width: 1px 1px 0;
 	border-style: solid solid none;
@@ -1024,7 +1021,7 @@ a#view-site-link {
 }
 
 #adminmenu .menu-top-last a.menu-top,
-#adminmenu.folded li.menu-top-last {
+.folded #adminmenu li.menu-top-last {
 	border-width: 1px;
 	border-style: solid;
 	-moz-border-radius-bottomleft: 6px;
@@ -1054,7 +1051,7 @@ a#view-site-link {
 	padding: 8px 6px 0;
 }
 
-#adminmenu.folded img.wp-menu-image {
+.folded #adminmenu img.wp-menu-image {
 	padding: 7px 0 0 6px;
 }
 
@@ -1076,7 +1073,7 @@ a#view-site-link {
 	cursor: default;
 }
 
-#adminmenu.folded .wp-submenu {
+.folded #adminmenu .wp-submenu {
 	position: absolute;
 	margin: -1px 0 0 28px;
 	padding: 0 8px 8px;
@@ -1084,21 +1081,21 @@ a#view-site-link {
 	border: 0 none;
 }
 
-#adminmenu.folded .wp-submenu ul {
+.folded #adminmenu .wp-submenu ul {
 	width: 140px;
 	border-width: 0 0 1px;
 	border-style: none none solid;
 }
 
-#adminmenu.folded .wp-submenu li.wp-first-item {
+.folded #adminmenu .wp-submenu li.wp-first-item {
 	border-top: 0 none;
 }
 
-#adminmenu.folded .wp-submenu a {
+.folded #adminmenu .wp-submenu a {
 	padding-left: 10px;
 }
 
-#adminmenu.folded a.wp-has-submenu {
+.folded #adminmenu a.wp-has-submenu {
 	margin-left: 40px;
 }
 
@@ -1412,12 +1409,7 @@ table.form-table td .updated {
 	margin: 2px 0 12px;
 }
 
-#col-left .col-wrap {
-	margin-left: 12px;
-}
-
 /* Post Screen */
-
 #normal-sortables {
 	min-height: 50px;
 }
@@ -2513,7 +2505,7 @@ fieldset {
 	font-family: "Lucida Grande", Verdana, Arial, sans-serif;
 	height: 23px;
 	padding: 0;
-	margin: -1px 6px 0 0;
+	margin: 0 6px 0 0;
 }
 
 #screen-meta a.show-settings {
@@ -2527,9 +2519,6 @@ fieldset {
 	background-repeat: no-repeat;
 	background-position: right bottom;
 	background-color: transparent;
-	border-top-color: #dfdfdf;
-	border-top-width: 1px;
-	border-top-style: solid;
 	text-shadow: rgba(255,255,255,0.7) 0 1px 0;
 }
 
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index f651801958..27a0b588b8 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -41,7 +41,7 @@ function wp_default_scripts( &$scripts ) {
 	$scripts->base_url = $guessurl;
 	$scripts->default_version = get_bloginfo( 'version' );
 
-	$scripts->add( 'common', '/wp-admin/js/common.js', array('jquery', 'hoverIntent'), '20081120' );
+	$scripts->add( 'common', '/wp-admin/js/common.js', array('jquery', 'hoverIntent'), '20081120b' );
 	$scripts->add( 'sack', '/wp-includes/js/tw-sack.js', false, '1.6.1' );
 
 	$scripts->add( 'quicktags', '/wp-includes/js/quicktags.js', false, '20081103' );