IE7 fixes for the admin menu, see #18382

git-svn-id: http://svn.automattic.com/wordpress/trunk@18958 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-admin/css/ie.dev.css

@@ -1,5 +1,4 @@
 /* Fixes for IE bugs */
-
 #wp-fullscreen-title {
 	width: 97%;
 }
@@ -13,8 +12,21 @@
 	font-size: 14px;
 }
 
+#adminmenushadow {
+	display: none;
+}
+
 #adminmenuback {
 	left: 0;
+	background-image: none;
+}
+
+#adminmenuwrap {
+	position: static;
+}
+
+#adminmenu {
+	position: relative;
 }
 
 #adminmenu li.wp-menu-separator,
@@ -33,6 +45,65 @@
 	line-height: 1px;
 }
 
+#adminmenu .wp-submenu ul {
+	margin: 0;
+}
+
+.folded #adminmenu .wp-submenu ul {
+	margin-left: 5px;
+}
+
+#adminmenu li.menu-top {
+	margin-bottom: -2px;
+}
+
+#adminmenu li.wp-not-current-submenu:hover .wp-menu-arrow {
+	display: none;
+}
+
+#wpcontent #adminmenu .wp-submenu li.wp-submenu-head {
+	padding: 3px 4px 4px 10px;
+	zoom: 100%;
+}
+
+.js.folded #adminmenu .menu-top {
+	height: 30px;
+}
+
+.js.folded #adminmenu .wp-submenu {
+	margin: -1px 0 0 0;
+}
+
+.js.folded #adminmenu li.menu-top {
+	display: block;
+	zoom: 100%;
+}
+
+ul#adminmenu {
+	z-index: 99;
+}
+
+#adminmenu li.menu-top a.menu-top {
+	min-width: auto;
+	width: auto;
+}
+
+#wpcontent #adminmenu li.wp-has-current-submenu a.wp-has-submenu {
+	font-style: normal;
+}
+
+#wpcontent #adminmenu .wp-submenu li {
+	padding: 0;
+}
+
+#collapse-menu {
+	line-height: 23px;
+}
+
+#wpadminbar .ab-comments-icon {
+	padding-top: 7px;
+}
+
 #wpbody-content input.button,
 #wpbody-content input.button-primary,
 #wpbody-content input.button-secondary,
@@ -69,88 +140,6 @@
 	margin-bottom: -1px;
 }
 
-* html .meta-box-sortables .postbox .handlediv {
-	background: transparent url(../images/menu-bits-vs.gif) no-repeat scroll left -111px;
-}
-
-* html .edit-box {
-	display: inline;
-}
-
-* html .inner-sidebar #side-sortables,
-* html .postbox-container .meta-box-sortables {
-	height: 300px;
-}
-
-* html #wpbody-content #screen-options-link-wrap {
-	display: inline-block;
-	width: 150px;
-	text-align: center;
-}
-
-* html #wpbody-content #contextual-help-link-wrap {
-	display: inline-block;
-	width: 100px;
-	text-align: center;
-}
-
-* html #adminmenu {
-	margin-left: -80px;
-}
-
-* html .folded #adminmenu {
-	margin-left: -22px;
-}
-
-* html #wpcontent #adminmenu li.menu-top {
-	display: inline;
-	padding: 0;
-	margin: 0;
-}
-
-* html #footer {
-	margin: 0;
-}
-
-.js.folded #adminmenu li.menu-top {
-	display: block;
-	zoom: 100%;
-}
-
-ul#adminmenu {
-	z-index: 99;
-}
-
-#adminmenu li.menu-top a.menu-top {
-	min-width: auto;
-	width: auto;
-}
-
-#wpcontent #adminmenu li.wp-has-current-submenu a.wp-has-submenu {
-	font-style: normal;
-}
-
-* html #wpcontent #adminmenu .wp-menu-open .wp-menu-toggle {
-	background: none;
-}
-
-* html #wpcontent #adminmenu .wp-has-submenu .wp-menu-toggle {
-	background: url(../images/menu-bits.gif?ver=20100610) no-repeat scroll left -109px;
-}
-
-* html #wpcontent #adminmenu li.wp-has-current-submenu .wp-menu-toggle {
-	background: url(../images/menu-bits.gif?ver=20100610) no-repeat scroll left -206px;
-}
-
-* html #adminmenu div.wp-menu-image {
-	height: 29px;
-}
-
-#wpcontent #adminmenu .wp-submenu li {
-	padding: 0;
-}
-
-#adminmenu,
 .major-publishing-actions,
 .wp-submenu,
 .wp-submenu li,
@@ -158,24 +147,10 @@ ul#adminmenu {
 #template,
 #template div,
 #editcat,
-#addcat,
+#addcat {
-* html .stuffbox h3  {
 	zoom: 100%;
 }
 
-#wpcontent #adminmenu .wp-submenu li.wp-submenu-head {
-	padding: 3px 4px 4px 10px;
-	zoom: 100%;
-}
-
-.js.folded #adminmenu .menu-top {
-	height: 30px;
-}
-
-.js.folded #adminmenu .wp-submenu {
-	margin: -1px 0 0 0;
-}
-
 .wp-menu-arrow {
 	height: 28px;
 }
@@ -229,10 +204,6 @@ ul#adminmenu {
 }
 /* end Inline Editor */
 
-* html .row-actions {
-	visibility: visible;
-}
-
 #titlediv #title {
 	width: 98%;
 }
@@ -243,12 +214,6 @@ a.button {
 	padding: 2px 6px;
 }
 
-* html div.widget-liquid-left,
-* html div.widget-liquid-right {
-	display: block;
-	position: relative;
-}
-
 #screen-options-wrap {
 	overflow: hidden;
 }
@@ -266,7 +231,6 @@ a.button {
 #the-comment-list .comment-item,
 #post-status-info,
 #wpwrap,
-#wpcontent,
 #wrap,
 #postdivrich,
 #postdiv,
@@ -299,9 +263,6 @@ p.search-box {
 	margin: -3px 0 4px;
 }
 
-* html #editorcontainer {
-	padding: 0;
-}
 
 #editorcontainer #content {
 	overflow: auto;
@@ -323,10 +284,6 @@ form#template div {
 	font-size: 1.6em;
 }
 
-* html #poststuff h2 {
-	margin-left: 0;
-}
-
 #bh {
 	margin: 7px 10px 0 0;
 	float: right;
@@ -394,6 +351,84 @@ table.ie-fixed {
 	padding: 2px 5px;
 }
 
+.inactive-sidebar .widgets-sortables {
+	padding-bottom: 8px;
+}
+
+#available-widgets .widget-holder {
+	padding-bottom: 65px;
+}
+
+#widgets-left .inactive {
+	padding-bottom: 10px;
+}
+
+.widget-liquid-right .widget,
+.inactive-sidebar .widget {
+	position: relative;
+}
+
+
+
+#wpcontent .button-primary-disabled {
+	color: #9FD0D5;
+	background: #298CBA;
+}
+
+#wpcontent #ajax-loading,
+#wpcontent .ajax-loading {
+	vertical-align: baseline;
+}
+
+#the-comment-list .unapproved tr,
+#the-comment-list .unapproved td {
+	background-color: #ffffe0;
+}
+
+.imgedit-submit {
+	width: 300px;
+}
+
+
+#nav-menu-header,
+#nav-menus-frame,
+#wpbody,
+.menu li {
+	zoom: 100%;
+}
+
+#update-nav-menu #post-body {
+	overflow:hidden;
+}
+
+.menu li {
+	min-width: 100%;
+}
+
+.menu li.sortable-placeholder {
+	min-width: 400px;
+}
+
+
+/* IE6 leftovers */
+* html .row-actions {
+	visibility: visible;
+}
+
+* html div.widget-liquid-left,
+* html div.widget-liquid-right {
+	display: block;
+	position: relative;
+}
+
+* html #editorcontainer {
+	padding: 0;
+}
+
+* html #poststuff h2 {
+	margin-left: 0;
+}
+
 * html .stuffbox,
 * html .stuffbox input,
 * html .stuffbox textarea {
@@ -412,10 +447,6 @@ table.ie-fixed {
 	width: 99%;
 }
 
-.inactive-sidebar .widgets-sortables {
-	padding-bottom: 8px;
-}
-
 * html .widgets-sortables {
 	height: 50px;
 }
@@ -432,67 +463,76 @@ table.ie-fixed {
 	display: none;
 }
 
-#available-widgets .widget-holder {
-	padding-bottom: 65px;
-}
-
-#widgets-left .inactive {
-	padding-bottom: 10px;
-}
-
-.widget-liquid-right .widget,
-.inactive-sidebar .widget {
-	position: relative;
-}
-
 * html .media-item .pinkynail {
 	height: 32px;
 	width: 40px;
 }
 
-#wpcontent .button-primary-disabled {
-	color: #9FD0D5;
-	background: #298CBA;
-}
-
-#wpcontent #ajax-loading,
-#wpcontent .ajax-loading {
-	vertical-align: baseline;
-}
-
 * html .describe .field input.text,
 * html .describe .field textarea {
 	width: 440px;
 }
 
-#the-comment-list .unapproved tr,
-#the-comment-list .unapproved td {
-	background-color: #ffffe0;
-}
-
-.imgedit-submit {
-	width: 300px;
-}
-
 * html input {
 	border: 1px solid #dfdfdf;
 }
 
-#nav-menu-header,
+* html .meta-box-sortables .postbox .handlediv {
-#nav-menus-frame,
+	background: transparent url(../images/menu-bits-vs.gif) no-repeat scroll left -111px;
-#wpbody,
-.menu li {
-	zoom:100%;
 }
 
-#update-nav-menu #post-body {
+* html .edit-box {
-	overflow:hidden;
+	display: inline;
 }
 
-.menu li {
+* html .inner-sidebar #side-sortables,
-	min-width:100%;
+* html .postbox-container .meta-box-sortables {
+	height: 300px;
 }
 
-.menu li.sortable-placeholder {
+* html #wpbody-content #screen-options-link-wrap {
-	min-width:400px;
+	display: inline-block;
+	width: 150px;
+	text-align: center;
 }
+
+* html #wpbody-content #contextual-help-link-wrap {
+	display: inline-block;
+	width: 100px;
+	text-align: center;
+}
+
+* html #adminmenu {
+	margin-left: -80px;
+}
+
+* html .folded #adminmenu {
+	margin-left: -22px;
+}
+
+* html #wpcontent #adminmenu li.menu-top {
+	display: inline;
+	padding: 0;
+	margin: 0;
+}
+
+* html #footer {
+	margin: 0;
+}
+
+* html #wpcontent #adminmenu .wp-menu-open .wp-menu-toggle {
+	background: none;
+}
+
+* html #wpcontent #adminmenu .wp-has-submenu .wp-menu-toggle {
+	background: url(../images/menu-bits.gif?ver=20100610) no-repeat scroll left -109px;
+}
+
+* html #wpcontent #adminmenu li.wp-has-current-submenu .wp-menu-toggle {
+	background: url(../images/menu-bits.gif?ver=20100610) no-repeat scroll left -206px;
+}
+
+* html #adminmenu div.wp-menu-image {
+	height: 29px;
+}
+

wp-admin/css/wp-admin.dev.css

@@ -88,10 +88,6 @@ TABLE OF CONTENTS:
 	z-index: -1;
 }
 
-#adminmenuwrap {
-	float: left;
-}
-
 #adminmenu {
 	clear: left;
 	margin: 0;
@@ -1617,6 +1613,7 @@ form.upgrade .hint {
 }
 #adminmenuwrap {
 	position: relative;
+	float: left;
 }
 
 #adminmenushadow {

wp-includes/script-loader.php

@@ -433,7 +433,7 @@ function wp_default_styles( &$styles ) {
 
 	$styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20111012' );
 
-	$styles->add( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20111010' );
+	$styles->add( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20111012' );
 	$styles->add_data( 'ie', 'conditional', 'lte IE 7' );
 
 	// all colors stylesheets need to have the same query strings (cache manifest compat)