Mirrors
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add background to dashboard navbar, fix missing padding (#29940) 

Two small CSS fixes:

1. Add background and reduced padding/avatar size to dashboard navbar.
We use that background already in a number of "secondary navbars", so it
fits.

<img width="1344" alt="Screenshot 2024-03-20 at 18 18 21"
src="https://github.com/go-gitea/gitea/assets/115237/ce5ebedc-e607-42c7-b7b4-b7a4c0ee68f2">

2. Fix padding on top of user settings and subscriptions, regressed by
https://github.com/go-gitea/gitea/pull/29922.
This commit is contained in:
silverwind 2024-03-20 19:33:00 +01:00 committed by GitHub
parent 99d7ef5091
commit 97b078d226
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/user/dashboard/navbar.tmpl
View File

@ -3,13 +3,13 @@
<div class="item"> <div class="item">
<div class="ui floating dropdown jump"> <div class="ui floating dropdown jump">
<span class="text truncated-item-container"> <span class="text truncated-item-container">
{{ctx.AvatarUtils.Avatar .ContextUser}} {{ctx.AvatarUtils.Avatar .ContextUser 24 "tw-mr-1"}}
<span class="truncated-item-name">{{.ContextUser.ShortName 40}}</span> <span class="truncated-item-name">{{.ContextUser.ShortName 40}}</span>
<span class="org-visibility"> <span class="org-visibility">
{{if .ContextUser.Visibility.IsLimited}}<div class="ui basic tiny horizontal label">{{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}</div>{{end}} {{if .ContextUser.Visibility.IsLimited}}<div class="ui basic tiny horizontal label">{{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}</div>{{end}}
{{if .ContextUser.Visibility.IsPrivate}}<div class="ui basic tiny horizontal label">{{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}</div>{{end}} {{if .ContextUser.Visibility.IsPrivate}}<div class="ui basic tiny horizontal label">{{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}</div>{{end}}
</span> </span>
{{svg "octicon-triangle-down" 14 "dropdown icon"}} {{svg "octicon-triangle-down" 14 "dropdown icon tw-ml-1"}}
</span> </span>
<div class="context user overflow menu"> <div class="context user overflow menu">
<div class="ui header"> <div class="ui header">

5
web_src/css/base.css
View File

@ -669,7 +669,8 @@ img.ui.avatar,
} }
.page-content.new:is(.repo,.migrate,.org), .page-content.new:is(.repo,.migrate,.org),
.page-content.profile:is(.user,.organization) { .page-content.profile:is(.user,.organization),
.page-content.user:is(.settings,.notification) {
padding-top: 15px; padding-top: 15px;
} }
@ -1796,7 +1797,7 @@ table th[data-sortt-desc] .svg {
.ui.tabular.menu .item, .ui.tabular.menu .item,
.ui.secondary.pointing.menu .item { .ui.secondary.pointing.menu .item {
padding: 11px 12px !important; padding: 11.55px 12px !important; /* match .dashboard-navbar in height */
color: var(--color-text-light-2); color: var(--color-text-light-2);
} }

3
web_src/css/dashboard.css
View File

@ -78,7 +78,8 @@
} }
.dashboard .dashboard-navbar { .dashboard .dashboard-navbar {
padding: 4px 12px; padding: 1px 12px; /* match .overflow-menu-items in height */
background: var(--color-header-wrapper);
} }
.dashboard .dashboard-navbar .org-visibility .label { .dashboard .dashboard-navbar .org-visibility .label {