Set manual tabindexes on login page (#31689)

Fixes https://github.com/go-gitea/gitea/issues/31686.

A more elborate manual tabindex numbering could be done, but I think
it's not really worth the extra effort and such stuff could easily break
during refactors.

Includes another small tweak to un-stretch the`<a>` element so it's only
as large as it needs to be and this change also made the margin
unneeded.
This commit is contained in:
silverwind 2024-09-20 17:27:19 +02:00 committed by GitHub
parent 3b10fd9b34
commit aa9faf8250
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 6 deletions

View File

@ -14,20 +14,22 @@
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<div class="required field {{if and (.Err_UserName) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn))}}error{{end}}"> <div class="required field {{if and (.Err_UserName) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn))}}error{{end}}">
<label for="user_name">{{ctx.Locale.Tr "home.uname_holder"}}</label> <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" type="text" name="user_name" value="{{.user_name}}" autofocus required tabindex="1">
</div> </div>
{{if or (not .DisablePassword) .LinkAccountMode}} {{if or (not .DisablePassword) .LinkAccountMode}}
<div class="required field {{if and (.Err_Password) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn))}}error{{end}} form-field-content-aside-label"> <div class="required field {{if and (.Err_Password) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn))}}error{{end}} form-field-content-aside-label">
<label for="password">{{ctx.Locale.Tr "password"}}</label> <label for="password">{{ctx.Locale.Tr "password"}}</label>
<a href="{{AppSubUrl}}/user/forgot_password">{{ctx.Locale.Tr "auth.forgot_password"}}</a> <div>
<input id="password" name="password" type="password" value="{{.password}}" autocomplete="current-password" required> <a href="{{AppSubUrl}}/user/forgot_password" tabindex="4">{{ctx.Locale.Tr "auth.forgot_password"}}</a>
</div>
<input id="password" name="password" type="password" value="{{.password}}" autocomplete="current-password" required tabindex="2">
</div> </div>
{{end}} {{end}}
{{if not .LinkAccountMode}} {{if not .LinkAccountMode}}
<div class="inline field"> <div class="inline field">
<div class="ui checkbox"> <div class="ui checkbox">
<label>{{ctx.Locale.Tr "auth.remember_me"}}</label> <label>{{ctx.Locale.Tr "auth.remember_me"}}</label>
<input name="remember" type="checkbox"> <input name="remember" type="checkbox" tabindex="5">
</div> </div>
</div> </div>
{{end}} {{end}}
@ -35,7 +37,7 @@
{{template "user/auth/captcha" .}} {{template "user/auth/captcha" .}}
<div class="field"> <div class="field">
<button class="ui primary button tw-w-full"> <button class="ui primary button tw-w-full" tabindex="3">
{{if .LinkAccountMode}} {{if .LinkAccountMode}}
{{ctx.Locale.Tr "auth.oauth_signin_submit"}} {{ctx.Locale.Tr "auth.oauth_signin_submit"}}
{{else}} {{else}}

View File

@ -456,7 +456,6 @@ textarea:focus,
} }
.form-field-content-aside-label > *:nth-child(2) { .form-field-content-aside-label > *:nth-child(2) {
text-align: right; text-align: right;
margin-bottom: 4px;
} }
.form-field-content-aside-label input { .form-field-content-aside-label input {
grid-column: span 2; grid-column: span 2;