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 tweakstokarchuk/v1.17
parent
03fa2eccbc
commit
b2de034278
@ -1,35 +1,37 @@ |
|||||||
<div class="ui secondary pointing tabular top attached borderless menu stackable new-menu navbar"> |
<div class="ui secondary pointing tabular top attached borderless menu stackable new-menu navbar"> |
||||||
<a class="{{if .PageIsAdminDashboard}}active{{end}} item" href="{{AppSubUrl}}/admin"> |
<div class="new-menu-inner"> |
||||||
{{.i18n.Tr "admin.dashboard"}} |
<a class="{{if .PageIsAdminDashboard}}active{{end}} item" href="{{AppSubUrl}}/admin"> |
||||||
</a> |
{{.i18n.Tr "admin.dashboard"}} |
||||||
<a class="{{if .PageIsAdminUsers}}active{{end}} item" href="{{AppSubUrl}}/admin/users"> |
</a> |
||||||
{{.i18n.Tr "admin.users"}} |
<a class="{{if .PageIsAdminUsers}}active{{end}} item" href="{{AppSubUrl}}/admin/users"> |
||||||
</a> |
{{.i18n.Tr "admin.users"}} |
||||||
<a class="{{if .PageIsAdminOrganizations}}active{{end}} item" href="{{AppSubUrl}}/admin/orgs"> |
</a> |
||||||
{{.i18n.Tr "admin.organizations"}} |
<a class="{{if .PageIsAdminOrganizations}}active{{end}} item" href="{{AppSubUrl}}/admin/orgs"> |
||||||
</a> |
{{.i18n.Tr "admin.organizations"}} |
||||||
<a class="{{if .PageIsAdminRepositories}}active{{end}} item" href="{{AppSubUrl}}/admin/repos"> |
</a> |
||||||
{{.i18n.Tr "admin.repositories"}} |
<a class="{{if .PageIsAdminRepositories}}active{{end}} item" href="{{AppSubUrl}}/admin/repos"> |
||||||
</a> |
{{.i18n.Tr "admin.repositories"}} |
||||||
<a class="{{if .PageIsAdminHooks}}active{{end}} item" href="{{AppSubUrl}}/admin/hooks"> |
</a> |
||||||
{{.i18n.Tr "admin.hooks"}} |
<a class="{{if .PageIsAdminHooks}}active{{end}} item" href="{{AppSubUrl}}/admin/hooks"> |
||||||
</a> |
{{.i18n.Tr "admin.hooks"}} |
||||||
<a class="{{if .PageIsAdminSystemHooks}}active{{end}} item" href="{{AppSubUrl}}/admin/system-hooks"> |
</a> |
||||||
{{.i18n.Tr "admin.systemhooks"}} |
<a class="{{if .PageIsAdminSystemHooks}}active{{end}} item" href="{{AppSubUrl}}/admin/system-hooks"> |
||||||
</a> |
{{.i18n.Tr "admin.systemhooks"}} |
||||||
<a class="{{if .PageIsAdminAuthentications}}active{{end}} item" href="{{AppSubUrl}}/admin/auths"> |
</a> |
||||||
{{.i18n.Tr "admin.authentication"}} |
<a class="{{if .PageIsAdminAuthentications}}active{{end}} item" href="{{AppSubUrl}}/admin/auths"> |
||||||
</a> |
{{.i18n.Tr "admin.authentication"}} |
||||||
<a class="{{if .PageIsAdminEmails}}active{{end}} item" href="{{AppSubUrl}}/admin/emails"> |
</a> |
||||||
{{.i18n.Tr "admin.emails"}} |
<a class="{{if .PageIsAdminEmails}}active{{end}} item" href="{{AppSubUrl}}/admin/emails"> |
||||||
</a> |
{{.i18n.Tr "admin.emails"}} |
||||||
<a class="{{if .PageIsAdminConfig}}active{{end}} item" href="{{AppSubUrl}}/admin/config"> |
</a> |
||||||
{{.i18n.Tr "admin.config"}} |
<a class="{{if .PageIsAdminConfig}}active{{end}} item" href="{{AppSubUrl}}/admin/config"> |
||||||
</a> |
{{.i18n.Tr "admin.config"}} |
||||||
<a class="{{if .PageIsAdminNotices}}active{{end}} item" href="{{AppSubUrl}}/admin/notices"> |
</a> |
||||||
{{.i18n.Tr "admin.notices"}} |
<a class="{{if .PageIsAdminNotices}}active{{end}} item" href="{{AppSubUrl}}/admin/notices"> |
||||||
</a> |
{{.i18n.Tr "admin.notices"}} |
||||||
<a class="{{if .PageIsAdminMonitor}}active{{end}} item" href="{{AppSubUrl}}/admin/monitor"> |
</a> |
||||||
{{.i18n.Tr "admin.monitor"}} |
<a class="{{if .PageIsAdminMonitor}}active{{end}} item" href="{{AppSubUrl}}/admin/monitor"> |
||||||
</a> |
{{.i18n.Tr "admin.monitor"}} |
||||||
|
</a> |
||||||
|
</div> |
||||||
</div> |
</div> |
||||||
|
@ -1,29 +1,31 @@ |
|||||||
<div class="ui secondary pointing tabular top attached borderless menu stackable new-menu navbar"> |
<div class="ui secondary pointing tabular top attached borderless menu stackable new-menu navbar"> |
||||||
<a class="{{if .PageIsSettingsOptions}}active{{end}} item" href="{{.RepoLink}}/settings"> |
<div class="new-menu-inner"> |
||||||
{{.i18n.Tr "repo.settings.options"}} |
<a class="{{if .PageIsSettingsOptions}}active{{end}} item" href="{{.RepoLink}}/settings"> |
||||||
</a> |
{{.i18n.Tr "repo.settings.options"}} |
||||||
<a class="{{if .PageIsSettingsCollaboration}}active{{end}} item" href="{{.RepoLink}}/settings/collaboration"> |
|
||||||
{{.i18n.Tr "repo.settings.collaboration"}} |
|
||||||
</a> |
|
||||||
{{if not .Repository.IsEmpty}} |
|
||||||
<a class="{{if .PageIsSettingsBranches}}active{{end}} item" href="{{.RepoLink}}/settings/branches"> |
|
||||||
{{.i18n.Tr "repo.settings.branches"}} |
|
||||||
</a> |
</a> |
||||||
{{end}} |
<a class="{{if .PageIsSettingsCollaboration}}active{{end}} item" href="{{.RepoLink}}/settings/collaboration"> |
||||||
<a class="{{if .PageIsSettingsHooks}}active{{end}} item" href="{{.RepoLink}}/settings/hooks"> |
{{.i18n.Tr "repo.settings.collaboration"}} |
||||||
{{.i18n.Tr "repo.settings.hooks"}} |
|
||||||
</a> |
|
||||||
{{if .SignedUser.CanEditGitHook}} |
|
||||||
<a class="{{if .PageIsSettingsGitHooks}}active{{end}} item" href="{{.RepoLink}}/settings/hooks/git"> |
|
||||||
{{.i18n.Tr "repo.settings.githooks"}} |
|
||||||
</a> |
</a> |
||||||
{{end}} |
{{if not .Repository.IsEmpty}} |
||||||
<a class="{{if .PageIsSettingsKeys}}active{{end}} item" href="{{.RepoLink}}/settings/keys"> |
<a class="{{if .PageIsSettingsBranches}}active{{end}} item" href="{{.RepoLink}}/settings/branches"> |
||||||
{{.i18n.Tr "repo.settings.deploy_keys"}} |
{{.i18n.Tr "repo.settings.branches"}} |
||||||
</a> |
</a> |
||||||
{{if .LFSStartServer}} |
{{end}} |
||||||
<a class="{{if .PageIsSettingsLFS}}active{{end}} item" href="{{.RepoLink}}/settings/lfs"> |
<a class="{{if .PageIsSettingsHooks}}active{{end}} item" href="{{.RepoLink}}/settings/hooks"> |
||||||
{{.i18n.Tr "repo.settings.lfs"}} |
{{.i18n.Tr "repo.settings.hooks"}} |
||||||
</a> |
</a> |
||||||
{{end}} |
{{if .SignedUser.CanEditGitHook}} |
||||||
|
<a class="{{if .PageIsSettingsGitHooks}}active{{end}} item" href="{{.RepoLink}}/settings/hooks/git"> |
||||||
|
{{.i18n.Tr "repo.settings.githooks"}} |
||||||
|
</a> |
||||||
|
{{end}} |
||||||
|
<a class="{{if .PageIsSettingsKeys}}active{{end}} item" href="{{.RepoLink}}/settings/keys"> |
||||||
|
{{.i18n.Tr "repo.settings.deploy_keys"}} |
||||||
|
</a> |
||||||
|
{{if .LFSStartServer}} |
||||||
|
<a class="{{if .PageIsSettingsLFS}}active{{end}} item" href="{{.RepoLink}}/settings/lfs"> |
||||||
|
{{.i18n.Tr "repo.settings.lfs"}} |
||||||
|
</a> |
||||||
|
{{end}} |
||||||
|
</div> |
||||||
</div> |
</div> |
||||||
|
@ -1,19 +1,21 @@ |
|||||||
{{if or .EnableOpenIDSignIn .EnableSSPI}} |
{{if or .EnableOpenIDSignIn .EnableSSPI}} |
||||||
<div class="ui secondary pointing tabular top attached borderless menu new-menu navbar"> |
<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"> |
<div class="new-menu-inner"> |
||||||
{{.i18n.Tr "auth.login_userpass"}} |
<a class="{{if .PageIsLogin}}active{{end}} item" rel="nofollow" href="{{AppSubUrl}}/user/login"> |
||||||
</a> |
{{.i18n.Tr "auth.login_userpass"}} |
||||||
{{if .EnableOpenIDSignIn}} |
</a> |
||||||
<a class="{{if .PageIsLoginOpenID}}active{{end}} item" rel="nofollow" href="{{AppSubUrl}}/user/login/openid"> |
{{if .EnableOpenIDSignIn}} |
||||||
<i class="fa fa-openid"></i> |
<a class="{{if .PageIsLoginOpenID}}active{{end}} item" rel="nofollow" href="{{AppSubUrl}}/user/login/openid"> |
||||||
OpenID |
<i class="fa fa-openid"></i> |
||||||
</a> |
OpenID |
||||||
{{end}} |
</a> |
||||||
{{if .EnableSSPI}} |
{{end}} |
||||||
<a class="item" rel="nofollow" href="{{AppSubUrl}}/user/login?auth_with_sspi=1"> |
{{if .EnableSSPI}} |
||||||
<i class="fa fa-windows"></i> |
<a class="item" rel="nofollow" href="{{AppSubUrl}}/user/login?auth_with_sspi=1"> |
||||||
SSPI |
<i class="fa fa-windows"></i> |
||||||
</a> |
SSPI |
||||||
{{end}} |
</a> |
||||||
|
{{end}} |
||||||
|
</div> |
||||||
</div> |
</div> |
||||||
{{end}} |
{{end}} |
||||||
|
@ -1,11 +1,13 @@ |
|||||||
<div class="ui secondary pointing tabular top attached borderless menu stackable new-menu navbar"> |
<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"> |
<div class="new-menu-inner"> |
||||||
{{.i18n.Tr "auth.openid_connect_title"}} |
<a class="{{if .PageIsOpenIDConnect}}active{{end}} item" href="{{AppSubUrl}}/user/openid/connect"> |
||||||
</a> |
{{.i18n.Tr "auth.openid_connect_title"}} |
||||||
{{if .EnableOpenIDSignUp}} |
|
||||||
<a class="{{if .PageIsOpenIDRegister}}active{{end}} item" href="{{AppSubUrl}}/user/openid/register"> |
|
||||||
{{.i18n.Tr "auth.openid_register_title"}} |
|
||||||
</a> |
</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> |
</div> |
||||||
|
|
||||||
|
@ -1,23 +1,25 @@ |
|||||||
<div class="ui secondary pointing tabular top attached borderless menu stackable new-menu navbar"> |
<div class="ui secondary pointing tabular top attached borderless menu stackable new-menu navbar"> |
||||||
<a class="{{if .PageIsSettingsProfile}}active{{end}} item" href="{{AppSubUrl}}/user/settings"> |
<div class="new-menu-inner"> |
||||||
{{.i18n.Tr "settings.profile"}} |
<a class="{{if .PageIsSettingsProfile}}active{{end}} item" href="{{AppSubUrl}}/user/settings"> |
||||||
</a> |
{{.i18n.Tr "settings.profile"}} |
||||||
<a class="{{if .PageIsSettingsAccount}}active{{end}} item" href="{{AppSubUrl}}/user/settings/account"> |
</a> |
||||||
{{.i18n.Tr "settings.account"}} |
<a class="{{if .PageIsSettingsAccount}}active{{end}} item" href="{{AppSubUrl}}/user/settings/account"> |
||||||
</a> |
{{.i18n.Tr "settings.account"}} |
||||||
<a class="{{if .PageIsSettingsSecurity}}active{{end}} item" href="{{AppSubUrl}}/user/settings/security"> |
</a> |
||||||
{{.i18n.Tr "settings.security"}} |
<a class="{{if .PageIsSettingsSecurity}}active{{end}} item" href="{{AppSubUrl}}/user/settings/security"> |
||||||
</a> |
{{.i18n.Tr "settings.security"}} |
||||||
<a class="{{if .PageIsSettingsApplications}}active{{end}} item" href="{{AppSubUrl}}/user/settings/applications"> |
</a> |
||||||
{{.i18n.Tr "settings.applications"}} |
<a class="{{if .PageIsSettingsApplications}}active{{end}} item" href="{{AppSubUrl}}/user/settings/applications"> |
||||||
</a> |
{{.i18n.Tr "settings.applications"}} |
||||||
<a class="{{if .PageIsSettingsKeys}}active{{end}} item" href="{{AppSubUrl}}/user/settings/keys"> |
</a> |
||||||
{{.i18n.Tr "settings.ssh_gpg_keys"}} |
<a class="{{if .PageIsSettingsKeys}}active{{end}} item" href="{{AppSubUrl}}/user/settings/keys"> |
||||||
</a> |
{{.i18n.Tr "settings.ssh_gpg_keys"}} |
||||||
<a class="{{if .PageIsSettingsOrganization}}active{{end}} item" href="{{AppSubUrl}}/user/settings/organization"> |
</a> |
||||||
{{.i18n.Tr "settings.organization"}} |
<a class="{{if .PageIsSettingsOrganization}}active{{end}} item" href="{{AppSubUrl}}/user/settings/organization"> |
||||||
</a> |
{{.i18n.Tr "settings.organization"}} |
||||||
<a class="{{if .PageIsSettingsRepos}}active{{end}} item" href="{{AppSubUrl}}/user/settings/repos"> |
</a> |
||||||
{{.i18n.Tr "settings.repos"}} |
<a class="{{if .PageIsSettingsRepos}}active{{end}} item" href="{{AppSubUrl}}/user/settings/repos"> |
||||||
</a> |
{{.i18n.Tr "settings.repos"}} |
||||||
|
</a> |
||||||
|
</div> |
||||||
</div> |
</div> |
||||||
|
Loading…
Reference in new issue