diff options
| author | silverwind <me@silverwind.io> | 2023-05-18 13:50:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-18 11:50:11 +0000 |
| commit | 1e1e8b5d43a36aa788ce0973fa57ac6df648cbd0 (patch) | |
| tree | 327adbf90c88765a071a0af25d9815d2736d4b4c /templates/user/auth | |
| parent | 09ab64dfad6754d88c7e4da15789bf845b19c30f (diff) | |
| download | gitea-1e1e8b5d43a36aa788ce0973fa57ac6df648cbd0.tar.gz gitea-1e1e8b5d43a36aa788ce0973fa57ac6df648cbd0.zip | |
Fix OAuth loading state (#24788)
Fix regression from https://github.com/go-gitea/gitea/pull/24740 where
the loading state was not showing because the `oauth-login-image` class
was removed. Replaced the Fomantic loader with a pure CSS loader and
cleaned up the HTML.
Diff:
https://github.com/go-gitea/gitea/pull/24788/files?diff=unified&w=1
Co-authored-by: Giteabot <teabot@gitea.io>
Diffstat (limited to 'templates/user/auth')
| -rw-r--r-- | templates/user/auth/signin_inner.tmpl | 51 |
1 files changed, 24 insertions, 27 deletions
diff --git a/templates/user/auth/signin_inner.tmpl b/templates/user/auth/signin_inner.tmpl index ceafc257ea..8d9375de75 100644 --- a/templates/user/auth/signin_inner.tmpl +++ b/templates/user/auth/signin_inner.tmpl @@ -54,33 +54,30 @@ {{if and .OrderedOAuth2Names .OAuth2Providers}} <hr class="ui divider"/> - <div class="oauth2 center"> - <div id="oauth2-login-loader" class="ui disabled centered loader"></div> - <div> - <div id="oauth2-login-navigator" class="gt-df gt-jc"> - <span class="gt-self-center gt-mr-3">{{.locale.Tr "sign_in_with"}}</span> - <div class="gt-df gt-fw gt-gap-4"> - {{range $key := .OrderedOAuth2Names}} - {{$provider := index $.OAuth2Providers $key}} - <a class="{{$provider.Name}} silenced oauth-login-link" href="{{AppSubUrl}}/user/oauth2/{{$key}}" data-tooltip-content="{{$provider.DisplayName}}{{if eq $provider.Name "openidConnect"}} ({{$key}}){{end}}"> - {{if eq $provider.Name "github"}} - {{svg "octicon-mark-github" 40}} - {{else if eq $provider.Name "gitlab"}} - {{svg "gitea-gitlab" 40}} - {{else if eq $provider.Name "openidConnect"}} - {{svg "gitea-openid" 40}} - {{else}} - <img - class="gt-object-contain" - width="40" - height="40" - alt="{{$provider.DisplayName}}{{if eq $provider.Name "openidConnect"}} ({{$key}}){{end}}" - src="{{AppSubUrl}}{{$provider.Image}}" - > - {{end}} - </a> - {{end}} - </div> + <div id="oauth2-login-navigator"> + <div id="oauth2-login-navigator-inner" class="gt-df gt-jc"> + <span class="gt-self-center gt-mr-3">{{.locale.Tr "sign_in_with"}}</span> + <div class="gt-df gt-fw gt-gap-4"> + {{range $key := .OrderedOAuth2Names}} + {{$provider := index $.OAuth2Providers $key}} + <a class="{{$provider.Name}} silenced oauth-login-link" href="{{AppSubUrl}}/user/oauth2/{{$key}}" data-tooltip-content="{{$provider.DisplayName}}{{if eq $provider.Name "openidConnect"}} ({{$key}}){{end}}"> + {{if eq $provider.Name "github"}} + {{svg "octicon-mark-github" 40}} + {{else if eq $provider.Name "gitlab"}} + {{svg "gitea-gitlab" 40}} + {{else if eq $provider.Name "openidConnect"}} + {{svg "gitea-openid" 40}} + {{else}} + <img + class="gt-object-contain" + width="40" + height="40" + alt="{{$provider.DisplayName}}{{if eq $provider.Name "openidConnect"}} ({{$key}}){{end}}" + src="{{AppSubUrl}}{{$provider.Image}}" + > + {{end}} + </a> + {{end}} </div> </div> </div> |