Merged with WP 2.5, revision 7806

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

3 files changed, 34 insertions, 30 deletions

diff --git a/wp-admin/css/media.css b/wp-admin/css/media.css
index 0cb2694..c77a069 100644
--- a/wp-admin/css/media.css
+++ b/wp-admin/css/media.css
@@ -91,8 +91,14 @@ tr.image-size label {
 	max-height: 40px;
 }
 
-.filename {
-	display: none;
+.filename.original {
+	float: left;
+}
+.crunching {
+	display: block;
+	line-height: 32px;
+	text-align: right;
+	margin-right: 5px;
 }
 button.dismiss {
 	position: absolute;
@@ -118,27 +124,31 @@ button.dismiss {
 	border-right-width: 3px;
 	border-right-style: solid;
 }
+
+#library-form .progress, #gallery-form .progress {
+	display: none;
+}
+
 .media-item .thumbnail {
 	max-width: 128px;
 	max-height: 128px;
 }
 .media-item .pinkynail {
-	position: absolute;
-	top: 2px;
-	left: 2px;
+	float: left;
+	margin: 2px;
 	height: 32px;
 	max-width: 40px;
 }
 
-tbody.media-item-info tr {
+thead.media-item-info tr {
 	background-color: transparent;
 }
-tbody.media-item-info th, tbody.media-item-info td {
+thead.media-item-info th, thead.media-item-info td {
 	border: none;
 	margin: 0;
 }
 
-.form-table tbody.media-item-info {
+.form-table thead.media-item-info {
 	border: 8px solid #fff;
 }
 
@@ -164,23 +174,14 @@ abbr.required {
 .describe-toggle-on, .describe-toggle-off {
 	display: block;
 	line-height: 36px;
-	z-index: 2;
-	position: absolute;
-	top: 0px;
-	right: 20px;
+	float: right;
+	margin-right: 20px;
 }
 .describe-toggle-off {
 	display: none;
 }
+
 .clickmask {
-	background: transparent;
-	position: absolute;
-	top: 0px;
-	left: 0px;
-	cursor: pointer;
-	border: none;
-	z-index: 3;
-	height: 36px;
 }
 
 .hidden {
@@ -210,17 +211,16 @@ abbr.required {
 }
 
 #media-upload .media-item {
+	position: relative;
 	border-bottom-width: 1px;
 	border-bottom-style: solid;
-	width: 623px;
-	position: relative;
 	min-height: 36px;
+	width: 100%;
 }
-#media-upload .filename {
-	display: block;
+.filename {
 	line-height: 36px;
-	margin-left: 50px;
-	z-index: 2;
+	margin-left: 10px;
+	float: left;
 }
 #media-upload .describe {
 	border-top-width: 1px;
@@ -239,4 +239,4 @@ abbr.required {
 #media-upload tr.image-size {
 	margin-bottom: 1em;
 	height: 3em;
-}
\ No newline at end of file
+}
diff --git a/wp-admin/css/widgets-rtl.css b/wp-admin/css/widgets-rtl.css
index 49359f5..89ff4b6 100644
--- a/wp-admin/css/widgets-rtl.css
+++ b/wp-admin/css/widgets-rtl.css
@@ -35,7 +35,7 @@ h4.widget-title a {
 }
 li.widget-list-control-item h4.widget-title a, #dragHelper li.widget-list-control-item h4.widget-title a, #draghelper li.widget-list-control-item h4.widget-title a:visited {
 	right:auto;
-	left:2em;
+	left:1em;
 }
 
 li.widget-list-control-item div.widget-control {
@@ -47,4 +47,4 @@ ul.widget-control-list div.widget-control-actions {
 }
 ul.widget-control-list .widget-title {
 	text-align:right;
-}
\ No newline at end of file
+}
diff --git a/wp-admin/css/widgets.css b/wp-admin/css/widgets.css
index ea70396..5d044cf 100644
--- a/wp-admin/css/widgets.css
+++ b/wp-admin/css/widgets.css
@@ -91,6 +91,10 @@ ul.widget-control-list {
 	padding: 0 1em;
 }
 
+ul.widget-control-list li {
+	position: relative;
+}
+
 div#current-widgets p.submit {
 	padding: 1em;
 }
@@ -135,7 +139,7 @@ h4.widget-title a {
 li.widget-list-control-item h4.widget-title a,
 #dragHelper li.widget-list-control-item h4.widget-title a,
 #draghelper li.widget-list-control-item h4.widget-title a:visited {
-	right: 2em;
+	right: 1em;
 }
 
 li.widget-list-control-item h4.widget-title a:hover {