WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refresh login form styles to match admin style refresh. Props iammattthomas. see #17324. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@18223 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
koopersmith 2011-06-10 02:37:37 +00:00
parent ec2778daa9
commit bc7d8a9dca
10 changed files with 58 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/css/colors-classic.css
View File

File diff suppressed because one or more lines are too long

6
wp-admin/css/colors-classic.dev.css
View File

@ -592,11 +592,13 @@ input.readonly, textarea.readonly {
color: #777; color: #777;
} }
.login #nav a { .login #nav a,
.login #backtoblog a {
color: #21759b !important; color: #21759b !important;
} }
.login #nav a:hover { .login #nav a:hover,
.login #backtoblog a:hover {
color: #d54e21 !important; color: #d54e21 !important;
} }

2
wp-admin/css/colors-fresh.css
View File

File diff suppressed because one or more lines are too long

6
wp-admin/css/colors-fresh.dev.css
View File

@ -592,11 +592,13 @@ input.readonly, textarea.readonly {
color: #777; color: #777;
} }
.login #nav a { .login #nav a,
.login #backtoblog a {
color: #21759b !important; color: #21759b !important;
} }
.login #nav a:hover { .login #nav a:hover,
.login #backtoblog a:hover {
color: #d54e21 !important; color: #d54e21 !important;
} }

2
wp-admin/css/login.css
View File

@ -1 +1 @@
*{margin:0;padding:0;}body{padding-top:30px;font:11px "Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;}form{margin-left:8px;padding:16px 16px 40px 16px;font-weight:normal;-moz-border-radius:11px;-khtml-border-radius:11px;-webkit-border-radius:11px;border-radius:11px;background:#fff;border:1px solid #e5e5e5;-moz-box-shadow:rgba(200,200,200,1) 0 4px 18px;-webkit-box-shadow:rgba(200,200,200,1) 0 4px 18px;-khtml-box-shadow:rgba(200,200,200,1) 0 4px 18px;box-shadow:rgba(200,200,200,1) 0 4px 18px;}form .forgetmenot{font-weight:normal;float:left;margin-bottom:0;}.button-primary{font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;padding:3px 10px;border:none;font-size:12px;border-width:1px;border-style:solid;-moz-border-radius:11px;-khtml-border-radius:11px;-webkit-border-radius:11px;border-radius:11px;cursor:pointer;text-decoration:none;margin-top:-3px;}#login form p{margin-bottom:0;}label{color:#777;font-size:13px;}form .forgetmenot label{font-size:11px;line-height:19px;}form .submit,.alignright{float:right;}form p{margin-bottom:24px;}h1 a{background:url(../images/logo-login.gif) no-repeat top center;width:326px;height:67px;text-indent:-9999px;overflow:hidden;padding-bottom:15px;display:block;}#nav{text-shadow:rgba(255,255,255,1) 0 1px 0;}#backtoblog{position:absolute;top:0;left:0;border-bottom:#c6c6c6 1px solid;background:#d9d9d9;background:-moz-linear-gradient(bottom,#d7d7d7,#e4e4e4);background:-webkit-gradient(linear,left bottom,left top,from(#d7d7d7),to(#e4e4e4));height:30px;width:100%;}#backtoblog a{text-decoration:none;display:block;padding:8px 0 0 15px;}#login{width:320px;margin:7em auto;}#login_error,.message{margin:0 0 16px 8px;border-width:1px;border-style:solid;padding:12px;-moz-border-radius:3px;-khtml-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;}#nav{margin:0 0 0 8px;padding:16px;}body form .input{font-size:24px;width:97%;padding:3px;margin-top:2px;margin-right:6px;margin-bottom:16px;border:1px solid #e5e5e5;background:#fbfbfb;}input{color:#555;}.clear{clear:both;}#pass-strength-result{font-weight:bold;border-style:solid;border-width:1px;margin:12px 0 6px;padding:6px 5px;text-align:center;} *{margin:0;padding:0;}html{background:#fbfbfb!important;}body{padding-top:30px;font-family:Arial,"Bitstream Vera Sans",Helvetica,Verdana,sans-serif;font-size:12px;}form{margin-left:8px;padding:26px 24px 46px;font-weight:normal;-moz-border-radius:3px;-khtml-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;background:#fff;border:1px solid #e5e5e5;-moz-box-shadow:rgba(200,200,200,0.7) 0 7px 6px -6px;-webkit-box-shadow:rgba(200,200,200,0.7) 0 7px 6px -6px;-khtml-box-shadow:rgba(200,200,200,0.7) 0 7px 6px -6px;box-shadow:rgba(200,200,200,0.7) 0 7px 6px -6px;}form .forgetmenot{font-weight:normal;float:left;margin-bottom:0;}.button-primary{font-family:Arial,"Bitstream Vera Sans",Helvetica,Verdana,sans-serif;padding:3px 10px;border:none;font-size:13px;border-width:1px;border-style:solid;-moz-border-radius:11px;-khtml-border-radius:11px;-webkit-border-radius:11px;border-radius:11px;cursor:pointer;text-decoration:none;margin-top:-3px;}#login form p{margin-bottom:0;}label{color:#777;font-size:14px;}form .forgetmenot label{font-size:12px;line-height:19px;}form .submit,.alignright{float:right;}form p{margin-bottom:24px;}h1 a{background:url(../images/logo-login.png) no-repeat top center;width:326px;height:67px;text-indent:-9999px;overflow:hidden;padding-bottom:15px;display:block;}#login{width:320px;margin:7em auto;}#login_error,.message{margin:0 0 16px 8px;border-width:1px;border-style:solid;padding:12px;-moz-border-radius:3px;-khtml-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;}#nav,#backtoblog{text-shadow:rgba(255,255,255,1) 0 1px 0;margin:0 0 0 16px;padding:16px 16px 0;}#backtoblog{padding:12px 16px 0;}body form .input{font-family:"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:200;font-size:24px;width:97%;padding:3px;margin-top:2px;margin-right:6px;margin-bottom:16px;border:1px solid #e5e5e5;background:#fbfbfb;outline:none;-moz-box-shadow:inset 1px 1px 2px rgba(200,200,200,0.2);-webkit-box-shadow:inset 1px 1px 2px rgba(200,200,200,0.2);box-shadow:inset 1px 1px 2px rgba(200,200,200,0.2);}input{color:#555;}.clear{clear:both;}#pass-strength-result{font-weight:bold;border-style:solid;border-width:1px;margin:12px 0 6px;padding:6px 5px;text-align:center;}

77
wp-admin/css/login.dev.css
View File

@ -1,24 +1,29 @@
* { margin: 0; padding: 0; } * { margin: 0; padding: 0; }
html {
background: #fbfbfb !important;
}
body { body {
padding-top: 30px; padding-top: 30px;
font: 11px "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; font-family: Arial, "Bitstream Vera Sans", Helvetica, Verdana, sans-serif;
font-size: 12px;
} }
form { form {
margin-left: 8px; margin-left: 8px;
padding: 16px 16px 40px 16px; padding: 26px 24px 46px;
font-weight: normal; font-weight: normal;
-moz-border-radius: 11px; -moz-border-radius: 3px;
-khtml-border-radius: 11px; -khtml-border-radius: 3px;
-webkit-border-radius: 11px; -webkit-border-radius: 3px;
border-radius: 11px; border-radius: 3px;
background: #fff; background: #fff;
border: 1px solid #e5e5e5; border: 1px solid #e5e5e5;
-moz-box-shadow: rgba(200,200,200,1) 0 4px 18px; -moz-box-shadow: rgba(200, 200, 200, 0.7) 0px 7px 6px -6px;
-webkit-box-shadow: rgba(200,200,200,1) 0 4px 18px; -webkit-box-shadow: rgba(200, 200, 200, 0.7) 0px 7px 6px -6px;
-khtml-box-shadow: rgba(200,200,200,1) 0 4px 18px; -khtml-box-shadow: rgba(200, 200, 200, 0.7) 0px 7px 6px -6px;
box-shadow: rgba(200,200,200,1) 0 4px 18px; box-shadow: rgba(200, 200, 200, 0.7) 0px 7px 6px -6px;
} }
form .forgetmenot { form .forgetmenot {
@ -28,10 +33,10 @@ form .forgetmenot {
} }
.button-primary { .button-primary {
font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; font-family: Arial, "Bitstream Vera Sans", Helvetica, Verdana, sans-serif;
padding: 3px 10px; padding: 3px 10px;
border: none; border: none;
font-size: 12px; font-size: 13px;
border-width: 1px; border-width: 1px;
border-style: solid; border-style: solid;
-moz-border-radius: 11px; -moz-border-radius: 11px;
@ -49,11 +54,11 @@ form .forgetmenot {
label { label {
color: #777; color: #777;
font-size: 13px; font-size: 14px;
} }
form .forgetmenot label { form .forgetmenot label {
font-size: 11px; font-size: 12px;
line-height: 19px; line-height: 19px;
} }
@ -67,7 +72,7 @@ form p {
} }
h1 a { h1 a {
background: url(../images/logo-login.gif) no-repeat top center; background: url(../images/logo-login.png) no-repeat top center;
width: 326px; width: 326px;
height: 67px; height: 67px;
text-indent: -9999px; text-indent: -9999px;
@ -76,30 +81,11 @@ h1 a {
display: block; display: block;
} }
#nav { #login {
text-shadow: rgba(255,255,255,1) 0 1px 0; width: 320px;
margin: 7em auto;
} }
#backtoblog {
position: absolute;
top: 0;
left: 0;
border-bottom: #c6c6c6 1px solid;
background: #d9d9d9; /* fallback color */
background: -moz-linear-gradient(bottom, #d7d7d7, #e4e4e4);
background: -webkit-gradient(linear, left bottom, left top, from(#d7d7d7), to(#e4e4e4));
height: 30px;
width: 100%;
}
#backtoblog a {
text-decoration: none;
display: block;
padding: 8px 0 0 15px;
}
#login { width: 320px; margin: 7em auto; }
#login_error, #login_error,
.message { .message {
margin: 0 0 16px 8px; margin: 0 0 16px 8px;
@ -112,12 +98,19 @@ h1 a {
border-radius: 3px; border-radius: 3px;
} }
#nav { #nav,
margin: 0 0 0 8px; #backtoblog {
padding: 16px; text-shadow: rgba(255,255,255,1) 0 1px 0;
margin: 0 0 0 16px;
padding: 16px 16px 0;
}
#backtoblog {
padding: 12px 16px 0;
} }
body form .input { body form .input {
font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 200;
font-size: 24px; font-size: 24px;
width: 97%; width: 97%;
padding: 3px; padding: 3px;
@ -126,6 +119,10 @@ body form .input {
margin-bottom: 16px; margin-bottom: 16px;
border: 1px solid #e5e5e5; border: 1px solid #e5e5e5;
background: #fbfbfb; background: #fbfbfb;
outline: none;
-moz-box-shadow: inset 1px 1px 2px rgba(200, 200, 200, 0.2);
-webkit-box-shadow: inset 1px 1px 2px rgba(200, 200, 200, 0.2);
box-shadow: inset 1px 1px 2px rgba(200, 200, 200, 0.2);
} }
input { input {

BIN
wp-admin/images/logo-login.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.7 KiB

BIN
wp-admin/images/logo-login.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.7 KiB

4
wp-includes/script-loader.php
View File

@ -488,7 +488,7 @@ function wp_default_styles( &$styles ) {
$styles->add_data( 'ie', 'conditional', 'lte IE 7' ); $styles->add_data( 'ie', 'conditional', 'lte IE 7' );
// all colors stylesheets need to have the same query strings (cache manifest compat) // all colors stylesheets need to have the same query strings (cache manifest compat)
$colors_version = '20110609'; $colors_version = '20110609b';
// Register "meta" stylesheet for admin colors. All colors-* style sheets should have the same version string. // Register "meta" stylesheet for admin colors. All colors-* style sheets should have the same version string.
$styles->add( 'colors', true, array(), $colors_version ); $styles->add( 'colors', true, array(), $colors_version );
@ -506,7 +506,7 @@ function wp_default_styles( &$styles ) {
$styles->add( 'theme-editor', "/wp-admin/css/theme-editor$suffix.css", array(), '20110602' ); $styles->add( 'theme-editor', "/wp-admin/css/theme-editor$suffix.css", array(), '20110602' );
$styles->add( 'press-this', "/wp-admin/css/press-this$suffix.css", array(), '20110506' ); $styles->add( 'press-this', "/wp-admin/css/press-this$suffix.css", array(), '20110506' );
$styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20090514' ); $styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20090514' );
$styles->add( 'login', "/wp-admin/css/login$suffix.css", array(), '20110121' ); $styles->add( 'login', "/wp-admin/css/login$suffix.css", array(), '20110609' );
$styles->add( 'plugin-install', "/wp-admin/css/plugin-install$suffix.css", array(), '20101230' ); $styles->add( 'plugin-install', "/wp-admin/css/plugin-install$suffix.css", array(), '20101230' );
$styles->add( 'theme-install', "/wp-admin/css/theme-install$suffix.css", array(), '20110506' ); $styles->add( 'theme-install', "/wp-admin/css/theme-install$suffix.css", array(), '20110506' );
$styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.3u' ); $styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.3u' );

23
wp-login.php
View File

@ -123,18 +123,17 @@ function login_header($title = 'Log In', $message = '', $wp_error = '') {
* @param string $input_id Which input to auto-focus * @param string $input_id Which input to auto-focus
*/ */
function login_footer($input_id = '') { function login_footer($input_id = '') {
echo "</div>\n";
if ( !empty($input_id) ) {
?> ?>
<p id="backtoblog"><a href="<?php bloginfo('url'); ?>/" title="<?php esc_attr_e('Are you lost?') ?>"><?php printf(__('&larr; Back to %s'), get_bloginfo('title', 'display' )); ?></a></p>
</div>
<?php if ( !empty($input_id) ) : ?>
<script type="text/javascript"> <script type="text/javascript">
try{document.getElementById('<?php echo $input_id; ?>').focus();}catch(e){} try{document.getElementById('<?php echo $input_id; ?>').focus();}catch(e){}
if(typeof wpOnload=='function')wpOnload(); if(typeof wpOnload=='function')wpOnload();
</script> </script>
<?php <?php endif; ?>
}
?>
<p id="backtoblog"><a href="<?php bloginfo('url'); ?>/" title="<?php esc_attr_e('Are you lost?') ?>"><?php printf(__('&larr; Back to %s'), get_bloginfo('title', 'display' )); ?></a></p>
<?php do_action('login_footer'); ?> <?php do_action('login_footer'); ?>
</body> </body>
</html> </html>
@ -664,10 +663,6 @@ default:
<a href="<?php echo site_url('wp-login.php?action=lostpassword', 'login') ?>" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a> <a href="<?php echo site_url('wp-login.php?action=lostpassword', 'login') ?>" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a>
<?php endif; ?> <?php endif; ?>
</p> </p>
</div>
<p id="backtoblog"><a href="<?php bloginfo('url'); ?>/" title="<?php esc_attr_e('Are you lost?') ?>"><?php printf(__('&larr; Back to %s'), get_bloginfo('title', 'display' )); ?></a></p>
<?php } else { ?>
</div>
<?php } ?> <?php } ?>
<script type="text/javascript"> <script type="text/javascript">
@ -695,11 +690,9 @@ wp_attempt_focus();
<?php } ?> <?php } ?>
if(typeof wpOnload=='function')wpOnload(); if(typeof wpOnload=='function')wpOnload();
</script> </script>
<?php do_action( 'login_footer' ); ?>
</body>
</html>
<?php
<?php
login_footer();
break; break;
} // end action switch } // end action switch
?> ?>