Merge with branches/2.5 in WordPress, revision 8066

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1324 7be80a69-a1ef-0310-a953-fb0f7c49ff36

3 files changed, 34 insertions, 23 deletions

diff --git a/wp-admin/css/media.css b/wp-admin/css/media.css
index c77a069..7d46c1c 100644
--- a/wp-admin/css/media.css
+++ b/wp-admin/css/media.css
@@ -196,6 +196,11 @@ abbr.required {
 #media-upload .media-upload-form p {
 	margin: 0 1em 1em 0;
 }
+
+#media-upload .media-upload-form p.ml-submit {
+	padding: 1em 0;
+}
+
 #media-upload p.help {
 	font-style: italic;
 	font-weight: normal;
@@ -240,3 +245,18 @@ abbr.required {
 	margin-bottom: 1em;
 	height: 3em;
 }
+
+#media-upload #filter {
+	width: 623px;
+}
+
+#media-upload #filter .subsubsub {
+	margin: 8px 0;
+}
+
+#filter .tablenav select {
+	border-style:solid;
+	border-width:1px;
+	padding:2px;
+	vertical-align:top;
+}
diff --git a/wp-admin/css/widgets-rtl.css b/wp-admin/css/widgets-rtl.css
index 89ff4b6..ece02b5 100644
--- a/wp-admin/css/widgets-rtl.css
+++ b/wp-admin/css/widgets-rtl.css
@@ -38,13 +38,12 @@ li.widget-list-control-item h4.widget-title a, #dragHelper li.widget-list-contro
 	left:1em;
 }
 
-li.widget-list-control-item div.widget-control {
-	padding:0 0 0 10px;
-}
 ul.widget-control-list div.widget-control-actions {
 	margin-right:0;
 	margin-left:-10px;
 }
-ul.widget-control-list .widget-title {
-	text-align:right;
+ul.widget-control-list h4.widget-title,
+#dragHelper h4.widget-title {
+	text-align: right;
+	padding: 0.4em 0.8em 0.4em 2.5em;
 }
diff --git a/wp-admin/css/widgets.css b/wp-admin/css/widgets.css
index 5d044cf..baeb851 100644
--- a/wp-admin/css/widgets.css
+++ b/wp-admin/css/widgets.css
@@ -74,7 +74,6 @@ ul#widget-list li.widget-list-item div.widget-description {
 	font-size: 11px;
 }
 
-
 ul#widget-list li.widget-list-item ul.widget-control-info {
 	display: none;
 }
@@ -91,27 +90,26 @@ ul.widget-control-list {
 	padding: 0 1em;
 }
 
-ul.widget-control-list li {
-	position: relative;
-}
-
 div#current-widgets p.submit {
 	padding: 1em;
 }
 
 li.widget-list-control-item {
-	margin: 0 0 1em;
+	margin: 1em 0;
 	-moz-border-radius: 3px;
 	-khtml-border-radius: 3px;
 	-webkit-border-radius: 3px;
 	border-radius: 3px;
 }
 
-li.widget-list-control-item h4, #dragHelper li.widget-list-control-item h4, li.widget-sortable h4 {
+li.widget-list-control-item h4, 
+#dragHelper li.widget-list-control-item h4, 
+li.widget-sortable h4 {
 	margin: 0;
-	padding: 0.4em 2.5em 0.4em 0.8em;
 	cursor: move;
 	font-size: 13px;
+	padding: 0.4em 2.5em 0.4em 0.8em;
+	position: relative;
 	-moz-border-radius: 3px;
 	-khtml-border-radius: 3px;
 	-webkit-border-radius: 3px;
@@ -143,16 +141,16 @@ li.widget-list-control-item h4.widget-title a,
 }
 
 li.widget-list-control-item h4.widget-title a:hover {
-
 	text-decoration: none;
 	border-bottom: none;
 }
 
 li.widget-list-control-item div.widget-control {
 	display: none;
-	margin: 1em;
-	padding: 0 10px 0 7px; /* Correction for padding, margin, border of inputs */
+	padding: 15px;
 	font-size: 11px;
+	position: relative;
+	background-color: #CFEBF7;
 }
 
 li.widget-list-control-item div.widget-control p {
@@ -161,15 +159,9 @@ li.widget-list-control-item div.widget-control p {
 }
 
 ul.widget-control-list div.widget-control-actions {
-	margin-right: -10px; /* Correction for padding, margin, border of inputs */
-	margin-left: -6px;
 	border-top-width: 1px;
 	border-top-style: solid;
-	padding: 0.5em 0 0.8em;
-}
-
-ul.widget-control-list .widget-title {
-	
+	padding: 0.5em 0 0;
 }
 
 .widget-control-edit {