From 7ffcd8c7d666dd3840141dff6f283af877dbca36 Mon Sep 17 00:00:00 2001
From: westi <westi@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sat, 8 Mar 2008 22:43:58 +0000
Subject: [PATCH] Abstract css colours on login page to colors-fresh. Fixes
 #6135 props iammattthomas.

git-svn-id: http://svn.automattic.com/wordpress/trunk@7187 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/css/colors-fresh.css | 44 ++++++++++++++++++++++----------
 wp-admin/css/login.css        | 48 ++++++++++++-----------------------
 wp-login.php                  |  3 +++
 3 files changed, 49 insertions(+), 46 deletions(-)

diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css
index b9a9418d5..8a72edc54 100644
--- a/wp-admin/css/colors-fresh.css
+++ b/wp-admin/css/colors-fresh.css
@@ -37,11 +37,11 @@ input.disabled, textarea.disabled {
 
 li.widget-list-control-item h4.widget-title a:hover, .submit a, #user_info a, #dashmenu a:hover, #footer a, #upload-menu li a.upload-tab-link, 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 {
+#draghelper li.widget-list-control-item h4.widget-title a:visited, .login #backtoblog a:hover {
 	color: #fff;
 }
 
-li.widget-list-control-item, div.nav, .tablenav, .submitbox, h3.dashboard-widget-title, h3.dashboard-widget-title span, h3.dashboard-widget-title small, ul.view-switch li.current, .form-table tr, #poststuff h3 {
+li.widget-list-control-item, div.nav, .tablenav, .submitbox, h3.dashboard-widget-title, h3.dashboard-widget-title span, h3.dashboard-widget-title small, ul.view-switch li.current, .form-table tr, #poststuff h3, .login form {
 	background-color: #eaf3fa;
 }
 
@@ -54,8 +54,8 @@ strong .post-com-count span {
 	background-color: #2583ad;
 }
 
-ul#category-tabs li.ui-tabs-selected, .button-secondary, #quicktags {
-	background-color: #cee1ef;
+ul#category-tabs li.ui-tabs-selected, .button-secondary, #quicktags, #login form .submit input {
+	background-color: #cee1ef !important;
 }
 
 ul#widget-list li.widget-list-item h4.widget-title {
@@ -102,7 +102,7 @@ ul.widget-control-list .sorthelper {
 	border-top-color: #d0d0d0;
 }
 
-.error {
+.error, #login #login_error {
 	background-color: #ffebe8;
 	border-color: #c00;
 }
@@ -182,15 +182,24 @@ ul.widget-control-list .sorthelper {
 	color: #666;
 }
 
-.submit input, .button, .button-secondary {
+.submit input, .button, .button-secondary, #login form .submit input {
 	background-color: #e5e5e5;
 	color: #246;
+	border-color: #a3a3a3;
 }
 
-.submit input:hover, .button:hover, .button-secondary:hover, #wphead #viewsite a:hover, #adminmenu a:hover, #sidemenu a:hover, #submenu a.current, #submenu a:hover, .submitbox #previewview a:hover, #the-comment-list .comment a:hover, #rightnow a:hover, a:hover, .subsubsub a:hover, .subsubsub a.current:hover {
+.submit input:hover, .button:hover {
+	border-color: #535353;
+}
+
+.submit input:hover, .button:hover, .button-secondary:hover, #wphead #viewsite a:hover, #adminmenu a:hover, #sidemenu a:hover, #submenu a.current, #submenu a:hover, .submitbox #previewview a:hover, #the-comment-list .comment a:hover, #rightnow a:hover, a:hover, .subsubsub a:hover, .subsubsub a.current:hover, #login form .submit input:hover {
 	color: #d54e21;
 }
 
+.button-secondary:hover, #login form .submit input:hover {
+	border-color: #328ab2;
+}
+
 .submitbox #autosave .error, ul.view-switch li.current a {
 	color: #333;
 }
@@ -237,7 +246,7 @@ ul.widget-control-list .sorthelper {
 	color: #d54e21;
 }
 
-.updated {
+.updated, .login #login_error, .login .message {
 	background-color: #ffffe0;
 	border-color: #e6db55;
 }
@@ -272,8 +281,8 @@ ul.widget-control-list .sorthelper {
 /* Because we don't want visited on these links */
 #adminmenu a.current, #sidemenu a.current {
 	background-color: #fff;
-	border-bottom-color: #fff;
 	border-color: #c6d9e9;
+	border-bottom-color: #fff;
 	color: #d54e21;
 }
 
@@ -325,7 +334,7 @@ ul.widget-control-list .sorthelper {
 	background-color: #fffbcc;
 }
 
-#edit-slug-box strong {
+#edit-slug-box strong, .login #nav a {
 	color: #777;
 }
 
@@ -389,9 +398,9 @@ ul.widget-control-list .sorthelper {
 }
 
 #poststuff .postbox, #titlediv, #poststuff .postarea, #poststuff .stuffbox {
-	border-bottom-color: #ccc;
 	border-color: #ebebeb;
 	border-right-color: #ccc;
+	border-bottom-color: #ccc;
 }
 
 #poststuff .togbox {
@@ -408,7 +417,6 @@ ul.widget-control-list .sorthelper {
 }
 
 #rightnow a {
-	border-bottom-color: #448abd;
 	color: #448abd;
 }
 
@@ -472,21 +480,29 @@ ul.widget-control-list .sorthelper {
 	border-top-color: #247fab;
 }
 
-#user_info {
+#user_info, .login #backtoblog a {
 	color: #ccc;
 }
 
 #wphead {
 	background-color: #e4f2fd;
+}
+
+#wphead, body.login {
 	border-top-color: #464646;
 }
 
 #wphead #viewsite a {
 	background-color: #c6d9e9;
 	color: #246;
+	border-color: #94acc1;
 }
 
-#wphead h1, #dashmenu a.current:hover {
+#wphead #viewsite a:hover {
+	border-color: #246;
+}
+
+#wphead h1, #dashmenu a.current:hover, #login form input {
 	color: #555;
 }
 
diff --git a/wp-admin/css/login.css b/wp-admin/css/login.css
index cfd0b929d..92f10bca0 100644
--- a/wp-admin/css/login.css
+++ b/wp-admin/css/login.css
@@ -1,14 +1,12 @@
 * { margin: 0; padding: 0; }
 
 body {
-	background-color: #fff;
-	color: #333;
-	border-top: 30px solid #464646;
+	border-top-width: 30px;
+	border-top-style: solid;
 	font: 12px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
 }
 
 form {
-	background-color: #eaf3fa;
 	margin-left: 8px;
 	padding: 16px 16px 40px 16px;
 	font-weight: bold;
@@ -20,32 +18,28 @@ form {
 
 form .forgetmenot { font-weight: normal; float: left; margin-bottom: 0;}
 
-form .submit input {
+#login form .submit input {
 	font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
-	font-size: 14px;
-	color: #246;
-	padding: 4px 6px;
-	background: #cee1ef;
+	padding: 3px 5px;
 	border: none;
+	font-size: 13px;
+	border-width: 1px;
+	border-style: solid;
+	-moz-border-radius: 3px;
+	-khtml-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+	cursor: default;
+	text-decoration: none;	
 	margin-top: -6px;
-	-moz-border-radius: 2px;
-	-khtml-border-radius: 2px;
-	-webkit-border-radius: 2px;
-	border-radius: 2px;
-}
-
-form .submit input:hover {
-	color: #d54e21;
 }
 
 form .submit { float: right; }
 
-form input { color: #555; }
-
 form p { margin-bottom: 24px; }
 
 h1 a {
-	background: #fff url(../images/logo-login.gif) no-repeat;
+	background: url(../images/logo-login.gif) no-repeat;
 	width: 292px;
 	height: 66px;
 	text-indent: -9999px;
@@ -56,32 +50,22 @@ h1 a {
 
 #backtoblog a {
 	position: absolute;
-	color: #ccc;
 	top: 7px;
 	left: 15px;
 	text-decoration: none;
 }
 
-#backtoblog a:hover { color: #fff; }
-
 #login { width: 292px; margin: 7em auto; }
 
 #login_error, .message {
 	margin: 0 0 16px 8px;
-	background-color: #fffbcc;
-	border: 1px solid #e6db55;
+	border-width: 1px;
+	border-style: solid;
 	padding: 12px;
 }
 
-#login_error {
-	background-color: #ffebe8;
-	border-color: #c00;
-}
-
 #nav { margin: 0 0 0 8px; padding: 16px; }
 
-#nav a { color: #777; }
-
 #user_pass, #user_login, #user_email {
 	font-size: 20px;
 	width: 97%;
diff --git a/wp-login.php b/wp-login.php
index 103aba6ed..9cbda78e9 100644
--- a/wp-login.php
+++ b/wp-login.php
@@ -14,6 +14,9 @@ function login_header($title = 'Login', $message = '', $wp_error = '') {
 	<title><?php bloginfo('name'); ?> &rsaquo; <?php echo $title; ?></title>
 	<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
 	<link rel='stylesheet' href='wp-admin/css/login.css' type='text/css' />
+	<?php
+	wp_admin_css( 'css/colors-fresh' );
+	?>
 	<script type="text/javascript">
 		function focusit() {
 			document.getElementById('user_login').focus();