aboutsummaryrefslogtreecommitdiffstats
path: root/templates/user/auth
diff options
context:
space:
mode:
authorsilverwind <me@silverwind.io>2020-11-26 20:33:28 +0100
committerGitHub <noreply@github.com>2020-11-26 19:33:28 +0000
commitb2de034278560f0fec9fc0919f1b75fa005de25c (patch)
treeb44ed3733c1b45d47e8c90fceb91758fabfb788f /templates/user/auth
parent03fa2eccbc6dcdaa08497201113af5f6c2ff6e6b (diff)
downloadgitea-b2de034278560f0fec9fc0919f1b75fa005de25c.tar.gz
gitea-b2de034278560f0fec9fc0919f1b75fa005de25c.zip
CSS navbar and color tweaks (#13609)
* CSS and color tweaks - Unify navbar-style menus - Fix admin bar overlapping menu bar - Fixes file edit comment box - Fix double border on review box - Fix review timeline icons * Many fixes to new-menu and navbar layout enhancements * misc settings fixes * navbar tweak * fix pr tabs * branch tag and arc color tweaks
Diffstat (limited to 'templates/user/auth')
-rw-r--r--templates/user/auth/link_account.tmpl40
-rw-r--r--templates/user/auth/signin_navbar.tmpl32
-rw-r--r--templates/user/auth/signup_openid_navbar.tmpl16
3 files changed, 47 insertions, 41 deletions
diff --git a/templates/user/auth/link_account.tmpl b/templates/user/auth/link_account.tmpl
index b7fa998a0d..8e1509b8ce 100644
--- a/templates/user/auth/link_account.tmpl
+++ b/templates/user/auth/link_account.tmpl
@@ -2,27 +2,29 @@
<div class="user link-account">
<div class="ui secondary pointing tabular top attached borderless menu new-menu navbar">
- <!-- TODO handle .ShowRegistrationButton once other login bugs are fixed -->
- <a class="item {{if not .user_exists}}active{{end}}"
- data-tab="auth-link-signup-tab">
- {{.i18n.Tr "auth.oauth_signup_tab"}}
- </a>
- <a class="item {{if .user_exists}}active{{end}}"
- data-tab="auth-link-signin-tab">
- {{.i18n.Tr "auth.oauth_signin_tab"}}
- </a>
- </div>
-
- <div class="ui middle very relaxed page grid">
- <div class="column">
- <div class="ui tab {{if not .user_exists}}active{{end}}"
+ <div class="new-menu-inner">
+ <!-- TODO handle .ShowRegistrationButton once other login bugs are fixed -->
+ <a class="item {{if not .user_exists}}active{{end}}"
data-tab="auth-link-signup-tab">
- {{template "user/auth/signup_inner" .}}
- </div>
- <div class="ui tab {{if .user_exists}}active{{end}}"
+ {{.i18n.Tr "auth.oauth_signup_tab"}}
+ </a>
+ <a class="item {{if .user_exists}}active{{end}}"
data-tab="auth-link-signin-tab">
- <div class="ui user signin container icon">
- {{template "user/auth/signin_inner" .}}
+ {{.i18n.Tr "auth.oauth_signin_tab"}}
+ </a>
+ </div>
+
+ <div class="ui middle very relaxed page grid">
+ <div class="column">
+ <div class="ui tab {{if not .user_exists}}active{{end}}"
+ data-tab="auth-link-signup-tab">
+ {{template "user/auth/signup_inner" .}}
+ </div>
+ <div class="ui tab {{if .user_exists}}active{{end}}"
+ data-tab="auth-link-signin-tab">
+ <div class="ui user signin container icon">
+ {{template "user/auth/signin_inner" .}}
+ </div>
</div>
</div>
</div>
diff --git a/templates/user/auth/signin_navbar.tmpl b/templates/user/auth/signin_navbar.tmpl
index 428a3d843a..85ebcd90f8 100644
--- a/templates/user/auth/signin_navbar.tmpl
+++ b/templates/user/auth/signin_navbar.tmpl
@@ -1,19 +1,21 @@
{{if or .EnableOpenIDSignIn .EnableSSPI}}
<div class="ui secondary pointing tabular top attached borderless menu new-menu navbar">
- <a class="{{if .PageIsLogin}}active{{end}} item" rel="nofollow" href="{{AppSubUrl}}/user/login">
- {{.i18n.Tr "auth.login_userpass"}}
- </a>
- {{if .EnableOpenIDSignIn}}
- <a class="{{if .PageIsLoginOpenID}}active{{end}} item" rel="nofollow" href="{{AppSubUrl}}/user/login/openid">
- <i class="fa fa-openid"></i>
- &nbsp;OpenID
- </a>
- {{end}}
- {{if .EnableSSPI}}
- <a class="item" rel="nofollow" href="{{AppSubUrl}}/user/login?auth_with_sspi=1">
- <i class="fa fa-windows"></i>
- &nbsp;SSPI
- </a>
- {{end}}
+ <div class="new-menu-inner">
+ <a class="{{if .PageIsLogin}}active{{end}} item" rel="nofollow" href="{{AppSubUrl}}/user/login">
+ {{.i18n.Tr "auth.login_userpass"}}
+ </a>
+ {{if .EnableOpenIDSignIn}}
+ <a class="{{if .PageIsLoginOpenID}}active{{end}} item" rel="nofollow" href="{{AppSubUrl}}/user/login/openid">
+ <i class="fa fa-openid"></i>
+ &nbsp;OpenID
+ </a>
+ {{end}}
+ {{if .EnableSSPI}}
+ <a class="item" rel="nofollow" href="{{AppSubUrl}}/user/login?auth_with_sspi=1">
+ <i class="fa fa-windows"></i>
+ &nbsp;SSPI
+ </a>
+ {{end}}
+ </div>
</div>
{{end}}
diff --git a/templates/user/auth/signup_openid_navbar.tmpl b/templates/user/auth/signup_openid_navbar.tmpl
index 86f6ee7d81..9ba727548c 100644
--- a/templates/user/auth/signup_openid_navbar.tmpl
+++ b/templates/user/auth/signup_openid_navbar.tmpl
@@ -1,11 +1,13 @@
<div class="ui secondary pointing tabular top attached borderless menu stackable new-menu navbar">
- <a class="{{if .PageIsOpenIDConnect}}active{{end}} item" href="{{AppSubUrl}}/user/openid/connect">
- {{.i18n.Tr "auth.openid_connect_title"}}
- </a>
- {{if .EnableOpenIDSignUp}}
- <a class="{{if .PageIsOpenIDRegister}}active{{end}} item" href="{{AppSubUrl}}/user/openid/register">
- {{.i18n.Tr "auth.openid_register_title"}}
+ <div class="new-menu-inner">
+ <a class="{{if .PageIsOpenIDConnect}}active{{end}} item" href="{{AppSubUrl}}/user/openid/connect">
+ {{.i18n.Tr "auth.openid_connect_title"}}
</a>
- {{end}}
+ {{if .EnableOpenIDSignUp}}
+ <a class="{{if .PageIsOpenIDRegister}}active{{end}} item" href="{{AppSubUrl}}/user/openid/register">
+ {{.i18n.Tr "auth.openid_register_title"}}
+ </a>
+ {{end}}
+ </div>
</div>