diff options
| author | vnkmpf <tz@zztt.eu> | 2021-02-12 02:29:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-12 03:29:07 +0200 |
| commit | 51fb0463a349fd6eeb58ceeebd9ccf2267200ae6 (patch) | |
| tree | 9a97da5924b6bfdfb77959ca63ad705abdcd6584 /templates/user | |
| parent | 5a18712dd7dcffecf88d3071381a836a543d8f2a (diff) | |
| download | gitea-51fb0463a349fd6eeb58ceeebd9ccf2267200ae6.tar.gz gitea-51fb0463a349fd6eeb58ceeebd9ccf2267200ae6.zip | |
Fix truncated organization names (#14655)
* Fix truncated organization names
Previous ellipsis implementation hid vertical overflow - image + descent line of letters.
Organization visibility in select on dashboard was not always visible.
This commit extracts classes which don't make collisions with other items on page.
Diffstat (limited to 'templates/user')
| -rw-r--r-- | templates/user/dashboard/navbar.tmpl | 12 | ||||
| -rw-r--r-- | templates/user/project.tmpl | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl index c83ffde40a..a6ba1ffee3 100644 --- a/templates/user/dashboard/navbar.tmpl +++ b/templates/user/dashboard/navbar.tmpl @@ -2,9 +2,9 @@ <div class="ui secondary stackable menu"> <div class="item"> <div class="ui floating dropdown link jump"> - <span class="text"> + <span class="text truncated-item-container"> {{avatar .ContextUser}} - {{.ContextUser.ShortName 40}} + <span class="truncated-item-name">{{.ContextUser.ShortName 40}}</span> {{if .ContextUser.IsOrganization}} <span class="org-visibility"> {{if .ContextUser.Visibility.IsLimited}}<div class="ui orange tiny horizontal label">{{.i18n.Tr "org.settings.visibility.limited_shortname"}}</div>{{end}} @@ -18,14 +18,14 @@ {{.i18n.Tr "home.switch_dashboard_context"}} </div> <div class="scrolling menu items"> - <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}}"> + <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}}"> {{avatar .SignedUser}} - {{.SignedUser.ShortName 40}} + <span class="truncated-item-name">{{.SignedUser.ShortName 40}}</span> </a> {{range .Orgs}} - <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}}"> + <a class="{{if eq $.ContextUser.ID .ID}}active selected{{end}} item truncated-item-container" title="{{.Name}}" href="{{AppSubUrl}}/org/{{.Name}}/{{if $.PageIsIssues}}issues{{else if $.PageIsPulls}}pulls{{else if $.PageIsMilestonesDashboard}}milestones{{else}}dashboard{{end}}"> {{avatar .}} - {{.ShortName 40}} + <span class="truncated-item-name">{{.ShortName 40}}</span> <span class="org-visibility"> {{if .Visibility.IsLimited}}<div class="ui orange tiny horizontal label">{{$.i18n.Tr "org.settings.visibility.limited_shortname"}}</div>{{end}} {{if .Visibility.IsPrivate}}<div class="ui red tiny horizontal label">{{$.i18n.Tr "org.settings.visibility.private_shortname"}}</div>{{end}} diff --git a/templates/user/project.tmpl b/templates/user/project.tmpl index eabed943fe..a385e0bdc5 100644 --- a/templates/user/project.tmpl +++ b/templates/user/project.tmpl @@ -13,20 +13,20 @@ <label>{{.i18n.Tr "repo.owner"}}</label> <div class="ui selection owner dropdown"> <input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required> - <span class="text" title="{{.ContextUser.Name}}"> + <span class="text truncated-item-container" title="{{.ContextUser.Name}}"> {{avatar .ContextUser 28 "mini"}} - {{.ContextUser.ShortName 40}} + <span class="truncated-item-name">{{.ContextUser.ShortName 40}}</span> </span> {{svg "octicon-triangle-down" 14 "dropdown icon"}} <div class="menu"> - <div class="item" data-value="{{.SignedUser.ID}}" title="{{.SignedUser.Name}}"> + <div class="item truncated-item-container" data-value="{{.SignedUser.ID}}" title="{{.SignedUser.Name}}"> {{avatar .SignedUser 28 "mini"}} - {{.SignedUser.ShortName 40}} + <span class="truncated-item-name">{{.SignedUser.ShortName 40}}</span> </div> {{range .Orgs}} - <div class="item" data-value="{{.ID}}" title="{{.Name}}"> + <div class="item truncated-item-container" data-value="{{.ID}}" title="{{.Name}}"> {{avatar . 28 "mini"}} - {{.ShortName 40}} + <span class="truncated-item-name">{{.ShortName 40}}</span> </div> {{end}} </div> |