Skip to content

Commit 3a4801d

Browse files
vnkmpfvnkmpf
authored
Truncated organisations name #14583 (#14615)
- truncate to max length 40 - add CSS ellipsis
1 parent b337c60 commit 3a4801d

File tree

11 files changed

+39
-28
lines changed

11 files changed

+39
-28
lines changed

‎templates/repo/create.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,18 @@
2020
<input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required>
2121
<span class="text" title="{{.ContextUser.Name}}">
2222
{{avatar .ContextUser 28 "mini"}}
23-
{{.ContextUser.ShortName 20}}
23+
{{.ContextUser.ShortName 40}}
2424
</span>
2525
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
2626
<div class="menu">
2727
<div class="item" data-value="{{.SignedUser.ID}}" title="{{.SignedUser.Name}}">
2828
{{avatar .SignedUser 28 "mini"}}
29-
{{.SignedUser.ShortName 20}}
29+
{{.SignedUser.ShortName 40}}
3030
</div>
3131
{{range .Orgs}}
3232
<div class="item" data-value="{{.ID}}" title="{{.Name}}">
3333
{{avatar . 28 "mini"}}
34-
{{.ShortName 20}}
34+
{{.ShortName 40}}
3535
</div>
3636
{{end}}
3737
</div>

‎templates/repo/migrate/git.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,18 @@
4949
<input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required>
5050
<span class="text" title="{{.ContextUser.Name}}">
5151
{{avatar .ContextUser}}
52-
{{.ContextUser.ShortName 20}}
52+
{{.ContextUser.ShortName 40}}
5353
</span>
5454
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
5555
<div class="menu" title="{{.SignedUser.Name}}">
5656
<div class="item" data-value="{{.SignedUser.ID}}">
5757
{{avatar .SignedUser}}
58-
{{.SignedUser.ShortName 20}}
58+
{{.SignedUser.ShortName 40}}
5959
</div>
6060
{{range .Orgs}}
6161
<div class="item" data-value="{{.ID}}" title="{{.Name}}">
6262
{{avatar .}}
63-
{{.ShortName 20}}
63+
{{.ShortName 40}}
6464
</div>
6565
{{end}}
6666
</div>

‎templates/repo/migrate/gitea.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,18 +83,18 @@
8383
<input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required>
8484
<span class="text" title="{{.ContextUser.Name}}">
8585
{{avatar .ContextUser}}
86-
{{.ContextUser.ShortName 20}}
86+
{{.ContextUser.ShortName 40}}
8787
</span>
8888
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
8989
<div class="menu" title="{{.SignedUser.Name}}">
9090
<div class="item" data-value="{{.SignedUser.ID}}">
9191
{{avatar .SignedUser}}
92-
{{.SignedUser.ShortName 20}}
92+
{{.SignedUser.ShortName 40}}
9393
</div>
9494
{{range .Orgs}}
9595
<div class="item" data-value="{{.ID}}" title="{{.Name}}">
9696
{{avatar .}}
97-
{{.ShortName 20}}
97+
{{.ShortName 40}}
9898
</div>
9999
{{end}}
100100
</div>

‎templates/repo/migrate/github.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,18 +83,18 @@
8383
<input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required>
8484
<span class="text" title="{{.ContextUser.Name}}">
8585
{{avatar .ContextUser 28 "mini"}}
86-
{{.ContextUser.ShortName 20}}
86+
{{.ContextUser.ShortName 40}}
8787
</span>
8888
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
8989
<div class="menu" title="{{.SignedUser.Name}}">
9090
<div class="item" data-value="{{.SignedUser.ID}}">
9191
{{avatar .SignedUser 28 "mini"}}
92-
{{.SignedUser.ShortName 20}}
92+
{{.SignedUser.ShortName 40}}
9393
</div>
9494
{{range .Orgs}}
9595
<div class="item" data-value="{{.ID}}" title="{{.Name}}">
9696
{{avatar . 28 "mini"}}
97-
{{.ShortName 20}}
97+
{{.ShortName 40}}
9898
</div>
9999
{{end}}
100100
</div>

‎templates/repo/migrate/gitlab.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,18 +83,18 @@
8383
<input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required>
8484
<span class="text" title="{{.ContextUser.Name}}">
8585
{{avatar .ContextUser 28 "mini"}}
86-
{{.ContextUser.ShortName 20}}
86+
{{.ContextUser.ShortName 40}}
8787
</span>
8888
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
8989
<div class="menu" title="{{.SignedUser.Name}}">
9090
<div class="item" data-value="{{.SignedUser.ID}}">
9191
{{avatar .SignedUser 28 "mini"}}
92-
{{.SignedUser.ShortName 20}}
92+
{{.SignedUser.ShortName 40}}
9393
</div>
9494
{{range .Orgs}}
9595
<div class="item" data-value="{{.ID}}" title="{{.Name}}">
9696
{{avatar . 28 "mini"}}
97-
{{.ShortName 20}}
97+
{{.ShortName 40}}
9898
</div>
9999
{{end}}
100100
</div>

‎templates/repo/migrate/gogs.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,18 +85,18 @@
8585
<input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required>
8686
<span class="text" title="{{.ContextUser.Name}}">
8787
{{avatar .ContextUser}}
88-
{{.ContextUser.ShortName 20}}
88+
{{.ContextUser.ShortName 40}}
8989
</span>
9090
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
9191
<div class="menu" title="{{.SignedUser.Name}}">
9292
<div class="item" data-value="{{.SignedUser.ID}}">
9393
{{avatar .SignedUser}}
94-
{{.SignedUser.ShortName 20}}
94+
{{.SignedUser.ShortName 40}}
9595
</div>
9696
{{range .Orgs}}
9797
<div class="item" data-value="{{.ID}}" title="{{.Name}}">
9898
{{avatar .}}
99-
{{.ShortName 20}}
99+
{{.ShortName 40}}
100100
</div>
101101
{{end}}
102102
</div>

‎templates/repo/pulls/fork.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@
1515
<input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required>
1616
<span class="text" title="{{.ContextUser.Name}}">
1717
{{avatar .ContextUser 28 "mini"}}
18-
{{.ContextUser.ShortName 20}}
18+
{{.ContextUser.ShortName 40}}
1919
</span>
2020
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
2121
<div class="menu">
2222
{{if .CanForkToUser}}
2323
<div class="item" data-value="{{.SignedUser.ID}}" title="{{.SignedUser.Name}}">
2424
{{avatar .SignedUser 28 "mini"}}
25-
{{.SignedUser.ShortName 20}}
25+
{{.SignedUser.ShortName 40}}
2626
</div>
2727
{{end}}
2828
{{range .Orgs}}
2929
<div class="item" data-value="{{.ID}}" title="{{.Name}}">
3030
{{avatar . 28 "mini"}}
31-
{{.ShortName 20}}
31+
{{.ShortName 40}}
3232
</div>
3333
{{end}}
3434
</div>

‎templates/user/dashboard/navbar.tmpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div class="ui floating dropdown link jump">
55
<span class="text">
66
{{avatar .ContextUser}}
7-
{{.ContextUser.ShortName 20}}
7+
{{.ContextUser.ShortName 40}}
88
{{if .ContextUser.IsOrganization}}
99
<span class="org-visibility">
1010
{{if .ContextUser.Visibility.IsLimited}}<div class="ui orange tiny horizontal label">{{.i18n.Tr "org.settings.visibility.limited_shortname"}}</div>{{end}}
@@ -20,12 +20,12 @@
2020
<div class="scrolling menu items">
2121
<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}}">
2222
{{avatar .SignedUser}}
23-
{{.SignedUser.ShortName 20}}
23+
{{.SignedUser.ShortName 40}}
2424
</a>
2525
{{range .Orgs}}
2626
<a class="{{if eq $.ContextUser.ID .ID}}active selected{{end}} item" title="{{.Name}}" href="{{AppSubUrl}}/org/{{.Name}}/{{if $.PageIsIssues}}issues{{else if $.PageIsPulls}}pulls{{else if $.PageIsMilestonesDashboard}}milestones{{else}}dashboard{{end}}">
2727
{{avatar .}}
28-
{{.ShortName 20}}
28+
{{.ShortName 40}}
2929
<span class="org-visibility">
3030
{{if .Visibility.IsLimited}}<div class="ui orange tiny horizontal label">{{$.i18n.Tr "org.settings.visibility.limited_shortname"}}</div>{{end}}
3131
{{if .Visibility.IsPrivate}}<div class="ui red tiny horizontal label">{{$.i18n.Tr "org.settings.visibility.private_shortname"}}</div>{{end}}
@@ -94,7 +94,7 @@
9494
{{end}}
9595
<div class="item">
9696
<a class="ui blue basic button" href="{{.ContextUser.HomeLink}}" title='{{.i18n.Tr "home.view_home" .ContextUser.Name}}'>
97-
{{.i18n.Tr "home.view_home" (.ContextUser.ShortName 20)}}
97+
{{.i18n.Tr "home.view_home" (.ContextUser.ShortName 40)}}
9898
</a>
9999
</div>
100100
</div>

‎templates/user/project.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@
1515
<input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required>
1616
<span class="text" title="{{.ContextUser.Name}}">
1717
{{avatar .ContextUser 28 "mini"}}
18-
{{.ContextUser.ShortName 20}}
18+
{{.ContextUser.ShortName 40}}
1919
</span>
2020
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
2121
<div class="menu">
2222
<div class="item" data-value="{{.SignedUser.ID}}" title="{{.SignedUser.Name}}">
2323
{{avatar .SignedUser 28 "mini"}}
24-
{{.SignedUser.ShortName 20}}
24+
{{.SignedUser.ShortName 40}}
2525
</div>
2626
{{range .Orgs}}
2727
<div class="item" data-value="{{.ID}}" title="{{.Name}}">
2828
{{avatar . 28 "mini"}}
29-
{{.ShortName 20}}
29+
{{.ShortName 40}}
3030
</div>
3131
{{end}}
3232
</div>

‎web_src/less/_base.less

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,9 @@ a.muted:hover,
347347

348348
.ui.selection.dropdown .menu > .item {
349349
border-color: var(--color-secondary);
350+
white-space: nowrap;
351+
overflow: hidden;
352+
text-overflow: ellipsis;
350353
}
351354

352355
.ui.selection.visible.dropdown > .text:not(.default) {
@@ -387,6 +390,10 @@ a.muted:hover,
387390

388391
.ui.menu .ui.dropdown .menu > .item {
389392
color: var(--color-text) !important;
393+
white-space: nowrap;
394+
overflow: hidden;
395+
text-overflow: ellipsis;
396+
display: block;
390397
}
391398

392399
.ui.menu .ui.dropdown .menu > .item:hover {

‎web_src/less/_form.less

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,10 @@ textarea:focus,
278278
form {
279279
.dropdown .text {
280280
margin-right: 0 !important;
281+
282+
white-space: nowrap;
283+
overflow: hidden;
284+
text-overflow: ellipsis;
281285
}
282286

283287
.header {

0 commit comments

Comments
 (0)