diff options
| -rw-r--r-- | templates/repo/issue/list.tmpl | 8 | ||||
| -rw-r--r-- | templates/repo/search_name.tmpl | 2 | ||||
| -rw-r--r-- | templates/shared/issuelist.tmpl | 18 | ||||
| -rw-r--r-- | web_src/css/helpers.css | 1 | ||||
| -rw-r--r-- | web_src/css/repository.css | 3 | ||||
| -rw-r--r-- | web_src/css/shared/issuelist.css | 1 |
6 files changed, 20 insertions, 13 deletions
diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 726ef25cfe..38ed3873ba 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -99,8 +99,8 @@ {{.locale.Tr "repo.issues.new.open_projects"}} </div> {{range .OpenProjects}} - <a class="{{if $.ProjectID}}{{if eq $.ProjectID .ID}}active selected{{end}}{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{$.MilestoneID}}&project={{.ID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}"> - {{svg .IconName 18 "gt-mr-3"}}{{.Title}} + <a class="{{if $.ProjectID}}{{if eq $.ProjectID .ID}}active selected{{end}}{{end}} item gt-df" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{$.MilestoneID}}&project={{.ID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}"> + {{svg .IconName 18 "gt-mr-3 gt-shrink-0"}}<span class="gt-ellipsis">{{.Title}}</span> </a> {{end}} {{end}} @@ -131,7 +131,7 @@ </div> <a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}">{{.locale.Tr "repo.issues.filter_poster_no_select"}}</a> {{range .Posters}} - <a class="{{if eq $.PosterID .ID}}active selected{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={{.ID}}"> + <a class="{{if eq $.PosterID .ID}}active selected{{end}} item gt-df" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={{.ID}}"> {{avatar $.Context .}}{{template "repo/search_name" .}} </a> {{end}} @@ -151,7 +151,7 @@ </div> <a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_assginee_no_select"}}</a> {{range .Assignees}} - <a class="{{if eq $.AssigneeID .ID}}active selected{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{.ID}}&poster={{$.PosterID}}"> + <a class="{{if eq $.AssigneeID .ID}}active selected{{end}} item gt-df" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{.ID}}&poster={{$.PosterID}}"> {{avatar $.Context .}}{{template "repo/search_name" .}} </a> {{end}} diff --git a/templates/repo/search_name.tmpl b/templates/repo/search_name.tmpl index 468f6c394c..5a481761cc 100644 --- a/templates/repo/search_name.tmpl +++ b/templates/repo/search_name.tmpl @@ -1 +1 @@ -{{.Name}}{{if IsShowFullName}}<span class="search-fullname"> {{.FullName}}</span>{{end}} +<span class="gt-ellipsis">{{.Name}}{{if IsShowFullName}}<span class="search-fullname"> {{.FullName}}</span>{{end}}</span> diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl index 40ddb4dab0..2720f7e26b 100644 --- a/templates/shared/issuelist.tmpl +++ b/templates/shared/issuelist.tmpl @@ -143,13 +143,15 @@ {{end}} </div> </div> + {{if or .TotalTrackedTime .Assignees .NumComments}} <div class="issue-item-icons-right gt-df gt-p-2"> + {{if .TotalTrackedTime}} <div class="issue-item-icon-right text grey"> - {{if .TotalTrackedTime}} {{svg "octicon-clock" 16 "gt-mr-2"}} {{.TotalTrackedTime | Sec2Time}} - {{end}} </div> + {{end}} + {{if .Assignees}} <div class="issue-item-icon-right text grey"> {{range .Assignees}} <a class="ui assignee tooltip gt-tdn" href="{{.HomeLink}}" data-content="{{.GetDisplayName}}" data-position="left center"> @@ -157,14 +159,16 @@ </a> {{end}} </div> + {{end}} + {{if .NumComments}} <div class="issue-item-icon-right text grey"> - {{if .NumComments}} - <a class="gt-tdn muted" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}"> - {{svg "octicon-comment" 16 "gt-mr-2"}}{{.NumComments}} - </a> - {{end}} + <a class="gt-tdn muted" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}"> + {{svg "octicon-comment" 16 "gt-mr-2"}}{{.NumComments}} + </a> </div> + {{end}} </div> + {{end}} </li> {{end}} {{if .IssueIndexerUnavailable}} diff --git a/web_src/css/helpers.css b/web_src/css/helpers.css index 4756d31bec..7c7d576db9 100644 --- a/web_src/css/helpers.css +++ b/web_src/css/helpers.css @@ -197,6 +197,7 @@ .gt-content-center { align-content: center !important; } +.gt-shrink-0 { flex-shrink: 0 !important; } .gt-whitespace-nowrap { white-space: nowrap !important; } @media (max-width: 767px) { diff --git a/web_src/css/repository.css b/web_src/css/repository.css index eb555abec8..34c76b15c9 100644 --- a/web_src/css/repository.css +++ b/web_src/css/repository.css @@ -143,7 +143,8 @@ .repository .filter.menu .menu { max-height: 500px; - overflow-x: auto; + max-width: 300px; + overflow-x: hidden; right: 0 !important; left: auto !important; } diff --git a/web_src/css/shared/issuelist.css b/web_src/css/shared/issuelist.css index 6e2cc737e7..ebb1ca989b 100644 --- a/web_src/css/shared/issuelist.css +++ b/web_src/css/shared/issuelist.css @@ -84,6 +84,7 @@ .issue.list > .item .desc a { color: inherit; + word-break: break-word; } .issue.list > .item .desc .time-since, |