Skip to content

Add background to dashboard navbar, fix missing padding #29940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 20, 2024
Merged

Add background to dashboard navbar, fix missing padding #29940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a0494e
Add background to dashboard navbar, fix missing padding
silverwind Mar 20, 2024
597b393
margin tweaks
silverwind Mar 20, 2024
70c87f5
pixel tweaks
silverwind Mar 20, 2024
3a56151
fix comment
silverwind Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions templates/user/dashboard/navbar.tmpl
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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