From b14d9130234487d48f5559ea8dcdf1ecaa13f4ca Mon Sep 17 00:00:00 2001
From: Dion Hulse <contact@dd32.id.au>
Date: Tue, 14 Feb 2023 13:54:54 +1000
Subject: [PATCH 1/2] Include whitespace between the leading text and the
 actual input.

---
 providers/class-two-factor-backup-codes.php | 3 ++-
 providers/class-two-factor-email.php        | 1 +
 providers/class-two-factor-totp.php         | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/providers/class-two-factor-backup-codes.php b/providers/class-two-factor-backup-codes.php
index d4df12ef..5fd6961d 100644
--- a/providers/class-two-factor-backup-codes.php
+++ b/providers/class-two-factor-backup-codes.php
@@ -327,7 +327,8 @@ public static function codes_remaining_for_user( $user ) {
 	public function authentication_page( $user ) {
 		require_once ABSPATH . '/wp-admin/includes/template.php';
 		?>
-		<p><?php esc_html_e( 'Enter a backup verification code.', 'two-factor' ); ?></p><br/>
+		<p><?php esc_html_e( 'Enter a backup verification code.', 'two-factor' ); ?></p>
+		<br/>
 		<p>
 			<label for="authcode"><?php esc_html_e( 'Verification Code:', 'two-factor' ); ?></label>
 			<input type="tel" name="two-factor-backup-code" id="authcode" class="input" value="" size="20" pattern="[0-9]*" />
diff --git a/providers/class-two-factor-email.php b/providers/class-two-factor-email.php
index 5946c719..95745aa9 100644
--- a/providers/class-two-factor-email.php
+++ b/providers/class-two-factor-email.php
@@ -267,6 +267,7 @@ public function authentication_page( $user ) {
 		require_once ABSPATH . '/wp-admin/includes/template.php';
 		?>
 		<p><?php esc_html_e( 'A verification code has been sent to the email address associated with your account.', 'two-factor' ); ?></p>
+		<br/>
 		<p>
 			<label for="authcode"><?php esc_html_e( 'Verification Code:', 'two-factor' ); ?></label>
 			<input type="tel" name="two-factor-email-code" id="authcode" class="input" value="" size="20" />
diff --git a/providers/class-two-factor-totp.php b/providers/class-two-factor-totp.php
index ac20ae9f..f2ccb299 100644
--- a/providers/class-two-factor-totp.php
+++ b/providers/class-two-factor-totp.php
@@ -641,6 +641,7 @@ public function authentication_page( $user ) {
 		<p>
 			<?php esc_html_e( 'Please enter the code generated by your authenticator app.', 'two-factor' ); ?>
 		</p>
+		<br/>
 		<p>
 			<label for="authcode"><?php esc_html_e( 'Authentication Code:', 'two-factor' ); ?></label>
 			<input type="tel" autocomplete="one-time-code" name="authcode" id="authcode" class="input" value="" size="20" pattern="[0-9]*" />

From 4d447247be02b7feaa902daa5d424ead865d71f5 Mon Sep 17 00:00:00 2001
From: Dion Hulse <contact@dd32.id.au>
Date: Tue, 14 Feb 2023 14:03:38 +1000
Subject: [PATCH 2/2] Switch from using <br> to using CSS.

---
 class-two-factor-core.php                   | 3 +++
 providers/class-two-factor-backup-codes.php | 3 +--
 providers/class-two-factor-email.php        | 3 +--
 providers/class-two-factor-totp.php         | 3 +--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/class-two-factor-core.php b/class-two-factor-core.php
index 20877a07..9d57c16d 100644
--- a/class-two-factor-core.php
+++ b/class-two-factor-core.php
@@ -772,6 +772,9 @@ public static function login_html( $user, $login_nonce, $redirect_to, $error_msg
 			.jetpack-sso-form-display #loginform > div {
 			display: block;
 			}
+			#login form p.two-factor-prompt {
+			margin-bottom: 1em;
+			}
 		</style>
 
 		<?php
diff --git a/providers/class-two-factor-backup-codes.php b/providers/class-two-factor-backup-codes.php
index 5fd6961d..76fd5ec2 100644
--- a/providers/class-two-factor-backup-codes.php
+++ b/providers/class-two-factor-backup-codes.php
@@ -327,8 +327,7 @@ public static function codes_remaining_for_user( $user ) {
 	public function authentication_page( $user ) {
 		require_once ABSPATH . '/wp-admin/includes/template.php';
 		?>
-		<p><?php esc_html_e( 'Enter a backup verification code.', 'two-factor' ); ?></p>
-		<br/>
+		<p class="two-factor-prompt"><?php esc_html_e( 'Enter a backup verification code.', 'two-factor' ); ?></p>
 		<p>
 			<label for="authcode"><?php esc_html_e( 'Verification Code:', 'two-factor' ); ?></label>
 			<input type="tel" name="two-factor-backup-code" id="authcode" class="input" value="" size="20" pattern="[0-9]*" />
diff --git a/providers/class-two-factor-email.php b/providers/class-two-factor-email.php
index 95745aa9..b8566c11 100644
--- a/providers/class-two-factor-email.php
+++ b/providers/class-two-factor-email.php
@@ -266,8 +266,7 @@ public function authentication_page( $user ) {
 
 		require_once ABSPATH . '/wp-admin/includes/template.php';
 		?>
-		<p><?php esc_html_e( 'A verification code has been sent to the email address associated with your account.', 'two-factor' ); ?></p>
-		<br/>
+		<p class="two-factor-prompt"><?php esc_html_e( 'A verification code has been sent to the email address associated with your account.', 'two-factor' ); ?></p>
 		<p>
 			<label for="authcode"><?php esc_html_e( 'Verification Code:', 'two-factor' ); ?></label>
 			<input type="tel" name="two-factor-email-code" id="authcode" class="input" value="" size="20" />
diff --git a/providers/class-two-factor-totp.php b/providers/class-two-factor-totp.php
index f2ccb299..01d4aad0 100644
--- a/providers/class-two-factor-totp.php
+++ b/providers/class-two-factor-totp.php
@@ -638,10 +638,9 @@ public function is_available_for_user( $user ) {
 	public function authentication_page( $user ) {
 		require_once ABSPATH . '/wp-admin/includes/template.php';
 		?>
-		<p>
+		<p class="two-factor-prompt">
 			<?php esc_html_e( 'Please enter the code generated by your authenticator app.', 'two-factor' ); ?>
 		</p>
-		<br/>
 		<p>
 			<label for="authcode"><?php esc_html_e( 'Authentication Code:', 'two-factor' ); ?></label>
 			<input type="tel" autocomplete="one-time-code" name="authcode" id="authcode" class="input" value="" size="20" pattern="[0-9]*" />