WP Merge

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

1 files changed, 5 insertions, 1 deletions

diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 3b8595c..6fcffa8 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -458,6 +458,10 @@ textarea.all-options, input.all-options {
 	width: 250px;
 }
 
+input.disabled, textarea.disabled {
+	background: #ccc;
+}
+
 #adminmenu {
 	background: #83B4D8;
 	border-top: 3px solid #448abd;
@@ -505,7 +509,6 @@ textarea.all-options, input.all-options {
 	border-bottom: none;
 	margin: 0;
 	padding: 3px 2em 0 3em;
-	height: 25px;
 }
 
 #minisub {
@@ -533,6 +536,7 @@ textarea.all-options, input.all-options {
 
 #submenu li {
 	line-height: 180%;
+	height: 25px;
 }