WP Merge to rev 4347

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

1 files changed, 42 insertions, 23 deletions

diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index a4420cc..f8e6351 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -186,7 +186,7 @@ textarea, input, select {
 	border-style: none;
 	padding: 0px;
 	margin-bottom: 16px;
-	height: 15em;
+	height: 16em;
 	width: 100%;
 /*	overflow-y: hidden;*/
 }
@@ -400,6 +400,10 @@ table .vers {
 	text-align: center;
 }
 
+textarea.all-options, input.all-options {
+	width: 250px;
+}
+
 #adminmenu {
 	background: #83B4D8;
 	border-top: 3px solid #448abd;
@@ -589,11 +593,10 @@ input.delete:hover {
 
 #login {
 	position: relative;
-	background: url('images/login-bkg-tile.gif') no-repeat top center #fbfbfb;
+	background: url('images/login-bkg-tile.gif') no-repeat top center;
 	color: #fff;
-	/* height: 430px; */
 	margin: 5em auto;
-	padding: 45px 50px 0;
+	padding: 20px 50px 0;
 	width: 325px;
 }
 
@@ -607,6 +610,11 @@ input.delete:hover {
 	text-align: center;
 }
 
+#login #login_error a {
+	color: #ebcd4e;
+	border-color: #ebcd4e;
+}
+
 #login #send {
 	color: #fff;
 	text-align: left;
@@ -614,20 +622,27 @@ input.delete:hover {
 	font-size: 1.1em;
 }
 
-#login h1 {
-	margin: 0 auto;
-	padding-bottom: 10px;
-	left: 137px;
-	height: 75px;
-	width: 75px;
-}
-
 #login h1 a {
+	margin: 0 auto;
+	height: 88px;
+	width: 320px;
 	display: block;
-	text-indent: -9999px;
 	border-bottom: none;
 }
 
+#login .hide {
+	display: none;
+}
+
+#login .message {
+	font-size: 10pt;
+	text-align: center;
+}
+
+#login .register {
+	font-size: 20px;
+}
+
 #login input {
 	padding: 4px;
 }
@@ -636,21 +651,21 @@ input.delete:hover {
 	background: url('images/login-bkg-bottom.gif') no-repeat bottom center;
 	list-style: none;
 	margin: 0 -50px;
-	padding: 0 50px 5px;
+	padding: 10px 50px 25px;;
 }
 
 #login ul:after {
-  content: ".";
-  display: block;
-  height: 0;
-  clear: both;
-  visibility: hidden;
+	content: ".";
+	display: block;
+	height: 0;
+	clear: both;
+	visibility: hidden;
 }
 
 #login ul li {
 	float: left;
-	font-size: 11px;
-	padding: 15px 0;
+	font-size: 12px;
+	padding: 5px 0;
 	text-align: center;
 }
 
@@ -669,7 +684,7 @@ input.delete:hover {
 	color: #fff;
 }
 
-#login #log, #pwd, #user_login, #email {
+#login .input {
 	font-size: 1.8em;
 	margin-top: 3px;
 	width: 97%;
@@ -681,7 +696,11 @@ input.delete:hover {
 
 #login #submit {
 	margin: 0;
-	font-size: 1.2em;
+	font-size: 15px;
+}
+
+#login .fullwidth {
+	width: 320px;
 }
 
 #searchform {