WP Merge to 4524

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

1 files changed, 7 insertions, 8 deletions

diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 6fcffa8..010dc60 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -219,9 +219,8 @@ textarea, input, select {
 	border-style: none;
 	padding: 0px;
 	margin-bottom: 16px;
-	height: 17em;
+	height: 18em;
 	width: 100%;
-/*	overflow-y: hidden;*/
 }
 
 form#upload th {
@@ -297,7 +296,7 @@ form#upload #post_content {
 }
 
 .commentlist li {
-	border-bottom: 1px solid #ccc; 
+	border-bottom: 1px solid #ccc;
 	padding: 1em 1em .2em;
 	margin: 0;
 }
@@ -1006,8 +1005,8 @@ input.delete:hover {
 }
 
 /* A handy div class for hiding controls.
-   Some browsers will disable them when you
-   set display:none; */
+Some browsers will disable them when you
+set display:none; */
 .zerosize {
 	height: 0px;
 	width: 0px;
@@ -1047,9 +1046,9 @@ input.delete:hover {
 }
 
 /****************************************************************
-  avoid padding, margins or borders on dbx-box, 
-  to reduce visual discrepancies between it and the clone.  
-  overall, dbx-box is best left as visually unstyled as possible 
+avoid padding, margins or borders on dbx-box,
+to reduce visual discrepancies between it and the clone.
+overall, dbx-box is best left as visually unstyled as possible
 *****************************************************************/
 .dbx-box {
 	margin:0;