From 95bdc7bbe7088d979ac0fbac1ece4d759fddb18e Mon Sep 17 00:00:00 2001
From: rafh <rafaelheard@gmail.com>
Date: Wed, 10 Jan 2024 12:49:37 -0500
Subject: [PATCH 1/9] update sign form layout

---
 templates/user/auth/signin_inner.tmpl  | 106 ++++++++++++-------------
 templates/user/auth/signin_openid.tmpl |  58 +++++++-------
 templates/user/auth/signup_inner.tmpl  |  60 +++++++-------
 web_src/css/form.css                   |   7 +-
 web_src/css/helpers.css                |   2 +
 5 files changed, 114 insertions(+), 119 deletions(-)

diff --git a/templates/user/auth/signin_inner.tmpl b/templates/user/auth/signin_inner.tmpl
index 40e54ec8fa96..1305b3f48962 100644
--- a/templates/user/auth/signin_inner.tmpl
+++ b/templates/user/auth/signin_inner.tmpl
@@ -9,65 +9,63 @@
 	{{end}}
 </h4>
 <div class="ui attached segment">
-	<form class="ui form" action="{{.SignInLink}}" method="post">
-	{{.CsrfTokenHtml}}
-	<div class="required inline field {{if and (.Err_UserName) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn))}}error{{end}}">
-		<label for="user_name">{{ctx.Locale.Tr "home.uname_holder"}}</label>
-		<input id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required>
-	</div>
-	{{if or (not .DisablePassword) .LinkAccountMode}}
-	<div class="required inline field {{if and (.Err_Password) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn))}}error{{end}}">
-		<label for="password">{{ctx.Locale.Tr "password"}}</label>
-		<input id="password" name="password" type="password" value="{{.password}}" autocomplete="current-password" required>
-	</div>
-	{{end}}
-	{{if not .LinkAccountMode}}
-	<div class="inline field">
-		<label></label>
-		<div class="ui checkbox">
-			<label>{{ctx.Locale.Tr "auth.remember_me"}}</label>
-			<input name="remember" type="checkbox">
+	<form class="ui form gt-max-width-48rem gt-w-100 gt-m-auto" action="{{.SignInLink}}" method="post">
+		{{if .OAuth2Providers}}
+		<div id="oauth2-login-navigator" class="gt-py-2">
+			<div class="gt-df gt-fc gt-jc">
+				<div id="oauth2-login-navigator-inner" class="gt-df gt-fc gt-fw gt-ac gt-gap-3">
+					{{range $provider := .OAuth2Providers}}
+						<a class="{{$provider.Name}} ui button gt-df gt-ac gt-jc gt-py-3 gt-max-width-36rem gt-w-100 oauth-login-link" href="{{AppSubUrl}}/user/oauth2/{{$provider.DisplayName}}">
+							{{$provider.IconHTML 28}}
+							{{ctx.Locale.Tr "sign_in_with_provider" $provider.DisplayName}}
+						</a>
+					{{end}}
+				</div>
+			</div>
 		</div>
-	</div>
-	{{end}}
-
-	{{template "user/auth/captcha" .}}
-
-	<div class="inline field">
-		<label></label>
-		<button class="ui primary button">
-			{{if .LinkAccountMode}}
-				{{ctx.Locale.Tr "auth.oauth_signin_submit"}}
-			{{else}}
-				{{ctx.Locale.Tr "sign_in"}}
+		<div class="divider divider-text gt-mb-5 gt-mt-5">
+			{{ctx.Locale.Tr "sign_in_or"}}
+		</div>
+		{{end}}
+		<div class="gt-max-width-36rem gt-m-auto">
+			{{.CsrfTokenHtml}}
+			<div class="required inline field {{if and (.Err_UserName) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn))}}error{{end}}">
+				<label for="user_name">{{ctx.Locale.Tr "home.uname_holder"}}</label>
+				<input id="user_name" class="gt-w-100" type="text" name="user_name" value="{{.user_name}}" autofocus required>
+			</div>
+			{{if or (not .DisablePassword) .LinkAccountMode}}
+			<div class="required inline field {{if and (.Err_Password) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn))}}error{{end}}">
+				<label for="password">{{ctx.Locale.Tr "password"}}</label>
+				<input id="password" class="gt-w-100" name="password" type="password" value="{{.password}}" autocomplete="current-password" required>
+			</div>
+			{{end}}
+			{{if not .LinkAccountMode}}
+			<div class="inline field">
+				<div class="ui checkbox">
+					<label>{{ctx.Locale.Tr "auth.remember_me"}}</label>
+					<input name="remember" type="checkbox">
+				</div>
+			</div>
 			{{end}}
-		</button>
-		<a href="{{AppSubUrl}}/user/forgot_password">{{ctx.Locale.Tr "auth.forgot_password"}}</a>
-	</div>
 
-	{{if .ShowRegistrationButton}}
-		<div class="inline field">
-			<label></label>
-			<a href="{{AppSubUrl}}/user/sign_up">{{ctx.Locale.Tr "auth.sign_up_now" | Str2html}}</a>
-		</div>
-	{{end}}
+			{{template "user/auth/captcha" .}}
 
-	{{if .OAuth2Providers}}
-	<div class="divider divider-text">
-		{{ctx.Locale.Tr "sign_in_or"}}
-	</div>
-	<div id="oauth2-login-navigator" class="gt-py-2">
-		<div class="gt-df gt-fc gt-jc">
-			<div id="oauth2-login-navigator-inner" class="gt-df gt-fc gt-fw gt-ac gt-gap-3">
-				{{range $provider := .OAuth2Providers}}
-					<a class="{{$provider.Name}} ui button gt-df gt-ac gt-jc gt-py-3 oauth-login-link" href="{{AppSubUrl}}/user/oauth2/{{$provider.DisplayName}}">
-						{{$provider.IconHTML 28}}
-						{{ctx.Locale.Tr "sign_in_with_provider" $provider.DisplayName}}
-					</a>
-				{{end}}
+			<div class="inline field">
+				<button class="ui primary button">
+					{{if .LinkAccountMode}}
+						{{ctx.Locale.Tr "auth.oauth_signin_submit"}}
+					{{else}}
+						{{ctx.Locale.Tr "sign_in"}}
+					{{end}}
+				</button>
+				<a href="{{AppSubUrl}}/user/forgot_password">{{ctx.Locale.Tr "auth.forgot_password"}}</a>
 			</div>
+
+			{{if .ShowRegistrationButton}}
+			<div class="inline field">
+				<a href="{{AppSubUrl}}/user/sign_up">{{ctx.Locale.Tr "auth.sign_up_now" | Str2html}}</a>
+			</div>
+			{{end}}
 		</div>
-	</div>
-	{{end}}
 	</form>
 </div>
diff --git a/templates/user/auth/signin_openid.tmpl b/templates/user/auth/signin_openid.tmpl
index 0428026aa8b5..cde6116100d2 100644
--- a/templates/user/auth/signin_openid.tmpl
+++ b/templates/user/auth/signin_openid.tmpl
@@ -1,37 +1,37 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content user signin openid">
 	{{template "user/auth/signin_navbar" .}}
-	<div class="ui container">
-		{{template "base/alert" .}}
-		<h4 class="ui top attached header center">
-			{{svg "fontawesome-openid"}}
-			OpenID
-		</h4>
-		<div class="ui attached segment">
-			<form class="ui form" action="{{.Link}}" method="post">
-			{{.CsrfTokenHtml}}
-			<div class="inline field">
-				{{ctx.Locale.Tr "auth.openid_signin_desc"}}
-			</div>
-			<div class="required inline field {{if .Err_OpenID}}error{{end}}">
-				<label for="openid">
+	<div class="ui middle very relaxed page grid">
+		<div class="ui container column fluid">
+			{{template "base/alert" .}}
+			<h4 class="ui top attached header center">
 				{{svg "fontawesome-openid"}}
-				OpenID URI
-				</label>
-				<input id="openid" name="openid" value="{{.openid}}" autofocus required>
-			</div>
-			<div class="inline field">
-				<label></label>
-				<div class="ui checkbox">
-					<label>{{ctx.Locale.Tr "auth.remember_me"}}</label>
-					<input name="remember" type="checkbox">
-				</div>
-			</div>
-			<div class="inline field">
-				<label></label>
-				<button class="ui primary button">{{ctx.Locale.Tr "sign_in"}}</button>
+				OpenID
+			</h4>
+			<div class="ui attached segment">
+				<form class="ui form gt-max-width-36rem gt-w-100 gt-m-auto" action="{{.Link}}" method="post">
+				{{.CsrfTokenHtml}}
+					<div class="inline field">
+						{{ctx.Locale.Tr "auth.openid_signin_desc"}}
+					</div>
+					<div class="required inline field {{if .Err_OpenID}}error{{end}}">
+					<label for="openid">
+					{{svg "fontawesome-openid"}}
+					OpenID URI
+					</label>
+					<input id="openid" class="gt-w-100" name="openid" value="{{.openid}}" autofocus required>
+					</div>
+					<div class="inline field">
+						<div class="ui checkbox">
+							<label>{{ctx.Locale.Tr "auth.remember_me"}}</label>
+							<input name="remember" type="checkbox">
+						</div>
+					</div>
+					<div class="inline field">
+						<button class="ui primary button">{{ctx.Locale.Tr "sign_in"}}</button>
+					</div>
+				</form>
 			</div>
-			</form>
 		</div>
 	</div>
 </div>
diff --git a/templates/user/auth/signup_inner.tmpl b/templates/user/auth/signup_inner.tmpl
index e930bd3d158a..1cc3d60916e0 100644
--- a/templates/user/auth/signup_inner.tmpl
+++ b/templates/user/auth/signup_inner.tmpl
@@ -7,7 +7,26 @@
 		{{end}}
 	</h4>
 	<div class="ui attached segment">
-		<form class="ui form" action="{{.SignUpLink}}" method="post">
+		<form class="ui form gt-max-width-48rem gt-w-100 gt-m-auto" action="{{.SignUpLink}}" method="post">
+			{{if .OAuth2Providers}}
+			<div id="oauth2-login-navigator" class="gt-py-2">
+				<div class="gt-df gt-fc gt-jc">
+					<div id="oauth2-login-navigator-inner" class="gt-df gt-fc gt-fw gt-ac gt-gap-3">
+						{{range $provider := .OAuth2Providers}}
+							<a class="{{$provider.Name}} ui button gt-df gt-ac gt-jc gt-py-3 gt-max-width-36rem gt-w-100 oauth-login-link" href="{{AppSubUrl}}/user/oauth2/{{$provider.DisplayName}}">
+								{{$provider.IconHTML 28}}
+								{{ctx.Locale.Tr "sign_in_with_provider" $provider.DisplayName}}
+							</a>
+						{{end}}
+					</div>
+				</div>
+			</div>
+
+			<div class="divider divider-text gt-mb-5 gt-mt-5">
+				{{ctx.Locale.Tr "sign_in_or"}}
+			</div>
+			{{end}}
+			<div class="gt-max-width-36rem gt-m-auto">
 			{{.CsrfTokenHtml}}
 			{{if or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister)}}
 			{{template "base/alert" .}}
@@ -17,28 +36,27 @@
 			{{else}}
 				<div class="required inline field {{if and (.Err_UserName) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister))}}error{{end}}">
 					<label for="user_name">{{ctx.Locale.Tr "username"}}</label>
-					<input id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required>
+					<input id="user_name" class="gt-w-100" type="text" name="user_name" value="{{.user_name}}" autofocus required>
 				</div>
 				<div class="required inline field {{if .Err_Email}}error{{end}}">
 					<label for="email">{{ctx.Locale.Tr "email"}}</label>
-					<input id="email" name="email" type="email" value="{{.email}}" required>
+					<input id="email" class="gt-w-100" name="email" type="email" value="{{.email}}" required>
 				</div>
 
 				{{if not .DisablePassword}}
-					<div class="required inline field {{if and (.Err_Password) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister))}}error{{end}}">
-						<label for="password">{{ctx.Locale.Tr "password"}}</label>
-						<input id="password" name="password" type="password" value="{{.password}}" autocomplete="new-password" required>
-					</div>
-					<div class="required inline field {{if and (.Err_Password) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister))}}error{{end}}">
-						<label for="retype">{{ctx.Locale.Tr "re_type"}}</label>
-						<input id="retype" name="retype" type="password" value="{{.retype}}" autocomplete="new-password" required>
-					</div>
+				<div class="required inline field {{if and (.Err_Password) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister))}}error{{end}}">
+					<label for="password">{{ctx.Locale.Tr "password"}}</label>
+					<input id="password" class="gt-w-100" name="password" type="password" value="{{.password}}" autocomplete="new-password" required>
+				</div>
+				<div class="required inline field {{if and (.Err_Password) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister))}}error{{end}}">
+					<label for="retype">{{ctx.Locale.Tr "re_type"}}</label>
+					<input id="retype" class="gt-w-100" name="retype" type="password" value="{{.retype}}" autocomplete="new-password" required>
+				</div>
 				{{end}}
 
 				{{template "user/auth/captcha" .}}
 
 				<div class="inline field">
-					<label></label>
 					<button class="ui primary button">
 						{{if .LinkAccountMode}}
 							{{ctx.Locale.Tr "auth.oauth_signup_submit"}}
@@ -50,29 +68,11 @@
 
 				{{if not .LinkAccountMode}}
 				<div class="inline field">
-					<label></label>
 					<a href="{{AppSubUrl}}/user/login">{{ctx.Locale.Tr "auth.register_helper_msg"}}</a>
 				</div>
 				{{end}}
 			{{end}}
-
-			{{if .OAuth2Providers}}
-			<div class="divider divider-text">
-				{{ctx.Locale.Tr "sign_in_or"}}
 			</div>
-			<div id="oauth2-login-navigator" class="gt-py-2">
-				<div class="gt-df gt-fc gt-jc">
-					<div id="oauth2-login-navigator-inner" class="gt-df gt-fc gt-fw gt-ac gt-gap-3">
-						{{range $provider := .OAuth2Providers}}
-							<a class="{{$provider.Name}} ui button gt-df gt-ac gt-jc gt-py-3 oauth-login-link" href="{{AppSubUrl}}/user/oauth2/{{$provider.DisplayName}}">
-								{{$provider.IconHTML 28}}
-								{{ctx.Locale.Tr "sign_in_with_provider" $provider.DisplayName}}
-							</a>
-						{{end}}
-					</div>
-				</div>
-			</div>
-			{{end}}
 		</form>
 	</div>
 </div>
diff --git a/web_src/css/form.css b/web_src/css/form.css
index e4efa349486e..310132a45f69 100644
--- a/web_src/css/form.css
+++ b/web_src/css/form.css
@@ -243,7 +243,6 @@ textarea:focus,
 .user.forgot.password form,
 .user.reset.password form,
 .user.link-account form,
-.user.signin form,
 .user.signup form {
   margin: auto;
   width: 700px !important;
@@ -263,7 +262,6 @@ textarea:focus,
   .user.forgot.password form,
   .user.reset.password form,
   .user.link-account form,
-  .user.signin form,
   .user.signup form {
     width: 800px !important;
   }
@@ -279,7 +277,6 @@ textarea:focus,
   .user.forgot.password form .inline.field > label,
   .user.reset.password form .inline.field > label,
   .user.link-account form .inline.field > label,
-  .user.signin form .inline.field > label,
   .user.signup form .inline.field > label {
     text-align: right;
     width: 250px !important;
@@ -305,15 +302,13 @@ textarea:focus,
   .user.forgot.password form .inline.field > input,
   .user.reset.password form .inline.field > input,
   .user.link-account form .inline.field > input,
-  .user.signin form .inline.field > input,
   .user.signup form .inline.field > input,
   .user.activate form .inline.field > textarea,
   .user.forgot.password form .inline.field > textarea,
   .user.reset.password form .inline.field > textarea,
   .user.link-account form .inline.field > textarea,
   .user.signin form .inline.field > textarea,
-  .user.signup form .inline.field > textarea,
-  .oauth-login-link {
+  .user.signup form .inline.field > textarea {
     width: 50%;
   }
 }
diff --git a/web_src/css/helpers.css b/web_src/css/helpers.css
index 27b32139bae3..d7775df74c45 100644
--- a/web_src/css/helpers.css
+++ b/web_src/css/helpers.css
@@ -50,6 +50,8 @@ Gitea's private styles use `g-` prefix.
 
 .gt-max-width-12rem { max-width: 12rem !important; }
 .gt-max-width-24rem { max-width: 24rem !important; }
+.gt-max-width-36rem { max-width: 36rem !important; }
+.gt-max-width-48rem { max-width: 48rem !important; }
 
 /* below class names match Tailwind CSS */
 .gt-break-all { word-break: break-all !important; }

From c26931bd324f18a948809f60cae814d505c4ecaf Mon Sep 17 00:00:00 2001
From: rafh <rafaelheard@gmail.com>
Date: Tue, 30 Jan 2024 13:53:45 -0500
Subject: [PATCH 2/9] Revert "update sign form layout"

This reverts commit 95bdc7bbe7088d979ac0fbac1ece4d759fddb18e.
---
 templates/user/auth/signin_inner.tmpl  | 106 +++++++++++++------------
 templates/user/auth/signin_openid.tmpl |  58 +++++++-------
 templates/user/auth/signup_inner.tmpl  |  60 +++++++-------
 web_src/css/form.css                   |   7 +-
 web_src/css/helpers.css                |   2 -
 5 files changed, 119 insertions(+), 114 deletions(-)

diff --git a/templates/user/auth/signin_inner.tmpl b/templates/user/auth/signin_inner.tmpl
index 1305b3f48962..40e54ec8fa96 100644
--- a/templates/user/auth/signin_inner.tmpl
+++ b/templates/user/auth/signin_inner.tmpl
@@ -9,63 +9,65 @@
 	{{end}}
 </h4>
 <div class="ui attached segment">
-	<form class="ui form gt-max-width-48rem gt-w-100 gt-m-auto" action="{{.SignInLink}}" method="post">
-		{{if .OAuth2Providers}}
-		<div id="oauth2-login-navigator" class="gt-py-2">
-			<div class="gt-df gt-fc gt-jc">
-				<div id="oauth2-login-navigator-inner" class="gt-df gt-fc gt-fw gt-ac gt-gap-3">
-					{{range $provider := .OAuth2Providers}}
-						<a class="{{$provider.Name}} ui button gt-df gt-ac gt-jc gt-py-3 gt-max-width-36rem gt-w-100 oauth-login-link" href="{{AppSubUrl}}/user/oauth2/{{$provider.DisplayName}}">
-							{{$provider.IconHTML 28}}
-							{{ctx.Locale.Tr "sign_in_with_provider" $provider.DisplayName}}
-						</a>
-					{{end}}
-				</div>
-			</div>
-		</div>
-		<div class="divider divider-text gt-mb-5 gt-mt-5">
-			{{ctx.Locale.Tr "sign_in_or"}}
+	<form class="ui form" action="{{.SignInLink}}" method="post">
+	{{.CsrfTokenHtml}}
+	<div class="required inline field {{if and (.Err_UserName) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn))}}error{{end}}">
+		<label for="user_name">{{ctx.Locale.Tr "home.uname_holder"}}</label>
+		<input id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required>
+	</div>
+	{{if or (not .DisablePassword) .LinkAccountMode}}
+	<div class="required inline field {{if and (.Err_Password) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn))}}error{{end}}">
+		<label for="password">{{ctx.Locale.Tr "password"}}</label>
+		<input id="password" name="password" type="password" value="{{.password}}" autocomplete="current-password" required>
+	</div>
+	{{end}}
+	{{if not .LinkAccountMode}}
+	<div class="inline field">
+		<label></label>
+		<div class="ui checkbox">
+			<label>{{ctx.Locale.Tr "auth.remember_me"}}</label>
+			<input name="remember" type="checkbox">
 		</div>
-		{{end}}
-		<div class="gt-max-width-36rem gt-m-auto">
-			{{.CsrfTokenHtml}}
-			<div class="required inline field {{if and (.Err_UserName) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn))}}error{{end}}">
-				<label for="user_name">{{ctx.Locale.Tr "home.uname_holder"}}</label>
-				<input id="user_name" class="gt-w-100" type="text" name="user_name" value="{{.user_name}}" autofocus required>
-			</div>
-			{{if or (not .DisablePassword) .LinkAccountMode}}
-			<div class="required inline field {{if and (.Err_Password) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn))}}error{{end}}">
-				<label for="password">{{ctx.Locale.Tr "password"}}</label>
-				<input id="password" class="gt-w-100" name="password" type="password" value="{{.password}}" autocomplete="current-password" required>
-			</div>
-			{{end}}
-			{{if not .LinkAccountMode}}
-			<div class="inline field">
-				<div class="ui checkbox">
-					<label>{{ctx.Locale.Tr "auth.remember_me"}}</label>
-					<input name="remember" type="checkbox">
-				</div>
-			</div>
-			{{end}}
+	</div>
+	{{end}}
 
-			{{template "user/auth/captcha" .}}
+	{{template "user/auth/captcha" .}}
 
-			<div class="inline field">
-				<button class="ui primary button">
-					{{if .LinkAccountMode}}
-						{{ctx.Locale.Tr "auth.oauth_signin_submit"}}
-					{{else}}
-						{{ctx.Locale.Tr "sign_in"}}
-					{{end}}
-				</button>
-				<a href="{{AppSubUrl}}/user/forgot_password">{{ctx.Locale.Tr "auth.forgot_password"}}</a>
-			</div>
+	<div class="inline field">
+		<label></label>
+		<button class="ui primary button">
+			{{if .LinkAccountMode}}
+				{{ctx.Locale.Tr "auth.oauth_signin_submit"}}
+			{{else}}
+				{{ctx.Locale.Tr "sign_in"}}
+			{{end}}
+		</button>
+		<a href="{{AppSubUrl}}/user/forgot_password">{{ctx.Locale.Tr "auth.forgot_password"}}</a>
+	</div>
+
+	{{if .ShowRegistrationButton}}
+		<div class="inline field">
+			<label></label>
+			<a href="{{AppSubUrl}}/user/sign_up">{{ctx.Locale.Tr "auth.sign_up_now" | Str2html}}</a>
+		</div>
+	{{end}}
 
-			{{if .ShowRegistrationButton}}
-			<div class="inline field">
-				<a href="{{AppSubUrl}}/user/sign_up">{{ctx.Locale.Tr "auth.sign_up_now" | Str2html}}</a>
+	{{if .OAuth2Providers}}
+	<div class="divider divider-text">
+		{{ctx.Locale.Tr "sign_in_or"}}
+	</div>
+	<div id="oauth2-login-navigator" class="gt-py-2">
+		<div class="gt-df gt-fc gt-jc">
+			<div id="oauth2-login-navigator-inner" class="gt-df gt-fc gt-fw gt-ac gt-gap-3">
+				{{range $provider := .OAuth2Providers}}
+					<a class="{{$provider.Name}} ui button gt-df gt-ac gt-jc gt-py-3 oauth-login-link" href="{{AppSubUrl}}/user/oauth2/{{$provider.DisplayName}}">
+						{{$provider.IconHTML 28}}
+						{{ctx.Locale.Tr "sign_in_with_provider" $provider.DisplayName}}
+					</a>
+				{{end}}
 			</div>
-			{{end}}
 		</div>
+	</div>
+	{{end}}
 	</form>
 </div>
diff --git a/templates/user/auth/signin_openid.tmpl b/templates/user/auth/signin_openid.tmpl
index cde6116100d2..0428026aa8b5 100644
--- a/templates/user/auth/signin_openid.tmpl
+++ b/templates/user/auth/signin_openid.tmpl
@@ -1,37 +1,37 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content user signin openid">
 	{{template "user/auth/signin_navbar" .}}
-	<div class="ui middle very relaxed page grid">
-		<div class="ui container column fluid">
-			{{template "base/alert" .}}
-			<h4 class="ui top attached header center">
+	<div class="ui container">
+		{{template "base/alert" .}}
+		<h4 class="ui top attached header center">
+			{{svg "fontawesome-openid"}}
+			OpenID
+		</h4>
+		<div class="ui attached segment">
+			<form class="ui form" action="{{.Link}}" method="post">
+			{{.CsrfTokenHtml}}
+			<div class="inline field">
+				{{ctx.Locale.Tr "auth.openid_signin_desc"}}
+			</div>
+			<div class="required inline field {{if .Err_OpenID}}error{{end}}">
+				<label for="openid">
 				{{svg "fontawesome-openid"}}
-				OpenID
-			</h4>
-			<div class="ui attached segment">
-				<form class="ui form gt-max-width-36rem gt-w-100 gt-m-auto" action="{{.Link}}" method="post">
-				{{.CsrfTokenHtml}}
-					<div class="inline field">
-						{{ctx.Locale.Tr "auth.openid_signin_desc"}}
-					</div>
-					<div class="required inline field {{if .Err_OpenID}}error{{end}}">
-					<label for="openid">
-					{{svg "fontawesome-openid"}}
-					OpenID URI
-					</label>
-					<input id="openid" class="gt-w-100" name="openid" value="{{.openid}}" autofocus required>
-					</div>
-					<div class="inline field">
-						<div class="ui checkbox">
-							<label>{{ctx.Locale.Tr "auth.remember_me"}}</label>
-							<input name="remember" type="checkbox">
-						</div>
-					</div>
-					<div class="inline field">
-						<button class="ui primary button">{{ctx.Locale.Tr "sign_in"}}</button>
-					</div>
-				</form>
+				OpenID URI
+				</label>
+				<input id="openid" name="openid" value="{{.openid}}" autofocus required>
+			</div>
+			<div class="inline field">
+				<label></label>
+				<div class="ui checkbox">
+					<label>{{ctx.Locale.Tr "auth.remember_me"}}</label>
+					<input name="remember" type="checkbox">
+				</div>
+			</div>
+			<div class="inline field">
+				<label></label>
+				<button class="ui primary button">{{ctx.Locale.Tr "sign_in"}}</button>
 			</div>
+			</form>
 		</div>
 	</div>
 </div>
diff --git a/templates/user/auth/signup_inner.tmpl b/templates/user/auth/signup_inner.tmpl
index 1cc3d60916e0..e930bd3d158a 100644
--- a/templates/user/auth/signup_inner.tmpl
+++ b/templates/user/auth/signup_inner.tmpl
@@ -7,26 +7,7 @@
 		{{end}}
 	</h4>
 	<div class="ui attached segment">
-		<form class="ui form gt-max-width-48rem gt-w-100 gt-m-auto" action="{{.SignUpLink}}" method="post">
-			{{if .OAuth2Providers}}
-			<div id="oauth2-login-navigator" class="gt-py-2">
-				<div class="gt-df gt-fc gt-jc">
-					<div id="oauth2-login-navigator-inner" class="gt-df gt-fc gt-fw gt-ac gt-gap-3">
-						{{range $provider := .OAuth2Providers}}
-							<a class="{{$provider.Name}} ui button gt-df gt-ac gt-jc gt-py-3 gt-max-width-36rem gt-w-100 oauth-login-link" href="{{AppSubUrl}}/user/oauth2/{{$provider.DisplayName}}">
-								{{$provider.IconHTML 28}}
-								{{ctx.Locale.Tr "sign_in_with_provider" $provider.DisplayName}}
-							</a>
-						{{end}}
-					</div>
-				</div>
-			</div>
-
-			<div class="divider divider-text gt-mb-5 gt-mt-5">
-				{{ctx.Locale.Tr "sign_in_or"}}
-			</div>
-			{{end}}
-			<div class="gt-max-width-36rem gt-m-auto">
+		<form class="ui form" action="{{.SignUpLink}}" method="post">
 			{{.CsrfTokenHtml}}
 			{{if or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister)}}
 			{{template "base/alert" .}}
@@ -36,27 +17,28 @@
 			{{else}}
 				<div class="required inline field {{if and (.Err_UserName) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister))}}error{{end}}">
 					<label for="user_name">{{ctx.Locale.Tr "username"}}</label>
-					<input id="user_name" class="gt-w-100" type="text" name="user_name" value="{{.user_name}}" autofocus required>
+					<input id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required>
 				</div>
 				<div class="required inline field {{if .Err_Email}}error{{end}}">
 					<label for="email">{{ctx.Locale.Tr "email"}}</label>
-					<input id="email" class="gt-w-100" name="email" type="email" value="{{.email}}" required>
+					<input id="email" name="email" type="email" value="{{.email}}" required>
 				</div>
 
 				{{if not .DisablePassword}}
-				<div class="required inline field {{if and (.Err_Password) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister))}}error{{end}}">
-					<label for="password">{{ctx.Locale.Tr "password"}}</label>
-					<input id="password" class="gt-w-100" name="password" type="password" value="{{.password}}" autocomplete="new-password" required>
-				</div>
-				<div class="required inline field {{if and (.Err_Password) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister))}}error{{end}}">
-					<label for="retype">{{ctx.Locale.Tr "re_type"}}</label>
-					<input id="retype" class="gt-w-100" name="retype" type="password" value="{{.retype}}" autocomplete="new-password" required>
-				</div>
+					<div class="required inline field {{if and (.Err_Password) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister))}}error{{end}}">
+						<label for="password">{{ctx.Locale.Tr "password"}}</label>
+						<input id="password" name="password" type="password" value="{{.password}}" autocomplete="new-password" required>
+					</div>
+					<div class="required inline field {{if and (.Err_Password) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister))}}error{{end}}">
+						<label for="retype">{{ctx.Locale.Tr "re_type"}}</label>
+						<input id="retype" name="retype" type="password" value="{{.retype}}" autocomplete="new-password" required>
+					</div>
 				{{end}}
 
 				{{template "user/auth/captcha" .}}
 
 				<div class="inline field">
+					<label></label>
 					<button class="ui primary button">
 						{{if .LinkAccountMode}}
 							{{ctx.Locale.Tr "auth.oauth_signup_submit"}}
@@ -68,11 +50,29 @@
 
 				{{if not .LinkAccountMode}}
 				<div class="inline field">
+					<label></label>
 					<a href="{{AppSubUrl}}/user/login">{{ctx.Locale.Tr "auth.register_helper_msg"}}</a>
 				</div>
 				{{end}}
 			{{end}}
+
+			{{if .OAuth2Providers}}
+			<div class="divider divider-text">
+				{{ctx.Locale.Tr "sign_in_or"}}
 			</div>
+			<div id="oauth2-login-navigator" class="gt-py-2">
+				<div class="gt-df gt-fc gt-jc">
+					<div id="oauth2-login-navigator-inner" class="gt-df gt-fc gt-fw gt-ac gt-gap-3">
+						{{range $provider := .OAuth2Providers}}
+							<a class="{{$provider.Name}} ui button gt-df gt-ac gt-jc gt-py-3 oauth-login-link" href="{{AppSubUrl}}/user/oauth2/{{$provider.DisplayName}}">
+								{{$provider.IconHTML 28}}
+								{{ctx.Locale.Tr "sign_in_with_provider" $provider.DisplayName}}
+							</a>
+						{{end}}
+					</div>
+				</div>
+			</div>
+			{{end}}
 		</form>
 	</div>
 </div>
diff --git a/web_src/css/form.css b/web_src/css/form.css
index 310132a45f69..e4efa349486e 100644
--- a/web_src/css/form.css
+++ b/web_src/css/form.css
@@ -243,6 +243,7 @@ textarea:focus,
 .user.forgot.password form,
 .user.reset.password form,
 .user.link-account form,
+.user.signin form,
 .user.signup form {
   margin: auto;
   width: 700px !important;
@@ -262,6 +263,7 @@ textarea:focus,
   .user.forgot.password form,
   .user.reset.password form,
   .user.link-account form,
+  .user.signin form,
   .user.signup form {
     width: 800px !important;
   }
@@ -277,6 +279,7 @@ textarea:focus,
   .user.forgot.password form .inline.field > label,
   .user.reset.password form .inline.field > label,
   .user.link-account form .inline.field > label,
+  .user.signin form .inline.field > label,
   .user.signup form .inline.field > label {
     text-align: right;
     width: 250px !important;
@@ -302,13 +305,15 @@ textarea:focus,
   .user.forgot.password form .inline.field > input,
   .user.reset.password form .inline.field > input,
   .user.link-account form .inline.field > input,
+  .user.signin form .inline.field > input,
   .user.signup form .inline.field > input,
   .user.activate form .inline.field > textarea,
   .user.forgot.password form .inline.field > textarea,
   .user.reset.password form .inline.field > textarea,
   .user.link-account form .inline.field > textarea,
   .user.signin form .inline.field > textarea,
-  .user.signup form .inline.field > textarea {
+  .user.signup form .inline.field > textarea,
+  .oauth-login-link {
     width: 50%;
   }
 }
diff --git a/web_src/css/helpers.css b/web_src/css/helpers.css
index d7775df74c45..27b32139bae3 100644
--- a/web_src/css/helpers.css
+++ b/web_src/css/helpers.css
@@ -50,8 +50,6 @@ Gitea's private styles use `g-` prefix.
 
 .gt-max-width-12rem { max-width: 12rem !important; }
 .gt-max-width-24rem { max-width: 24rem !important; }
-.gt-max-width-36rem { max-width: 36rem !important; }
-.gt-max-width-48rem { max-width: 48rem !important; }
 
 /* below class names match Tailwind CSS */
 .gt-break-all { word-break: break-all !important; }

From 49652f72f789c6d0a99b5494e6d4d3aed2bc058d Mon Sep 17 00:00:00 2001
From: rafh <rafaelheard@gmail.com>
Date: Tue, 30 Jan 2024 14:03:31 -0500
Subject: [PATCH 3/9] move sign in labels above inputs

---
 templates/user/auth/signin_inner.tmpl | 11 ++++-------
 web_src/css/form.css                  |  1 -
 web_src/css/helpers.css               |  1 +
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/templates/user/auth/signin_inner.tmpl b/templates/user/auth/signin_inner.tmpl
index 40e54ec8fa96..43d84f4cce26 100644
--- a/templates/user/auth/signin_inner.tmpl
+++ b/templates/user/auth/signin_inner.tmpl
@@ -9,21 +9,20 @@
 	{{end}}
 </h4>
 <div class="ui attached segment">
-	<form class="ui form" action="{{.SignInLink}}" method="post">
+	<form class="ui form gt-max-width-36rem" action="{{.SignInLink}}" method="post">
 	{{.CsrfTokenHtml}}
 	<div class="required inline field {{if and (.Err_UserName) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn))}}error{{end}}">
 		<label for="user_name">{{ctx.Locale.Tr "home.uname_holder"}}</label>
-		<input id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required>
+		<input id="user_name" class="gt-w-100" type="text" name="user_name" value="{{.user_name}}" autofocus required>
 	</div>
 	{{if or (not .DisablePassword) .LinkAccountMode}}
 	<div class="required inline field {{if and (.Err_Password) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn))}}error{{end}}">
 		<label for="password">{{ctx.Locale.Tr "password"}}</label>
-		<input id="password" name="password" type="password" value="{{.password}}" autocomplete="current-password" required>
+		<input id="password" class="gt-w-100" name="password" type="password" value="{{.password}}" autocomplete="current-password" required>
 	</div>
 	{{end}}
 	{{if not .LinkAccountMode}}
 	<div class="inline field">
-		<label></label>
 		<div class="ui checkbox">
 			<label>{{ctx.Locale.Tr "auth.remember_me"}}</label>
 			<input name="remember" type="checkbox">
@@ -34,7 +33,6 @@
 	{{template "user/auth/captcha" .}}
 
 	<div class="inline field">
-		<label></label>
 		<button class="ui primary button">
 			{{if .LinkAccountMode}}
 				{{ctx.Locale.Tr "auth.oauth_signin_submit"}}
@@ -47,7 +45,6 @@
 
 	{{if .ShowRegistrationButton}}
 		<div class="inline field">
-			<label></label>
 			<a href="{{AppSubUrl}}/user/sign_up">{{ctx.Locale.Tr "auth.sign_up_now" | Str2html}}</a>
 		</div>
 	{{end}}
@@ -60,7 +57,7 @@
 		<div class="gt-df gt-fc gt-jc">
 			<div id="oauth2-login-navigator-inner" class="gt-df gt-fc gt-fw gt-ac gt-gap-3">
 				{{range $provider := .OAuth2Providers}}
-					<a class="{{$provider.Name}} ui button gt-df gt-ac gt-jc gt-py-3 oauth-login-link" href="{{AppSubUrl}}/user/oauth2/{{$provider.DisplayName}}">
+					<a class="{{$provider.Name}} ui button gt-df gt-ac gt-jc gt-py-3 gt-w-100 oauth-login-link" href="{{AppSubUrl}}/user/oauth2/{{$provider.DisplayName}}">
 						{{$provider.IconHTML 28}}
 						{{ctx.Locale.Tr "sign_in_with_provider" $provider.DisplayName}}
 					</a>
diff --git a/web_src/css/form.css b/web_src/css/form.css
index e4efa349486e..79420fe4ab64 100644
--- a/web_src/css/form.css
+++ b/web_src/css/form.css
@@ -279,7 +279,6 @@ textarea:focus,
   .user.forgot.password form .inline.field > label,
   .user.reset.password form .inline.field > label,
   .user.link-account form .inline.field > label,
-  .user.signin form .inline.field > label,
   .user.signup form .inline.field > label {
     text-align: right;
     width: 250px !important;
diff --git a/web_src/css/helpers.css b/web_src/css/helpers.css
index 27b32139bae3..ceae996578a9 100644
--- a/web_src/css/helpers.css
+++ b/web_src/css/helpers.css
@@ -50,6 +50,7 @@ Gitea's private styles use `g-` prefix.
 
 .gt-max-width-12rem { max-width: 12rem !important; }
 .gt-max-width-24rem { max-width: 24rem !important; }
+.gt-max-width-36rem { max-width: 36rem !important; }
 
 /* below class names match Tailwind CSS */
 .gt-break-all { word-break: break-all !important; }

From fc814179a225226691f3f29f489fe301ba1edb83 Mon Sep 17 00:00:00 2001
From: rafh <rafaelheard@gmail.com>
Date: Tue, 30 Jan 2024 14:08:50 -0500
Subject: [PATCH 4/9] move register labels above inputs

---
 templates/user/auth/signup_inner.tmpl | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/templates/user/auth/signup_inner.tmpl b/templates/user/auth/signup_inner.tmpl
index e930bd3d158a..0f770e2cbd2a 100644
--- a/templates/user/auth/signup_inner.tmpl
+++ b/templates/user/auth/signup_inner.tmpl
@@ -7,7 +7,7 @@
 		{{end}}
 	</h4>
 	<div class="ui attached segment">
-		<form class="ui form" action="{{.SignUpLink}}" method="post">
+		<form class="ui form gt-max-width-36rem" action="{{.SignUpLink}}" method="post">
 			{{.CsrfTokenHtml}}
 			{{if or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister)}}
 			{{template "base/alert" .}}
@@ -17,28 +17,27 @@
 			{{else}}
 				<div class="required inline field {{if and (.Err_UserName) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister))}}error{{end}}">
 					<label for="user_name">{{ctx.Locale.Tr "username"}}</label>
-					<input id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required>
+					<input id="user_name" class="gt-w-100" type="text" name="user_name" value="{{.user_name}}" autofocus required>
 				</div>
 				<div class="required inline field {{if .Err_Email}}error{{end}}">
 					<label for="email">{{ctx.Locale.Tr "email"}}</label>
-					<input id="email" name="email" type="email" value="{{.email}}" required>
+					<input id="email" class="gt-w-100" name="email" type="email" value="{{.email}}" required>
 				</div>
 
 				{{if not .DisablePassword}}
 					<div class="required inline field {{if and (.Err_Password) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister))}}error{{end}}">
 						<label for="password">{{ctx.Locale.Tr "password"}}</label>
-						<input id="password" name="password" type="password" value="{{.password}}" autocomplete="new-password" required>
+						<input id="password" class="gt-w-100" name="password" type="password" value="{{.password}}" autocomplete="new-password" required>
 					</div>
 					<div class="required inline field {{if and (.Err_Password) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister))}}error{{end}}">
 						<label for="retype">{{ctx.Locale.Tr "re_type"}}</label>
-						<input id="retype" name="retype" type="password" value="{{.retype}}" autocomplete="new-password" required>
+						<input id="retype" class="gt-w-100" name="retype" type="password" value="{{.retype}}" autocomplete="new-password" required>
 					</div>
 				{{end}}
 
 				{{template "user/auth/captcha" .}}
 
 				<div class="inline field">
-					<label></label>
 					<button class="ui primary button">
 						{{if .LinkAccountMode}}
 							{{ctx.Locale.Tr "auth.oauth_signup_submit"}}
@@ -50,7 +49,6 @@
 
 				{{if not .LinkAccountMode}}
 				<div class="inline field">
-					<label></label>
 					<a href="{{AppSubUrl}}/user/login">{{ctx.Locale.Tr "auth.register_helper_msg"}}</a>
 				</div>
 				{{end}}
@@ -64,7 +62,7 @@
 				<div class="gt-df gt-fc gt-jc">
 					<div id="oauth2-login-navigator-inner" class="gt-df gt-fc gt-fw gt-ac gt-gap-3">
 						{{range $provider := .OAuth2Providers}}
-							<a class="{{$provider.Name}} ui button gt-df gt-ac gt-jc gt-py-3 oauth-login-link" href="{{AppSubUrl}}/user/oauth2/{{$provider.DisplayName}}">
+							<a class="{{$provider.Name}} ui button gt-df gt-ac gt-jc gt-py-3 gt-w-100 oauth-login-link" href="{{AppSubUrl}}/user/oauth2/{{$provider.DisplayName}}">
 								{{$provider.IconHTML 28}}
 								{{ctx.Locale.Tr "sign_in_with_provider" $provider.DisplayName}}
 							</a>

From 3b322fb58a3c1f570f647ad8dc0e827675dfd5fa Mon Sep 17 00:00:00 2001
From: rafh <rafaelheard@gmail.com>
Date: Tue, 30 Jan 2024 14:09:56 -0500
Subject: [PATCH 5/9] move openid labels above inputs

---
 templates/user/auth/signin_openid.tmpl | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/templates/user/auth/signin_openid.tmpl b/templates/user/auth/signin_openid.tmpl
index 0428026aa8b5..6999fa81010d 100644
--- a/templates/user/auth/signin_openid.tmpl
+++ b/templates/user/auth/signin_openid.tmpl
@@ -18,17 +18,15 @@
 				{{svg "fontawesome-openid"}}
 				OpenID URI
 				</label>
-				<input id="openid" name="openid" value="{{.openid}}" autofocus required>
+				<input id="openid" class="gt-w-100" name="openid" value="{{.openid}}" autofocus required>
 			</div>
 			<div class="inline field">
-				<label></label>
 				<div class="ui checkbox">
 					<label>{{ctx.Locale.Tr "auth.remember_me"}}</label>
 					<input name="remember" type="checkbox">
 				</div>
 			</div>
 			<div class="inline field">
-				<label></label>
 				<button class="ui primary button">{{ctx.Locale.Tr "sign_in"}}</button>
 			</div>
 			</form>

From 59ed2b108dc1ff0610103c3bf3ea3d71f1c1472a Mon Sep 17 00:00:00 2001
From: rafh <rafaelheard@gmail.com>
Date: Tue, 30 Jan 2024 14:13:11 -0500
Subject: [PATCH 6/9] fix input overflowing on mobile screens

---
 templates/user/auth/signin_inner.tmpl  | 2 +-
 templates/user/auth/signin_openid.tmpl | 2 +-
 templates/user/auth/signup_inner.tmpl  | 2 +-
 web_src/css/form.css                   | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/templates/user/auth/signin_inner.tmpl b/templates/user/auth/signin_inner.tmpl
index 43d84f4cce26..7766c3613995 100644
--- a/templates/user/auth/signin_inner.tmpl
+++ b/templates/user/auth/signin_inner.tmpl
@@ -9,7 +9,7 @@
 	{{end}}
 </h4>
 <div class="ui attached segment">
-	<form class="ui form gt-max-width-36rem" action="{{.SignInLink}}" method="post">
+	<form class="ui form gt-max-width-36rem gt-m-auto" action="{{.SignInLink}}" method="post">
 	{{.CsrfTokenHtml}}
 	<div class="required inline field {{if and (.Err_UserName) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn))}}error{{end}}">
 		<label for="user_name">{{ctx.Locale.Tr "home.uname_holder"}}</label>
diff --git a/templates/user/auth/signin_openid.tmpl b/templates/user/auth/signin_openid.tmpl
index 6999fa81010d..b7499aa00afd 100644
--- a/templates/user/auth/signin_openid.tmpl
+++ b/templates/user/auth/signin_openid.tmpl
@@ -8,7 +8,7 @@
 			OpenID
 		</h4>
 		<div class="ui attached segment">
-			<form class="ui form" action="{{.Link}}" method="post">
+			<form class="ui form gt-m-auto" action="{{.Link}}" method="post">
 			{{.CsrfTokenHtml}}
 			<div class="inline field">
 				{{ctx.Locale.Tr "auth.openid_signin_desc"}}
diff --git a/templates/user/auth/signup_inner.tmpl b/templates/user/auth/signup_inner.tmpl
index 0f770e2cbd2a..8fd5f910b666 100644
--- a/templates/user/auth/signup_inner.tmpl
+++ b/templates/user/auth/signup_inner.tmpl
@@ -7,7 +7,7 @@
 		{{end}}
 	</h4>
 	<div class="ui attached segment">
-		<form class="ui form gt-max-width-36rem" action="{{.SignUpLink}}" method="post">
+		<form class="ui form gt-max-width-36rem gt-m-auto" action="{{.SignUpLink}}" method="post">
 			{{.CsrfTokenHtml}}
 			{{if or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister)}}
 			{{template "base/alert" .}}
diff --git a/web_src/css/form.css b/web_src/css/form.css
index 79420fe4ab64..c0de4978ddfd 100644
--- a/web_src/css/form.css
+++ b/web_src/css/form.css
@@ -243,7 +243,6 @@ textarea:focus,
 .user.forgot.password form,
 .user.reset.password form,
 .user.link-account form,
-.user.signin form,
 .user.signup form {
   margin: auto;
   width: 700px !important;

From 7f163ac3b2cf3d65d0d971da369f4d38951d4313 Mon Sep 17 00:00:00 2001
From: rafh <rafaelheard@gmail.com>
Date: Mon, 5 Feb 2024 08:21:40 -0500
Subject: [PATCH 7/9] use updated css class name for 100 width

---
 templates/user/auth/signin_inner.tmpl  |  8 ++++----
 templates/user/auth/signin_openid.tmpl |  2 +-
 templates/user/auth/signup_inner.tmpl  | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/templates/user/auth/signin_inner.tmpl b/templates/user/auth/signin_inner.tmpl
index 7766c3613995..10c599e8dfea 100644
--- a/templates/user/auth/signin_inner.tmpl
+++ b/templates/user/auth/signin_inner.tmpl
@@ -13,12 +13,12 @@
 	{{.CsrfTokenHtml}}
 	<div class="required inline field {{if and (.Err_UserName) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn))}}error{{end}}">
 		<label for="user_name">{{ctx.Locale.Tr "home.uname_holder"}}</label>
-		<input id="user_name" class="gt-w-100" type="text" name="user_name" value="{{.user_name}}" autofocus required>
+		<input id="user_name" class="gt-w-full" type="text" name="user_name" value="{{.user_name}}" autofocus required>
 	</div>
 	{{if or (not .DisablePassword) .LinkAccountMode}}
 	<div class="required inline field {{if and (.Err_Password) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn))}}error{{end}}">
 		<label for="password">{{ctx.Locale.Tr "password"}}</label>
-		<input id="password" class="gt-w-100" name="password" type="password" value="{{.password}}" autocomplete="current-password" required>
+		<input id="password" class="gt-w-full" name="password" type="password" value="{{.password}}" autocomplete="current-password" required>
 	</div>
 	{{end}}
 	{{if not .LinkAccountMode}}
@@ -57,7 +57,7 @@
 		<div class="gt-df gt-fc gt-jc">
 			<div id="oauth2-login-navigator-inner" class="gt-df gt-fc gt-fw gt-ac gt-gap-3">
 				{{range $provider := .OAuth2Providers}}
-					<a class="{{$provider.Name}} ui button gt-df gt-ac gt-jc gt-py-3 gt-w-100 oauth-login-link" href="{{AppSubUrl}}/user/oauth2/{{$provider.DisplayName}}">
+					<a class="{{$provider.Name}} ui button gt-df gt-ac gt-jc gt-py-3 gt-w-full oauth-login-link" href="{{AppSubUrl}}/user/oauth2/{{$provider.DisplayName}}">
 						{{$provider.IconHTML 28}}
 						{{ctx.Locale.Tr "sign_in_with_provider" $provider.DisplayName}}
 					</a>
@@ -67,4 +67,4 @@
 	</div>
 	{{end}}
 	</form>
-</div>
+</div>
\ No newline at end of file
diff --git a/templates/user/auth/signin_openid.tmpl b/templates/user/auth/signin_openid.tmpl
index b7499aa00afd..a138ea0b8d0b 100644
--- a/templates/user/auth/signin_openid.tmpl
+++ b/templates/user/auth/signin_openid.tmpl
@@ -18,7 +18,7 @@
 				{{svg "fontawesome-openid"}}
 				OpenID URI
 				</label>
-				<input id="openid" class="gt-w-100" name="openid" value="{{.openid}}" autofocus required>
+				<input id="openid" class="gt-w-full" name="openid" value="{{.openid}}" autofocus required>
 			</div>
 			<div class="inline field">
 				<div class="ui checkbox">
diff --git a/templates/user/auth/signup_inner.tmpl b/templates/user/auth/signup_inner.tmpl
index 8fd5f910b666..65ce98c31ab8 100644
--- a/templates/user/auth/signup_inner.tmpl
+++ b/templates/user/auth/signup_inner.tmpl
@@ -17,21 +17,21 @@
 			{{else}}
 				<div class="required inline field {{if and (.Err_UserName) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister))}}error{{end}}">
 					<label for="user_name">{{ctx.Locale.Tr "username"}}</label>
-					<input id="user_name" class="gt-w-100" type="text" name="user_name" value="{{.user_name}}" autofocus required>
+					<input id="user_name" class="gt-w-full" type="text" name="user_name" value="{{.user_name}}" autofocus required>
 				</div>
 				<div class="required inline field {{if .Err_Email}}error{{end}}">
 					<label for="email">{{ctx.Locale.Tr "email"}}</label>
-					<input id="email" class="gt-w-100" name="email" type="email" value="{{.email}}" required>
+					<input id="email" class="gt-w-full" name="email" type="email" value="{{.email}}" required>
 				</div>
 
 				{{if not .DisablePassword}}
 					<div class="required inline field {{if and (.Err_Password) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister))}}error{{end}}">
 						<label for="password">{{ctx.Locale.Tr "password"}}</label>
-						<input id="password" class="gt-w-100" name="password" type="password" value="{{.password}}" autocomplete="new-password" required>
+						<input id="password" class="gt-w-full" name="password" type="password" value="{{.password}}" autocomplete="new-password" required>
 					</div>
 					<div class="required inline field {{if and (.Err_Password) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister))}}error{{end}}">
 						<label for="retype">{{ctx.Locale.Tr "re_type"}}</label>
-						<input id="retype" class="gt-w-100" name="retype" type="password" value="{{.retype}}" autocomplete="new-password" required>
+						<input id="retype" class="gt-w-full" name="retype" type="password" value="{{.retype}}" autocomplete="new-password" required>
 					</div>
 				{{end}}
 
@@ -62,7 +62,7 @@
 				<div class="gt-df gt-fc gt-jc">
 					<div id="oauth2-login-navigator-inner" class="gt-df gt-fc gt-fw gt-ac gt-gap-3">
 						{{range $provider := .OAuth2Providers}}
-							<a class="{{$provider.Name}} ui button gt-df gt-ac gt-jc gt-py-3 gt-w-100 oauth-login-link" href="{{AppSubUrl}}/user/oauth2/{{$provider.DisplayName}}">
+							<a class="{{$provider.Name}} ui button gt-df gt-ac gt-jc gt-py-3 gt-w-full oauth-login-link" href="{{AppSubUrl}}/user/oauth2/{{$provider.DisplayName}}">
 								{{$provider.IconHTML 28}}
 								{{ctx.Locale.Tr "sign_in_with_provider" $provider.DisplayName}}
 							</a>

From f353718aebaad1369c4692dc6655fdb8d9238dbd Mon Sep 17 00:00:00 2001
From: rafh <rafaelheard@gmail.com>
Date: Mon, 5 Feb 2024 08:24:11 -0500
Subject: [PATCH 8/9] add newline to signin_inner

---
 templates/user/auth/signin_inner.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/user/auth/signin_inner.tmpl b/templates/user/auth/signin_inner.tmpl
index 10c599e8dfea..a0aea5cb9b1d 100644
--- a/templates/user/auth/signin_inner.tmpl
+++ b/templates/user/auth/signin_inner.tmpl
@@ -67,4 +67,4 @@
 	</div>
 	{{end}}
 	</form>
-</div>
\ No newline at end of file
+</div>

From 757bd15cdf447e7235ce6ef9d178b4a1a1bb8ad6 Mon Sep 17 00:00:00 2001
From: rafh <rafaelheard@gmail.com>
Date: Sun, 18 Feb 2024 22:19:36 -0500
Subject: [PATCH 9/9] left align input lables for link account pages

---
 web_src/css/form.css | 2 --
 1 file changed, 2 deletions(-)

diff --git a/web_src/css/form.css b/web_src/css/form.css
index c0de4978ddfd..a5288c930920 100644
--- a/web_src/css/form.css
+++ b/web_src/css/form.css
@@ -242,7 +242,6 @@ textarea:focus,
 .user.activate form,
 .user.forgot.password form,
 .user.reset.password form,
-.user.link-account form,
 .user.signup form {
   margin: auto;
   width: 700px !important;
@@ -277,7 +276,6 @@ textarea:focus,
   .user.activate form .inline.field > label,
   .user.forgot.password form .inline.field > label,
   .user.reset.password form .inline.field > label,
-  .user.link-account form .inline.field > label,
   .user.signup form .inline.field > label {
     text-align: right;
     width: 250px !important;