From 03207bf73801ca0c8d8954beceb1c333043139ce Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Tue, 26 Aug 2008 00:40:10 +0000
Subject: [PATCH] New colors and small improvements for the pwd strength meter,
 includes patch by Simek, fixes #7588

git-svn-id: https://develop.svn.wordpress.org/trunk@8733 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/css/colors-classic.css | 17 +++++++++--------
 wp-admin/css/colors-fresh.css   | 19 ++++++++++---------
 wp-admin/user-edit.php          |  7 +++----
 wp-admin/wp-admin.css           | 33 ++++++++++++---------------------
 4 files changed, 34 insertions(+), 42 deletions(-)

diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css
index 28571f8497..bd6f88891f 100644
--- a/wp-admin/css/colors-classic.css
+++ b/wp-admin/css/colors-classic.css
@@ -403,26 +403,27 @@ input.readonly {
 
 #pass-strength-result {
 	background-color: #e3e3e3;
-	border-color: #000;
+	border-color: #ccc !important;
 }
 
 #pass-strength-result.bad {
-	background-color: #ffeff7;
-	border-color: #c69;
+	background-color: #ffb78c;
+	border-color: #ff853c !important;
 }
 
 #pass-strength-result.good {
-	background-color: #effff4;
-	border-color: #66cc87;
+	background-color: #ffec8b;
+	border-color: #fc0 !important;
 }
 
 #pass-strength-result.short {
-	background-color: #e3e3e3;
+	background-color: #ffa0a0;
+	border-color: #f04040 !important;
 }
 
 #pass-strength-result.strong {
-	background-color: #59ef86;
-	border-color: #319f52;
+	background-color: #c3ff88;
+	border-color: #8dff1c !important;
 }
 
 .checkbox, .side-info, #your-profile #rich_editing {
diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css
index 9f51dbd4a6..c26a26c2e5 100644
--- a/wp-admin/css/colors-fresh.css
+++ b/wp-admin/css/colors-fresh.css
@@ -387,27 +387,28 @@ input.readonly {
 }
 
 #pass-strength-result {
-	background-color: #e3e3e3;
-	border-color: #000;
+	background-color: #eee;
+	border-color: #ddd !important;
 }
 
 #pass-strength-result.bad {
-	background-color: #ffeff7;
-	border-color: #c69;
+	background-color: #ffb78c;
+	border-color: #ff853c !important;
 }
 
 #pass-strength-result.good {
-	background-color: #effff4;
-	border-color: #66cc87;
+	background-color: #ffec8b;
+	border-color: #fc0 !important;
 }
 
 #pass-strength-result.short {
-	background-color: #e3e3e3;
+	background-color: #ffa0a0;
+	border-color: #f04040 !important;
 }
 
 #pass-strength-result.strong {
-	background-color: #59ef86;
-	border-color: #319f52;
+	background-color: #c3ff88;
+	border-color: #8dff1c !important;
 }
 
 .checkbox, .side-info, #your-profile #rich_editing {
diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index cbc14234cd..b6da3fb441 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -340,11 +340,10 @@ if ( $show_password_fields ) :
 	<th><label for="pass1"><?php _e('New Password'); ?></label></th>
 	<td><input type="password" name="pass1" id="pass1" size="16" value="" /> <?php _e("If you would like to change the password type a new one. Otherwise leave this blank."); ?><br />
 		<input type="password" name="pass2" id="pass2" size="16" value="" /> <?php _e("Type your new password again."); ?><br />
-		<?php if ( $is_profile_page ): ?>
-		<p><strong><?php _e('Password Strength'); ?></strong></p>
-		<div id="pass-strength-result"><?php _e('Strength indicator'); ?></div> 
+	<?php if ( $is_profile_page ): ?>
+		<div id="pass-strength-result"><?php _e('Strength indicator'); ?></div>
 		<p><?php _e('Hint: Your password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers and symbols like ! " ? $ % ^ &amp; ).'); ?></p>
-		<?php endif; ?>
+	<?php endif; ?>
 	</td>
 </tr>
 <?php endif; ?>
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 772fc57ebb..fa80c7ff6e 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -1,4 +1,9 @@
-.plugins .name {
+.plugins .name,
+#pass-strength-result.strong,
+#pass-strength-result.short,
+.button-highlighted,
+#quicktags #ed_strong,
+#ed_reply_toolbar #ed_reply_strong {
 	font-weight: bold;
 }
 
@@ -231,10 +236,6 @@ table#availablethemes td.bottom {
 	text-decoration: none;
 }
 
-.button-highlighted {
-	font-weight: bold;
-}
-
 #wpcontent select {
 	font: 12px/20px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
 	padding: 2px;
@@ -329,11 +330,6 @@ textarea.all-options, input.all-options {
 	display: inline-block;
 }
 
-#quicktags #ed_strong,
-#ed_reply_toolbar #ed_reply_strong {
-	font-weight: bold;
-}
-
 #quicktags #ed_link,
 #ed_reply_toolbar #ed_reply_link {
 	text-decoration: underline;
@@ -585,11 +581,13 @@ td.media-icon img {
 }
 
 #pass-strength-result {
-	padding: 3px 5px 3px 5px;
-	margin-top: 3px;
-	text-align: center;
-	border-width: 1px;
 	border-style: solid;
+	border-width: 1px;
+	float: left;
+	margin: 12px 5px 5px 1px;
+	padding: 3px 5px;
+	text-align: center;
+	width: 200px;
 }
 
 a.view-comment-post-link {
@@ -1020,13 +1018,6 @@ html, body {
 	width: 300px;
 }
 
-#pass-strength-result {
-	width: 197px;
-	float: left;
-	margin-right: 5px;
-	border: 1px solid #ccc !important;
-}
-
 #profile-page .form-table #rich_editing {
 	margin-right: 5px
 }