Ticket #30685: 30685.3.diff
File 30685.3.diff, 8.4 KB (added by , 8 years ago) |
---|
-
src/wp-admin/css/login.css
14 14 color: #444; 15 15 font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen-Sans", "Ubuntu", "Cantarell", "Helvetica Neue", sans-serif; 16 16 font-size: 13px; 17 line-height: 1.4 em;17 line-height: 1.4; 18 18 } 19 19 20 20 a { … … 31 31 outline: 0; 32 32 } 33 33 34 .notice a { 35 color: #0073aa; 36 text-decoration: underline; 37 } 38 34 39 a:hover, 35 40 a:active { 36 41 color: #00a0d2; … … 54 59 line-height: 1.5; 55 60 } 56 61 57 .login .message, 58 .login #login_error { 59 border-left: 4px solid #00a0d2; 60 padding: 12px; 61 margin-left: 0; 62 background-color: #fff; 63 -webkit-box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1); 64 box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1); 62 #login_error, 63 .login .notice { 64 background: #fff; 65 -webkit-box-shadow: 0 1px 1px 0 rgba( 0, 0, 0, 0.1 ); 66 box-shadow: 0 1px 1px 0 rgba( 0, 0, 0, 0.1 ); 67 margin: 20px 0; 68 padding: 0; 65 69 } 66 70 67 .login #login_error{68 border-left-color: #dc3232;71 .login .notice { 72 padding: 12px; 69 73 } 70 74 71 #loginform p.submit, 72 .login-action-lostpassword p.submit { 73 border: none; 74 margin: -10px 0 20px; /* May want to revisit this */ 75 .login .notice-info { 76 border-left: 4px solid #2ea2cc; 75 77 } 76 78 77 .login * { 78 margin: 0; 79 padding: 0; 79 .login .notice-error { 80 border-left-color: #dc3232; 80 81 } 81 82 83 .login .login-error-list { 84 list-style: none; 85 margin: 0; 86 padding: 0; 87 } 88 89 .login .login-error-list .notice { 90 margin: 1px 0; 91 } 92 93 .notice p { 94 margin: 0; 95 padding: 0; 96 } 97 82 98 .login form { 83 margin-top: 20px; 84 margin-left: 0; 99 margin: 20px 0 24px; 85 100 padding: 26px 24px 46px; 86 font-weight: normal;87 101 overflow: hidden; 88 102 background: #fff; 89 103 -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.13); … … 90 104 box-shadow: 0 1px 3px rgba(0,0,0,0.13); 91 105 } 92 106 93 .login form .forgetmenot { 94 font-weight: normal; 107 .login .forgetmenot { 95 108 float: left; 96 margin-bottom: 0;97 109 } 98 110 111 .login .forgetmenot label { 112 font-size: 12px; 113 line-height: 19px; 114 } 115 99 116 .login .button-primary { 100 117 float: right; 101 118 } 102 119 103 120 #login form p { 104 margin -bottom: 0;121 margin: 0; 105 122 } 106 123 107 124 #login form p.submit { … … 114 131 font-size: 14px; 115 132 } 116 133 117 .login form .forgetmenot label { 118 font-size: 12px; 119 line-height: 19px; 134 .login .forgetmenot { 135 float: left; 120 136 } 121 137 122 138 .login h1 { 123 text-align: center; 139 margin: 0; 140 text-align: left; 124 141 } 125 142 126 143 .login h1 a { … … 130 147 background-size: 84px; 131 148 background-position: center top; 132 149 background-repeat: no-repeat; 133 color: # 444;150 color: #6e6e6e; 134 151 height: 84px; 135 152 font-size: 20px; 136 153 font-weight: normal; 137 154 line-height: 1.3em; 138 155 margin: 0 auto 25px; 139 padding: 0;140 156 text-decoration: none; 141 157 width: 84px; 142 158 text-indent: -9999px; 143 outline: none;144 159 overflow: hidden; 145 160 display: block; 161 -webkit-box-shadow: none; 162 box-shadow: none; 146 163 } 147 164 148 165 #login { … … 151 168 margin: auto; 152 169 } 153 170 154 .login #nav, 155 .login #backtoblog { 156 font-size: 13px; 171 #nav, 172 #backtoblog { 157 173 padding: 0 24px 0; 158 174 } 159 175 160 .login #nav {161 margin: 24px 0 0 0;162 }163 164 176 #backtoblog { 165 177 margin: 16px 0; 166 178 } … … 183 195 color: #124964; 184 196 } 185 197 186 .login form .input, 187 .login input[type="text"] { 188 font-size: 24px; 189 width: 100%; 190 padding: 3px; 191 margin: 2px 6px 16px 0; 198 .login input { 199 background: #fbfbfb; 192 200 } 193 201 194 202 .login form .input, … … 197 205 background: #fbfbfb; 198 206 } 199 207 200 .ie7 .login form.input,201 .ie8 .login form.input {208 .ie7 .login .input, 209 .ie8 .login .input { 202 210 font-family: sans-serif; 203 211 } 204 212 … … 208 216 margin: 0; 209 217 } 210 218 211 .login#pass-strength-result {219 #pass-strength-result { 212 220 font-weight: 600; 213 221 margin: -1px 5px 16px 0; 214 222 padding: 6px 5px; 215 text-align: center;216 223 width: 100%; 217 224 } 218 225 219 .mobile #login {220 padding: 20px 0;221 }222 223 .mobile #login form {224 margin-left: 0;225 }226 227 .mobile #login #nav,228 .mobile #login #backtoblog {229 margin-left: 8px;230 }231 232 226 body.interim-login { 233 227 height: auto; 234 228 } … … 242 236 width: auto; 243 237 } 244 238 245 .interim-login #login_error,246 .interim-login.login .message {247 margin: 0 0 16px;248 }249 250 239 .interim-login.login form { 251 240 margin: 0; 252 241 } … … 262 251 } 263 252 264 253 .interim-login input[type=checkbox]:checked:before { 265 width: 16px;266 254 font: normal 21px/1 dashicons; 267 margin : -3px 0 0-4px;255 margin-left: -4px; 268 256 } 269 257 } -
src/wp-includes/js/wp-auth-check.js
49 49 }).attr( 'src', form.data('src') ); 50 50 51 51 form.append( frame ); 52 $( 'body' ).addClass( 'modal-open' ); 52 53 } 53 54 54 55 $( 'body' ).addClass( 'modal-open' ); -
src/wp-login.php
192 192 if ( 'message' == $severity ) 193 193 $messages .= ' ' . $error_message . "<br />\n"; 194 194 else 195 $errors .= ' ' . $error_message . "<br />\n";195 $errors .= '<li class="notice notice-error">' . $error_message . '</li>'; 196 196 } 197 197 } 198 198 if ( ! empty( $errors ) ) { … … 203 203 * 204 204 * @param string $errors Login error message. 205 205 */ 206 echo '<div id="login_error"> ' . apply_filters( 'login_errors', $errors ) . "</div>\n";206 echo '<div id="login_error"><ul class="login-error-list">' . apply_filters( 'login_errors', $errors ) . "</ul></div>\n"; 207 207 } 208 208 if ( ! empty( $messages ) ) { 209 209 /** … … 213 213 * 214 214 * @param string $messages Login messages. 215 215 */ 216 echo '< p class="message">' . apply_filters( 'login_messages', $messages ) . "</p>\n";216 echo '<div class="notice notice-info"><p>' . apply_filters( 'login_messages', $messages ) . "</p></div>\n"; 217 217 } 218 218 } 219 219 } // End of login_header() … … 247 247 * @since 3.1.0 248 248 */ 249 249 do_action( 'login_footer' ); ?> 250 <div class="clear"></div>251 250 </body> 252 251 </html> 253 252 <?php … … 530 529 */ 531 530 do_action( 'lost_password' ); 532 531 533 login_header( __('Lost Password'), '<p class="message">' . __('Please enter your username or email address. You will receive a link to create a new password via email.') . '</p>', $errors);532 login_header( __( 'Lost Password' ), '<div class="notice notice-info"><p>' . __( 'Please enter your username or email address. You will receive a link to create a new password via email.' ) . '</p></div>', $errors ); 534 533 535 534 $user_login = isset($_POST['user_login']) ? wp_unslash($_POST['user_login']) : ''; 536 535 … … 554 553 555 554 <p id="nav"> 556 555 <a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e('Log in') ?></a> 556 <a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php _e( 'Lost your password?' ); ?></a> 557 557 <?php 558 558 if ( get_option( 'users_can_register' ) ) : 559 559 $registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) ); … … 616 616 if ( ( ! $errors->get_error_code() ) && isset( $_POST['pass1'] ) && !empty( $_POST['pass1'] ) ) { 617 617 reset_password($user, $_POST['pass1']); 618 618 setcookie( $rp_cookie, ' ', time() - YEAR_IN_SECONDS, $rp_path, COOKIE_DOMAIN, is_ssl(), true ); 619 login_header( __( 'Password Reset' ), '< p class="message reset-pass">' . __( 'Your password has been reset.' ) . ' <a href="' . esc_url( wp_login_url() ) . '">' . __( 'Log in' ) . '</a></p>' );619 login_header( __( 'Password Reset' ), '<div class="notice notice-info"><p>' . __( 'Your password has been reset.' ) . ' <a href="' . esc_url( wp_login_url() ) . '">' . __( 'Log in' ) . '</a></p></div>' ); 620 620 login_footer(); 621 621 exit; 622 622 } … … 624 624 wp_enqueue_script('utils'); 625 625 wp_enqueue_script('user-profile'); 626 626 627 login_header( __('Reset Password'), '<p class="message reset-pass">' . __('Enter your new password below.') . '</p>', $errors );627 login_header( __( 'Reset Password' ), '<div class="notice notice-info"><p>' . __( 'Enter your new password below.' ) . '</p></div>', $errors ); 628 628 629 629 ?> 630 630 <form name="resetpassform" id="resetpassform" action="<?php echo esc_url( network_site_url( 'wp-login.php?action=resetpass', 'login_post' ) ); ?>" method="post" autocomplete="off"> … … 649 649 </p> 650 650 651 651 <p class="description indicator-hint"><?php echo wp_get_password_hint(); ?></p> 652 <br class="clear" />653 652 654 653 <?php 655 654 /** … … 941 940 endif; 942 941 ?> 943 942 <a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php _e( 'Lost your password?' ); ?></a> 944 <?php endif; ?>945 943 </p> 946 944 <?php } ?> 947 945