From 04c1c825e9eb2239aff064eef97b99b9ad360945 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Wed, 16 Sep 2015 11:45:09 +0000
Subject: [PATCH] Reset Password: Move `<div>` out of `<p>` in `wp-login.php`.

Props ldinclaux.
Fixes #33892.

git-svn-id: https://develop.svn.wordpress.org/trunk@34232 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-login.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/wp-login.php b/src/wp-login.php
index 9167bf8ef9..e267928eeb 100644
--- a/src/wp-login.php
+++ b/src/wp-login.php
@@ -653,16 +653,18 @@ case 'rp' :
 	<input type="hidden" id="user_login" value="<?php echo esc_attr( $rp_login ); ?>" autocomplete="off" />
 
 	<p class="user-pass1-wrap">
-		<label for="pass1"><?php _e('New password') ?></label><br />
-		<div class="wp-pwd">
-			<span class="password-input-wrapper">
-				<input type="password" data-reveal="1" data-pw="<?php echo esc_attr( wp_generate_password( 16 ) ); ?>" name="pass1" id="pass1" class="input" size="20" value="" autocomplete="off" aria-describedby="pass-strength-result" />
-			</span>
-			<div id="pass-strength-result" class="hide-if-no-js" aria-live="polite"><?php _e( 'Strength indicator' ); ?></div>
-		</div>
+		<label for="pass1"><?php _e( 'New password' ) ?></label>
 	</p>
+
+	<div class="wp-pwd">
+		<span class="password-input-wrapper">
+			<input type="password" data-reveal="1" data-pw="<?php echo esc_attr( wp_generate_password( 16 ) ); ?>" name="pass1" id="pass1" class="input" size="20" value="" autocomplete="off" aria-describedby="pass-strength-result" />
+		</span>
+		<div id="pass-strength-result" class="hide-if-no-js" aria-live="polite"><?php _e( 'Strength indicator' ); ?></div>
+	</div>
+
 	<p class="user-pass2-wrap">
-		<label for="pass2"><?php _e('Confirm new password') ?></label><br />
+		<label for="pass2"><?php _e( 'Confirm new password' ) ?></label><br />
 		<input type="password" name="pass2" id="pass2" class="input" size="20" value="" autocomplete="off" />
 	</p>