Index: src/wp-admin/css/login.css =================================================================== --- src/wp-admin/css/login.css (revision 33091) +++ src/wp-admin/css/login.css (working copy) @@ -18,7 +18,7 @@ color: #444; font-family: "Open Sans", sans-serif; font-size: 13px; - line-height: 1.4em; + line-height: 1.4; } a { @@ -35,6 +35,11 @@ outline: 0; } +.notice a { + color: #0073aa; + text-decoration: underline; +} + a:hover, a:active { color: #00a0d2; @@ -58,37 +63,45 @@ line-height: 1.5; } -.login .message { - border-left: 4px solid #00a0d2; - padding: 1px 12px; - background-color: #fff; - -webkit-box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1); - box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1); +#login_error, +.login .notice { + background: #fff; + -webkit-box-shadow: 0 1px 1px 0 rgba( 0, 0, 0, 0.1 ); + box-shadow: 0 1px 1px 0 rgba( 0, 0, 0, 0.1 ); + margin: 20px 0; + padding: 0; } -.login #login_error { +.login .notice { + padding: 12px; +} + +.login .notice-info { + border-left: 4px solid #2ea2cc; +} + +.login .notice-error { border-left: 4px solid #dd3d36; - background: #fff; - -webkit-box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1); - box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1); } -#loginform p.submit, -.login-action-lostpassword p.submit { - border: none; - margin: -10px 0 20px; /* May want to revisit this */ +.login .login-error-list { + list-style: none; + margin: 0; + padding: 0; } -.login * { +.login .login-error-list .notice { + margin: 1px 0; +} + +.notice p { margin: 0; padding: 0; } .login form { - margin-top: 20px; - margin-left: 0; + margin: 20px 0 24px; padding: 26px 24px 46px; - font-weight: normal; overflow: hidden; background: #fff; -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.13); @@ -95,10 +108,8 @@ box-shadow: 0 1px 3px rgba(0,0,0,0.13); } -.login form .forgetmenot { - font-weight: normal; +.login .forgetmenot { float: left; - margin-bottom: 0; } .login .button-primary { @@ -106,10 +117,15 @@ } #login form p { - margin-bottom: 0; + margin: 0; } -#login form p.submit { +#login #reg_passmail, +#login .description.indicator-hint { + margin-bottom: 18px; +} + +#login .submit { margin: 0; padding: 0; } @@ -119,13 +135,14 @@ font-size: 14px; } -.login form .forgetmenot label { +.login .forgetmenot label { font-size: 12px; line-height: 19px; } .login h1 { - text-align: center; + margin: 0; + text-align: left; } .login h1 a { @@ -135,19 +152,19 @@ background-size: 84px; background-position: center top; background-repeat: no-repeat; - color: #999; + color: #6e6e6e; height: 84px; font-size: 20px; font-weight: normal; line-height: 1.3em; margin: 0 auto 25px; - padding: 0; text-decoration: none; width: 84px; text-indent: -9999px; - outline: none; overflow: hidden; display: block; + -webkit-box-shadow: none; + box-shadow: none; } #login { @@ -156,22 +173,11 @@ margin: auto; } -#login_error, -.login .message { - margin-left: 0; - padding: 12px; -} - -.login #nav, -.login #backtoblog { - font-size: 13px; +#nav, +#backtoblog { padding: 0 24px 0; } -.login #nav { - margin: 24px 0 0 0; -} - #backtoblog { margin: 16px 0 0 0; } @@ -202,23 +208,20 @@ margin: 2px 6px 16px 0; } -.login form .input, -.login input[type="text"], -.login form input[type="checkbox"] { +.login input { background: #fbfbfb; } -.ie7 .login form .input, -.ie8 .login form .input { +.ie7 .login .input, +.ie8 .login .input { font-family: sans-serif; } -.login #pass-strength-result { +#pass-strength-result { width: 250px; font-weight: 600; margin: 12px 0 6px; padding: 6px 5px; - text-align: center; } .mobile #login { @@ -225,17 +228,6 @@ padding: 20px 0; } -.mobile #login form, -.mobile #login .message, -.mobile #login_error { - margin-left: 0; -} - -.mobile #login #nav, -.mobile #login #backtoblog { - margin-left: 8px; -} - body.interim-login { height: auto; } @@ -249,11 +241,6 @@ width: auto; } -.interim-login #login_error, -.interim-login.login .message { - margin: 0 0 16px; -} - .interim-login.login form { margin: 0; } @@ -269,8 +256,7 @@ } .interim-login input[type=checkbox]:checked:before { - width: 16px; font: normal 21px/1 'dashicons'; - margin: -3px 0 0 -4px; + margin-left: -4px; } } Index: src/wp-includes/js/wp-auth-check.js =================================================================== --- src/wp-includes/js/wp-auth-check.js (revision 33091) +++ src/wp-includes/js/wp-auth-check.js (working copy) @@ -47,6 +47,7 @@ }).attr( 'src', form.data('src') ); $('#wp-auth-check-form').append( frame ); + $( 'body' ).addClass( 'modal-open' ); } $( 'body' ).addClass( 'modal-open' ); Index: src/wp-login.php =================================================================== --- src/wp-login.php (revision 33091) +++ src/wp-login.php (working copy) @@ -180,9 +180,10 @@ if ( 'message' == $severity ) $messages .= ' ' . $error_message . "
\n"; else - $errors .= ' ' . $error_message . "
\n"; + $errors .= '
  • ' . $error_message . '
    • '; } } + if ( ! empty( $errors ) ) { /** * Filter the error messages displayed above the login form. @@ -191,7 +192,7 @@ * * @param string $errors Login error message. */ - echo '
    ' . apply_filters( 'login_errors', $errors ) . "
    \n"; + echo '
    \n"; } if ( ! empty( $messages ) ) { /** @@ -201,7 +202,7 @@ * * @param string $messages Login messages. */ - echo '

    ' . apply_filters( 'login_messages', $messages ) . "

    \n"; + echo '

    ' . apply_filters( 'login_messages', $messages ) . "

    \n"; } } } // End of login_header() @@ -216,7 +217,7 @@ // Don't allow interim logins to navigate away from the page. if ( ! $interim_login ): ?> -

    +

    @@ -235,7 +236,6 @@ * @since 3.1.0 */ do_action( 'login_footer' ); ?> -
    ' . __('Please enter your username or email address. You will receive a link to create a new password via email.') . '

    ', $errors); + login_header( __( 'Lost Password' ), '

    ' . __( 'Please enter your username or email address. You will receive a link to create a new password via email.' ) . '

    ', $errors ); $user_login = isset($_POST['user_login']) ? wp_unslash($_POST['user_login']) : ''; @@ -638,7 +638,7 @@ if ( ( ! $errors->get_error_code() ) && isset( $_POST['pass1'] ) && !empty( $_POST['pass1'] ) ) { reset_password($user, $_POST['pass1']); setcookie( $rp_cookie, ' ', time() - YEAR_IN_SECONDS, $rp_path, COOKIE_DOMAIN, is_ssl(), true ); - login_header( __( 'Password Reset' ), '

    ' . __( 'Your password has been reset.' ) . ' ' . __( 'Log in' ) . '

    ' ); + login_header( __( 'Password Reset' ), '

    ' . __( 'Your password has been reset.' ) . ' ' . __( 'Log in' ) . '

    ' ); login_footer(); exit; } @@ -646,7 +646,7 @@ wp_enqueue_script('utils'); wp_enqueue_script('user-profile'); - login_header(__('Reset Password'), '

    ' . __('Enter your new password below.') . '

    ', $errors ); + login_header( __( 'Reset Password' ), '

    ' . __( 'Enter your new password below.' ) . '

    ', $errors ); ?>
    @@ -665,7 +665,6 @@

    -
    ' . __('Register For This Site') . '

    ', $errors); + login_header( __( 'Registration Form' ), '

    ' . __( 'Register for this site.' ) . '

    ', $errors ); ?> @@ -758,7 +757,6 @@ do_action( 'register_form' ); ?>

    -

    @@ -765,7 +763,7 @@ ' . __('You have logged in successfully.') . '

    '; + $message = '

    ' . __( 'You have logged in successfully.' ) . '

    '; $interim_login = 'success'; login_header( '', $message ); ?> @@ -948,7 +946,7 @@ echo apply_filters( 'register', $registration_url ) . ' | '; endif; ?> - +