From 50b3af4e872d47d6702b8e9ae6e286e56eeec86e Mon Sep 17 00:00:00 2001
From: leozhang2018 <leozhang2018@gmail.com>
Date: Wed, 17 Nov 2021 15:27:40 +0800
Subject: [PATCH 1/3] Add UsernamePrompt to password.

Signed-off-by: leozhang2018 <leozhang2018@gmail.com>
---
 custom-web/templates/password.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/custom-web/templates/password.html b/custom-web/templates/password.html
index f2616069ae..418eb8ceab 100644
--- a/custom-web/templates/password.html
+++ b/custom-web/templates/password.html
@@ -13,16 +13,16 @@
         <label for="password">密码</label>
         <input required id="password" name="password" type="password" class="form-control" placeholder="请输入密码" {{ if .Invalid }} autofocus {{ end }}/>
       </div>
-      <!-- {{ if .Invalid }}
+      {{ if .Invalid }}
       <p class="text-left">{{ .UsernamePrompt }} 和密码不正确</p>
-      {{ end }} -->
+      {{ end }}
       <button type="submit" class="btn btn-primary btn-md btn-block">登录</button>
   </form>
-  <!-- {{ if .BackLink }} -->
+  {{ if .BackLink }}
   <div class="link-back">
     <a class="dex-subtle-text" href="{{ .BackLink }}">选择其它登录方式</a>
   </div>
-  <!-- {{ end }} -->
+  {{ end }}
 </div>
 
 {{ template "footer.html" . }}

From 2e5bb05d5e14c254d5022d56da62aefb103f8922 Mon Sep 17 00:00:00 2001
From: leozhang2018 <leozhang2018@gmail.com>
Date: Wed, 17 Nov 2021 15:45:24 +0800
Subject: [PATCH 2/3] Set style to error text.

Signed-off-by: leozhang2018 <leozhang2018@gmail.com>
---
 custom-web/static/main.css         | 7 ++++++-
 custom-web/templates/password.html | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/custom-web/static/main.css b/custom-web/static/main.css
index 579eae51aa..3e05e3615a 100644
--- a/custom-web/static/main.css
+++ b/custom-web/static/main.css
@@ -117,10 +117,15 @@ a {
 }
 
 .login .login-inner-form .form-group {
-  margin-bottom: 25px;
+  margin-bottom: 15px;
   text-align: left;
 }
 
+.login .login-inner-form .error-text {
+  margin-bottom: 5px;
+  color: #f56c6c;
+}
+
 .login .login-inner-form .input-text {
   width: 100%;
   height: 45px;
diff --git a/custom-web/templates/password.html b/custom-web/templates/password.html
index 418eb8ceab..8d98cd69dd 100644
--- a/custom-web/templates/password.html
+++ b/custom-web/templates/password.html
@@ -14,7 +14,7 @@
         <input required id="password" name="password" type="password" class="form-control" placeholder="请输入密码" {{ if .Invalid }} autofocus {{ end }}/>
       </div>
       {{ if .Invalid }}
-      <p class="text-left">{{ .UsernamePrompt }} 和密码不正确</p>
+      <p class="text-left error-text">{{ .UsernamePrompt }}和密码不正确</p>
       {{ end }}
       <button type="submit" class="btn btn-primary btn-md btn-block">登录</button>
   </form>

From bf2e85a78dedc8b08c8a25fda3faae30c9d81c88 Mon Sep 17 00:00:00 2001
From: leozhang2018 <leozhang2018@gmail.com>
Date: Wed, 17 Nov 2021 15:47:17 +0800
Subject: [PATCH 3/3] Fix typo.

Signed-off-by: leozhang2018 <leozhang2018@gmail.com>
---
 custom-web/templates/password.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custom-web/templates/password.html b/custom-web/templates/password.html
index 8d98cd69dd..2ba73f6dff 100644
--- a/custom-web/templates/password.html
+++ b/custom-web/templates/password.html
@@ -14,7 +14,7 @@
         <input required id="password" name="password" type="password" class="form-control" placeholder="请输入密码" {{ if .Invalid }} autofocus {{ end }}/>
       </div>
       {{ if .Invalid }}
-      <p class="text-left error-text">{{ .UsernamePrompt }}和密码不正确</p>
+      <p class="text-left error-text">{{ .UsernamePrompt }}或密码不正确</p>
       {{ end }}
       <button type="submit" class="btn btn-primary btn-md btn-block">登录</button>
   </form>