From e6e50696b83164805bec83a1b20c95a85a4dd7e5 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 21 Feb 2024 22:14:37 +0800 Subject: [PATCH] Revert #28753 because UI broken. (#29293) Revert #29255 Revert #28753 --- templates/user/auth/signin_inner.tmpl | 11 +++++++---- templates/user/auth/signin_openid.tmpl | 6 ++++-- templates/user/auth/signup_inner.tmpl | 14 ++++++++------ web_src/css/form.css | 4 ++++ web_src/css/helpers.css | 1 - 5 files changed, 23 insertions(+), 13 deletions(-) diff --git a/templates/user/auth/signin_inner.tmpl b/templates/user/auth/signin_inner.tmpl index a0aea5cb9b..40e54ec8fa 100644 --- a/templates/user/auth/signin_inner.tmpl +++ b/templates/user/auth/signin_inner.tmpl @@ -9,20 +9,21 @@ {{end}}
-
+ {{.CsrfTokenHtml}}
- +
{{if or (not .DisablePassword) .LinkAccountMode}}
- +
{{end}} {{if not .LinkAccountMode}}
+
@@ -33,6 +34,7 @@ {{template "user/auth/captcha" .}}
+
diff --git a/templates/user/auth/signup_inner.tmpl b/templates/user/auth/signup_inner.tmpl index 65ce98c31a..e930bd3d15 100644 --- a/templates/user/auth/signup_inner.tmpl +++ b/templates/user/auth/signup_inner.tmpl @@ -7,7 +7,7 @@ {{end}}
-
+ {{.CsrfTokenHtml}} {{if or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister)}} {{template "base/alert" .}} @@ -17,27 +17,28 @@ {{else}}
- +
- +
{{if not .DisablePassword}}
- +
- +
{{end}} {{template "user/auth/captcha" .}}
+