Skip to content

Commit

Permalink
Add background to dashboard navbar, fix missing padding (#29940)
Browse files Browse the repository at this point in the history
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
#29922.
  • Loading branch information
silverwind authored Mar 20, 2024
1 parent 99d7ef5 commit 97b078d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
4 changes: 2 additions & 2 deletions templates/user/dashboard/navbar.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
<div class="item">
<div class="ui floating dropdown jump">
<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="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.IsPrivate}}<div class="ui basic tiny horizontal label">{{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}</div>{{end}}
</span>
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
{{svg "octicon-triangle-down" 14 "dropdown icon tw-ml-1"}}
</span>
<div class="context user overflow menu">
<div class="ui header">
Expand Down
5 changes: 3 additions & 2 deletions web_src/css/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,8 @@ img.ui.avatar,
}

.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;
}

Expand Down Expand Up @@ -1796,7 +1797,7 @@ table th[data-sortt-desc] .svg {

.ui.tabular.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);
}

Expand Down
3 changes: 2 additions & 1 deletion web_src/css/dashboard.css
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@
}

.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 {
Expand Down

0 comments on commit 97b078d

Please sign in to comment.