thepaperpilot/forgejo
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions

Merge pull request '[UI] Fix inconsitencies in link/login account page' (#4902) from gusted/forgejo-ui-linking into forgejo

Browse source 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4902
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Reviewed-by: Caesar Schinas <caesar@caesarschinas.com>
This commit is contained in:
Gusted 2024-08-09 15:03:29 +00:00
commit d5ba61a104
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
templates/user/auth/link_account.tmpl
View file

@ -16,7 +16,7 @@
</div> </div>
</overflow-menu> </overflow-menu>
<div class="ui middle very relaxed page grid"> <div class="ui middle very relaxed page grid">
<div class="column"> <div class="column tw-flex tw-flex-col tw-gap-4 tw-max-w-2xl tw-m-auto">
<div class="ui tab {{if not .user_exists}}active{{end}}" <div class="ui tab {{if not .user_exists}}active{{end}}"
data-tab="auth-link-signup-tab"> data-tab="auth-link-signup-tab">
{{template "user/auth/signup_inner" .}} {{template "user/auth/signup_inner" .}}

4
templates/user/auth/signin_inner.tmpl
View file

@ -52,11 +52,11 @@
<div class="ui container fluid"> <div class="ui container fluid">
{{template "user/auth/webauthn_error" .}} {{template "user/auth/webauthn_error" .}}
<div class="ui attached segment header top tw-max-w-2xl tw-m-auto tw-flex tw-flex-col tw-items-center">
{{if .ShowRegistrationButton}} {{if .ShowRegistrationButton}}
<div class="ui attached segment header top tw-max-w-2xl tw-m-auto tw-flex tw-flex-col tw-items-center">
<div class="field"> <div class="field">
{{ctx.Locale.Tr "auth.hint_register" (printf "%s/user/sign_up" AppSubUrl)}} {{ctx.Locale.Tr "auth.hint_register" (printf "%s/user/sign_up" AppSubUrl)}}
</div> </div>
</div>
{{end}} {{end}}
</div> </div>
</div>

6
templates/user/auth/signup_inner.tmpl
View file

@ -53,12 +53,12 @@
</div> </div>
</div> </div>
{{if not .LinkAccountMode}}
<div class="ui container fluid"> <div class="ui container fluid">
<div class="ui attached segment header top tw-flex tw-flex-col tw-items-center"> <div class="ui attached segment header top tw-flex tw-flex-col tw-items-center">
{{if not .LinkAccountMode}}
<div class="field"> <div class="field">
{{ctx.Locale.Tr "auth.hint_login" (printf "%s/user/login" AppSubUrl)}} {{ctx.Locale.Tr "auth.hint_login" (printf "%s/user/login" AppSubUrl)}}
</div> </div>
</div>
</div>
{{end}} {{end}}
</div>
</div>