From 22919c8fd9966ce453fb9a9bbb7c97a10490ac30 Mon Sep 17 00:00:00 2001
From: Tanvir Ahmad Arjel <tanvir.arjel@outlook.com>
Date: Fri, 1 Jul 2022 02:43:46 +0600
Subject: [PATCH] Identity UI: Input forms' `form-floating` broken styles
fixed. (#42075)
All the broken `form-floating` thought the Identity UI forms has been fixed.
---
.../Pages/V5/Account/ExternalLogin.cshtml | 6 +++---
.../Areas/Identity/Pages/V5/Account/Login.cshtml | 14 ++++++--------
.../Pages/V5/Account/LoginWith2fa.cshtml | 16 +++++++---------
.../V5/Account/LoginWithRecoveryCode.cshtml | 4 ++--
.../V5/Account/Manage/ChangePassword.cshtml | 12 ++++++------
.../V5/Account/Manage/DeletePersonalData.cshtml | 4 ++--
.../Pages/V5/Account/Manage/Email.cshtml | 12 ++++++------
.../V5/Account/Manage/EnableAuthenticator.cshtml | 4 ++--
.../Pages/V5/Account/Manage/Index.cshtml | 8 ++++----
.../Pages/V5/Account/Manage/SetPassword.cshtml | 8 ++++----
.../Pages/V5/Account/ResetPassword.cshtml | 10 +++++-----
11 files changed, 47 insertions(+), 51 deletions(-)
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/ExternalLogin.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/ExternalLogin.cshtml
index eb838fc7672..71c9fa2b664 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/ExternalLogin.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/ExternalLogin.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
@model ExternalLoginModel
@{
ViewData["Title"] = "Register";
@@ -18,8 +18,8 @@
<div class="col-md-4">
<form asp-page-handler="Confirmation" asp-route-returnUrl="@Model.ReturnUrl" method="post">
<div asp-validation-summary="ModelOnly" class="text-danger" role="alert"></div>
- <div class="form-floating">
- <input asp-for="Input.Email" class="form-control" autocomplete="email" />
+ <div class="form-floating mb-3">
+ <input asp-for="Input.Email" class="form-control" autocomplete="email" placeholder="Please enter your email."/>
<label asp-for="Input.Email" class="form-label"></label>
<span asp-validation-for="Input.Email" class="text-danger"></span>
</div>
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/Login.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/Login.cshtml
index c7dbd6c6f33..6354164a81a 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/Login.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/Login.cshtml
@@ -18,18 +18,16 @@
<label asp-for="Input.Email" class="form-label">Email</label>
<span asp-validation-for="Input.Email" class="text-danger"></span>
</div>
- <div class="form-floating">
+ <div class="form-floating mb-3">
<input asp-for="Input.Password" class="form-control" autocomplete="current-password" aria-required="true" placeholder="password" />
<label asp-for="Input.Password" class="form-label">Password</label>
<span asp-validation-for="Input.Password" class="text-danger"></span>
</div>
- <div>
- <div class="checkbox">
- <label asp-for="Input.RememberMe" class="form-label">
- <input class="form-check-input" asp-for="Input.RememberMe" />
- @Html.DisplayNameFor(m => m.Input.RememberMe)
- </label>
- </div>
+ <div class="checkbox mb-3">
+ <label asp-for="Input.RememberMe" class="form-label">
+ <input class="form-check-input" asp-for="Input.RememberMe" />
+ @Html.DisplayNameFor(m => m.Input.RememberMe)
+ </label>
</div>
<div>
<button id="login-submit" type="submit" class="w-100 btn btn-lg btn-primary">Log in</button>
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/LoginWith2fa.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/LoginWith2fa.cshtml
index f117a6b4e45..047462d71b1 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/LoginWith2fa.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/LoginWith2fa.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
@model LoginWith2faModel
@{
ViewData["Title"] = "Two-factor authentication";
@@ -12,18 +12,16 @@
<form method="post" asp-route-returnUrl="@Model.ReturnUrl">
<input asp-for="RememberMe" type="hidden" />
<div asp-validation-summary="ModelOnly" class="text-danger" role="alert"></div>
- <div class="form-floating">
+ <div class="form-floating mb-3">
<input asp-for="Input.TwoFactorCode" class="form-control" autocomplete="off" />
<label asp-for="Input.TwoFactorCode" class="form-label"></label>
<span asp-validation-for="Input.TwoFactorCode" class="text-danger"></span>
</div>
- <div>
- <div class="checkbox">
- <label asp-for="Input.RememberMachine" class="form-label">
- <input asp-for="Input.RememberMachine" />
- @Html.DisplayNameFor(m => m.Input.RememberMachine)
- </label>
- </div>
+ <div class="checkbox mb-3">
+ <label asp-for="Input.RememberMachine" class="form-label">
+ <input asp-for="Input.RememberMachine" />
+ @Html.DisplayNameFor(m => m.Input.RememberMachine)
+ </label>
</div>
<div>
<button type="submit" class="w-100 btn btn-lg btn-primary">Log in</button>
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/LoginWithRecoveryCode.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/LoginWithRecoveryCode.cshtml
index 503fbf16166..0d44e37d0f7 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/LoginWithRecoveryCode.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/LoginWithRecoveryCode.cshtml
@@ -14,8 +14,8 @@
<div class="col-md-4">
<form method="post">
<div asp-validation-summary="ModelOnly" class="text-danger" role="alert"></div>
- <div class="form-floating">
- <input asp-for="Input.RecoveryCode" class="form-control" autocomplete="off" />
+ <div class="form-floating mb-3">
+ <input asp-for="Input.RecoveryCode" class="form-control" autocomplete="off" placeholder="RecoveryCode" />
<label asp-for="Input.RecoveryCode" class="form-label"></label>
<span asp-validation-for="Input.RecoveryCode" class="text-danger"></span>
</div>
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/Manage/ChangePassword.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/Manage/ChangePassword.cshtml
index 3bcae81e716..073603a30c5 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/Manage/ChangePassword.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/Manage/ChangePassword.cshtml
@@ -11,18 +11,18 @@
<div class="col-md-6">
<form id="change-password-form" method="post">
<div asp-validation-summary="ModelOnly" class="text-danger" role="alert"></div>
- <div class="form-floating">
- <input asp-for="Input.OldPassword" class="form-control" autocomplete="current-password" aria-required="true" />
+ <div class="form-floating mb-3">
+ <input asp-for="Input.OldPassword" class="form-control" autocomplete="current-password" aria-required="true" placeholder="Please enter your old password." />
<label asp-for="Input.OldPassword" class="form-label"></label>
<span asp-validation-for="Input.OldPassword" class="text-danger"></span>
</div>
- <div class="form-floating">
- <input asp-for="Input.NewPassword" class="form-control" autocomplete="new-password" aria-required="true" />
+ <div class="form-floating mb-3">
+ <input asp-for="Input.NewPassword" class="form-control" autocomplete="new-password" aria-required="true" placeholder="Please enter your new password." />
<label asp-for="Input.NewPassword" class="form-label"></label>
<span asp-validation-for="Input.NewPassword" class="text-danger"></span>
</div>
- <div class="form-floating">
- <input asp-for="Input.ConfirmPassword" class="form-control" autocomplete="new-password" aria-required="true" />
+ <div class="form-floating mb-3">
+ <input asp-for="Input.ConfirmPassword" class="form-control" autocomplete="new-password" aria-required="true" placeholder="Please confirm your new password."/>
<label asp-for="Input.ConfirmPassword" class="form-label"></label>
<span asp-validation-for="Input.ConfirmPassword" class="text-danger"></span>
</div>
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/Manage/DeletePersonalData.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/Manage/DeletePersonalData.cshtml
index cbc1a7a5704..cecdd1d2335 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/Manage/DeletePersonalData.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/Manage/DeletePersonalData.cshtml
@@ -18,8 +18,8 @@
<div asp-validation-summary="ModelOnly" class="text-danger" role="alert"></div>
@if (Model.RequirePassword)
{
- <div class="form-floating">
- <input asp-for="Input.Password" class="form-control" autocomplete="current-password" aria-required="true" />
+ <div class="form-floating mb-3">
+ <input asp-for="Input.Password" class="form-control" autocomplete="current-password" aria-required="true" placeholder="Please enter your password." />
<label asp-for="Input.Password" class="form-label"></label>
<span asp-validation-for="Input.Password" class="text-danger"></span>
</div>
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/Manage/Email.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/Manage/Email.cshtml
index 8a251c0c296..f3278e9ef56 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/Manage/Email.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/Manage/Email.cshtml
@@ -13,8 +13,8 @@
<div asp-validation-summary="All" class="text-danger" role="alert"></div>
@if (Model.IsEmailConfirmed)
{
- <div class="form-floating input-group">
- <input asp-for="Email" class="form-control" disabled />
+ <div class="form-floating mb-3 input-group">
+ <input asp-for="Email" class="form-control" placeholder="Please enter your email." disabled />
<div class="input-group-append">
<span class="h-100 input-group-text text-success font-weight-bold">✓</span>
</div>
@@ -23,14 +23,14 @@
}
else
{
- <div class="form-floating">
- <input asp-for="Email" class="form-control" disabled />
+ <div class="form-floating mb-3">
+ <input asp-for="Email" class="form-control" placeholder="Please enter your email." disabled />
<label asp-for="Email" class="form-label"></label>
<button id="email-verification" type="submit" asp-page-handler="SendVerificationEmail" class="btn btn-link">Send verification email</button>
</div>
}
- <div class="form-floating">
- <input asp-for="Input.NewEmail" class="form-control" autocomplete="email" aria-required="true" />
+ <div class="form-floating mb-3">
+ <input asp-for="Input.NewEmail" class="form-control" autocomplete="email" aria-required="true" placeholder="Please enter new email." />
<label asp-for="Input.NewEmail" class="form-label"></label>
<span asp-validation-for="Input.NewEmail" class="text-danger"></span>
</div>
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/Manage/EnableAuthenticator.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/Manage/EnableAuthenticator.cshtml
index 8742fd3fa47..fefa57f2b7e 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/Manage/EnableAuthenticator.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/Manage/EnableAuthenticator.cshtml
@@ -34,8 +34,8 @@
<div class="row">
<div class="col-md-6">
<form id="send-code" method="post">
- <div class="form-floating">
- <input asp-for="Input.Code" class="form-control" autocomplete="off" />
+ <div class="form-floating mb-3">
+ <input asp-for="Input.Code" class="form-control" autocomplete="off" placeholder="Please enter the code."/>
<label asp-for="Input.Code" class="control-label form-label">Verification Code</label>
<span asp-validation-for="Input.Code" class="text-danger"></span>
</div>
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/Manage/Index.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/Manage/Index.cshtml
index 47f9fe22124..94b669d625f 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/Manage/Index.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/Manage/Index.cshtml
@@ -11,12 +11,12 @@
<div class="col-md-6">
<form id="profile-form" method="post">
<div asp-validation-summary="ModelOnly" class="text-danger" role="alert"></div>
- <div class="form-floating">
- <input asp-for="Username" class="form-control" disabled />
+ <div class="form-floating mb-3">
+ <input asp-for="Username" class="form-control" placeholder="Please choose your username." disabled />
<label asp-for="Username" class="form-label"></label>
</div>
- <div class="form-floating">
- <input asp-for="Input.PhoneNumber" class="form-control" />
+ <div class="form-floating mb-3">
+ <input asp-for="Input.PhoneNumber" class="form-control" placeholder="Please enter your phone number."/>
<label asp-for="Input.PhoneNumber" class="form-label"></label>
<span asp-validation-for="Input.PhoneNumber" class="text-danger"></span>
</div>
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/Manage/SetPassword.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/Manage/SetPassword.cshtml
index 05af7edb569..a4ba058be4c 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/Manage/SetPassword.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/Manage/SetPassword.cshtml
@@ -15,13 +15,13 @@
<div class="col-md-6">
<form id="set-password-form" method="post">
<div asp-validation-summary="ModelOnly" class="text-danger" role="alert"></div>
- <div class="form-floating">
- <input asp-for="Input.NewPassword" class="form-control" autocomplete="new-password" />
+ <div class="form-floating mb-3">
+ <input asp-for="Input.NewPassword" class="form-control" autocomplete="new-password" placeholder="Please enter your new password."/>
<label asp-for="Input.NewPassword" class="form-label"></label>
<span asp-validation-for="Input.NewPassword" class="text-danger"></span>
</div>
- <div class="form-floating">
- <input asp-for="Input.ConfirmPassword" class="form-control" autocomplete="new-password" />
+ <div class="form-floating mb-3">
+ <input asp-for="Input.ConfirmPassword" class="form-control" autocomplete="new-password" placeholder="Please confirm your new password."/>
<label asp-for="Input.ConfirmPassword" class="form-label"></label>
<span asp-validation-for="Input.ConfirmPassword" class="text-danger"></span>
</div>
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/ResetPassword.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/ResetPassword.cshtml
index d0ea1bd126a..1133dd995c0 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/ResetPassword.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V5/Account/ResetPassword.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
@model ResetPasswordModel
@{
ViewData["Title"] = "Reset password";
@@ -17,13 +17,13 @@
<label asp-for="Input.Email" class="form-label"></label>
<span asp-validation-for="Input.Email" class="text-danger"></span>
</div>
- <div class="form-floating">
- <input asp-for="Input.Password" class="form-control" autocomplete="new-password" aria-required="true" />
+ <div class="form-floating mb-3">
+ <input asp-for="Input.Password" class="form-control" autocomplete="new-password" aria-required="true" placeholder="Please enter your password." />
<label asp-for="Input.Password" class="form-label"></label>
<span asp-validation-for="Input.Password" class="text-danger"></span>
</div>
- <div class="form-floating">
- <input asp-for="Input.ConfirmPassword" class="form-control" autocomplete="new-password" aria-required="true" />
+ <div class="form-floating mb-3">
+ <input asp-for="Input.ConfirmPassword" class="form-control" autocomplete="new-password" aria-required="true" placeholder="Please confirm your password." />
<label asp-for="Input.ConfirmPassword" class="form-label"></label>
<span asp-validation-for="Input.ConfirmPassword" class="text-danger"></span>
</div>
--
GitLab