Skip to content

Commit b0114ef

Browse files
HesterGHesterG
authored
Merge branch 'main' into newfile-preview-23579
2 parents 8846ca3 + a9cceb0 commit b0114ef

File tree

6 files changed

+20
-13
lines changed

6 files changed

+20
-13
lines changed

‎templates/repo/issue/list.tmpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@
9999
{{.locale.Tr "repo.issues.new.open_projects"}}
100100
</div>
101101
{{range .OpenProjects}}
102-
<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}}">
103-
{{svg .IconName 18 "gt-mr-3"}}{{.Title}}
102+
<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}}">
103+
{{svg .IconName 18 "gt-mr-3 gt-shrink-0"}}<span class="gt-ellipsis">{{.Title}}</span>
104104
</a>
105105
{{end}}
106106
{{end}}
@@ -131,7 +131,7 @@
131131
</div>
132132
<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>
133133
{{range .Posters}}
134-
<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}}">
134+
<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}}">
135135
{{avatar $.Context .}}{{template "repo/search_name" .}}
136136
</a>
137137
{{end}}
@@ -151,7 +151,7 @@
151151
</div>
152152
<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>
153153
{{range .Assignees}}
154-
<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}}">
154+
<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}}">
155155
{{avatar $.Context .}}{{template "repo/search_name" .}}
156156
</a>
157157
{{end}}

‎templates/repo/search_name.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{{.Name}}{{if IsShowFullName}}<span class="search-fullname"> {{.FullName}}</span>{{end}}
1+
<span class="gt-ellipsis">{{.Name}}{{if IsShowFullName}}<span class="search-fullname"> {{.FullName}}</span>{{end}}</span>

‎templates/shared/issuelist.tmpl

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -143,28 +143,32 @@
143143
{{end}}
144144
</div>
145145
</div>
146+
{{if or .TotalTrackedTime .Assignees .NumComments}}
146147
<div class="issue-item-icons-right gt-df gt-p-2">
148+
{{if .TotalTrackedTime}}
147149
<div class="issue-item-icon-right text grey">
148-
{{if .TotalTrackedTime}}
149150
{{svg "octicon-clock" 16 "gt-mr-2"}}
150151
{{.TotalTrackedTime | Sec2Time}}
151-
{{end}}
152152
</div>
153+
{{end}}
154+
{{if .Assignees}}
153155
<div class="issue-item-icon-right text grey">
154156
{{range .Assignees}}
155157
<a class="ui assignee tooltip gt-tdn" href="{{.HomeLink}}" data-content="{{.GetDisplayName}}" data-position="left center">
156158
{{avatar $.Context .}}
157159
</a>
158160
{{end}}
159161
</div>
162+
{{end}}
163+
{{if .NumComments}}
160164
<div class="issue-item-icon-right text grey">
161-
{{if .NumComments}}
162-
<a class="gt-tdn muted" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">
163-
{{svg "octicon-comment" 16 "gt-mr-2"}}{{.NumComments}}
164-
</a>
165-
{{end}}
165+
<a class="gt-tdn muted" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">
166+
{{svg "octicon-comment" 16 "gt-mr-2"}}{{.NumComments}}
167+
</a>
166168
</div>
169+
{{end}}
167170
</div>
171+
{{end}}
168172
</li>
169173
{{end}}
170174
{{if .IssueIndexerUnavailable}}

‎web_src/css/helpers.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@
197197

198198
.gt-content-center { align-content: center !important; }
199199

200+
.gt-shrink-0 { flex-shrink: 0 !important; }
200201
.gt-whitespace-nowrap { white-space: nowrap !important; }
201202

202203
@media (max-width: 767px) {

‎web_src/css/repository.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,8 @@
143143

144144
.repository .filter.menu .menu {
145145
max-height: 500px;
146-
overflow-x: auto;
146+
max-width: 300px;
147+
overflow-x: hidden;
147148
right: 0 !important;
148149
left: auto !important;
149150
}

‎web_src/css/shared/issuelist.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484

8585
.issue.list > .item .desc a {
8686
color: inherit;
87+
word-break: break-word;
8788
}
8889

8990
.issue.list > .item .desc .time-since,

0 commit comments

Comments
 (0)