Skip to content

Commit c8e3fbf

Browse files
committed
fix navbar context user switch
1 parent c814ac5 commit c8e3fbf

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

templates/user/dashboard/navbar.tmpl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,32 @@
22
<div class="ui secondary stackable menu">
33
<div class="item">
44
<div class="ui floating dropdown jump">
5-
<span class="text truncated-item-container">
5+
<span class="text">
66
{{ctx.AvatarUtils.Avatar .ContextUser 24 "tw-mr-1"}}
7-
<span class="truncated-item-name">{{.ContextUser.ShortName 40}}</span>
7+
<span class="gt-ellipsis">{{.ContextUser.ShortName 40}}</span>
88
<span class="org-visibility">
99
{{if .ContextUser.Visibility.IsLimited}}<div class="ui basic tiny horizontal label">{{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}</div>{{end}}
1010
{{if .ContextUser.Visibility.IsPrivate}}<div class="ui basic tiny horizontal label">{{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}</div>{{end}}
1111
</span>
1212
{{svg "octicon-triangle-down" 14 "dropdown icon tw-ml-1"}}
1313
</span>
14-
<div class="context user overflow menu">
14+
<div class="menu context-user-switch">
1515
<div class="header">
1616
{{ctx.Locale.Tr "home.switch_dashboard_context"}}
1717
</div>
18-
<div class="scrolling menu items">
19-
<a class="{{if eq .ContextUser.ID .SignedUser.ID}}active selected{{end}} item truncated-item-container" href="{{AppSubUrl}}/{{if .PageIsIssues}}issues{{else if .PageIsPulls}}pulls{{else if .PageIsMilestonesDashboard}}milestones{{end}}">
18+
<div class="scrolling menu">
19+
<a class="{{if eq .ContextUser.ID .SignedUser.ID}}active selected{{end}} item" href="{{AppSubUrl}}/{{if .PageIsIssues}}issues{{else if .PageIsPulls}}pulls{{else if .PageIsMilestonesDashboard}}milestones{{end}}">
2020
{{ctx.AvatarUtils.Avatar .SignedUser}}
21-
<span class="truncated-item-name">{{.SignedUser.ShortName 40}}</span>
21+
<span class="gt-ellipsis">{{.SignedUser.ShortName 40}}</span>
2222
<span class="org-visibility">
2323
{{if .SignedUser.Visibility.IsLimited}}<div class="ui basic tiny horizontal label">{{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}</div>{{end}}
2424
{{if .SignedUser.Visibility.IsPrivate}}<div class="ui basic tiny horizontal label">{{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}</div>{{end}}
2525
</span>
2626
</a>
2727
{{range .Orgs}}
28-
<a class="{{if eq $.ContextUser.ID .ID}}active selected{{end}} item truncated-item-container" title="{{.Name}}" href="{{.OrganisationLink}}/{{if $.PageIsIssues}}issues{{else if $.PageIsPulls}}pulls{{else if $.PageIsMilestonesDashboard}}milestones{{else}}dashboard{{end}}">
28+
<a class="{{if eq $.ContextUser.ID .ID}}active selected{{end}} item" title="{{.Name}}" href="{{.OrganisationLink}}/{{if $.PageIsIssues}}issues{{else if $.PageIsPulls}}pulls{{else if $.PageIsMilestonesDashboard}}milestones{{else}}dashboard{{end}}">
2929
{{ctx.AvatarUtils.Avatar .}}
30-
<span class="truncated-item-name">{{.ShortName 40}}</span>
30+
<span class="gt-ellipsis">{{.ShortName 40}}</span>
3131
<span class="org-visibility">
3232
{{if .Visibility.IsLimited}}<div class="ui basic tiny horizontal label">{{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}</div>{{end}}
3333
{{if .Visibility.IsPrivate}}<div class="ui basic tiny horizontal label">{{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}</div>{{end}}

web_src/css/base.css

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -646,10 +646,11 @@ img.ui.avatar,
646646
border: 1px solid;
647647
}
648648

649-
.ui.floating.dropdown .overflow.menu .scrolling.menu.items {
649+
.ui.dropdown .menu.context-user-switch .scrolling.menu {
650650
border-radius: 0 !important;
651651
box-shadow: none !important;
652652
border-bottom: 1px solid var(--color-secondary);
653+
max-width: 80vw;
653654
}
654655

655656
.user-menu > .item {
@@ -1176,7 +1177,7 @@ the "!important" is necessary to override Fomantic UI menu item styles, meanwhil
11761177
overflow: hidden;
11771178
white-space: nowrap;
11781179
text-overflow: ellipsis;
1179-
line-height: 2.71em; /* matches fomantic dropdown's default min-height */
1180+
line-height: 2.71; /* matches fomantic dropdown's default min-height */
11801181
}
11811182

11821183
.ui.dropdown.ellipsis-text-items .menu > .item {

0 commit comments

Comments
 (0)