Skip to content

Commit 23d0f90

Browse files
a1012112796a1012112796
authored
make search box in issue sidebar dropdown list always show when scrolling (#32576)
as title, replace #31597 after #32460 --------- Signed-off-by: a1012112796 <[email protected]>
1 parent 33850a8 commit 23d0f90

File tree

6 files changed

+88
-72
lines changed

6 files changed

+88
-72
lines changed

‎templates/repo/issue/sidebar/assignee_list.tmpl

+8-6
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@
1616
<input type="text" placeholder="{{ctx.Locale.Tr "repo.issues.filter_assignees"}}">
1717
</div>
1818
<div class="item clear-selection">{{ctx.Locale.Tr "repo.issues.new.clear_assignees"}}</div>
19-
{{range $data.CandidateAssignees}}
20-
<a class="item muted" href="#" data-value="{{.ID}}">
21-
<span class="item-check-mark">{{svg "octicon-check"}}</span>
22-
{{ctx.AvatarUtils.Avatar . 20}} {{template "repo/search_name" .}}
23-
</a>
24-
{{end}}
19+
<div class="scrolling menu">
20+
{{range $data.CandidateAssignees}}
21+
<a class="item muted" href="#" data-value="{{.ID}}">
22+
<span class="item-check-mark">{{svg "octicon-check"}}</span>
23+
{{ctx.AvatarUtils.Avatar . 20}} {{template "repo/search_name" .}}
24+
</a>
25+
{{end}}
26+
</div>
2527
</div>
2628
</div>
2729
<div class="ui list tw-flex tw-flex-row tw-gap-2">

‎templates/repo/issue/sidebar/label_list.tmpl

+19-17
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,27 @@
1717
<input type="text" placeholder="{{ctx.Locale.Tr "repo.issues.filter_labels"}}">
1818
</div>
1919
<a class="item clear-selection" href="#">{{ctx.Locale.Tr "repo.issues.new.clear_labels"}}</a>
20-
{{$previousExclusiveScope := "_no_scope"}}
21-
{{range $data.RepoLabels}}
22-
{{$exclusiveScope := .ExclusiveScope}}
23-
{{if and (ne $previousExclusiveScope "_no_scope") (ne $previousExclusiveScope $exclusiveScope)}}
24-
<div class="divider"></div>
20+
<div class="scrolling menu">
21+
{{$previousExclusiveScope := "_no_scope"}}
22+
{{range $data.RepoLabels}}
23+
{{$exclusiveScope := .ExclusiveScope}}
24+
{{if and (ne $previousExclusiveScope "_no_scope") (ne $previousExclusiveScope $exclusiveScope)}}
25+
<div class="divider"></div>
26+
{{end}}
27+
{{$previousExclusiveScope = $exclusiveScope}}
28+
{{template "repo/issue/sidebar/label_list_item" dict "Label" .}}
2529
{{end}}
26-
{{$previousExclusiveScope = $exclusiveScope}}
27-
{{template "repo/issue/sidebar/label_list_item" dict "Label" .}}
28-
{{end}}
29-
<div class="divider"></div>
30-
{{$previousExclusiveScope = "_no_scope"}}
31-
{{range $data.OrgLabels}}
32-
{{$exclusiveScope := .ExclusiveScope}}
33-
{{if and (ne $previousExclusiveScope "_no_scope") (ne $previousExclusiveScope $exclusiveScope)}}
34-
<div class="divider"></div>
30+
<div class="divider"></div>
31+
{{$previousExclusiveScope = "_no_scope"}}
32+
{{range $data.OrgLabels}}
33+
{{$exclusiveScope := .ExclusiveScope}}
34+
{{if and (ne $previousExclusiveScope "_no_scope") (ne $previousExclusiveScope $exclusiveScope)}}
35+
<div class="divider"></div>
36+
{{end}}
37+
{{$previousExclusiveScope = $exclusiveScope}}
38+
{{template "repo/issue/sidebar/label_list_item" dict "Label" .}}
3539
{{end}}
36-
{{$previousExclusiveScope = $exclusiveScope}}
37-
{{template "repo/issue/sidebar/label_list_item" dict "Label" .}}
38-
{{end}}
40+
</div>
3941
{{end}}
4042
</div>
4143
</div>

‎templates/repo/issue/sidebar/milestone_list.tmpl

+18-16
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,27 @@
2020
</div>
2121
<div class="divider"></div>
2222
<div class="item clear-selection">{{ctx.Locale.Tr "repo.issues.new.clear_milestone"}}</div>
23-
{{if $data.OpenMilestones}}
24-
<div class="divider"></div>
25-
<div class="header">{{ctx.Locale.Tr "repo.issues.new.open_milestone"}}</div>
26-
{{range $data.OpenMilestones}}
27-
<a class="item muted" data-value="{{.ID}}" href="{{$pageMeta.RepoLink}}/issues?milestone={{.ID}}">
28-
{{svg "octicon-milestone" 18}} {{.Name}}
29-
</a>
23+
<div class="scrolling menu">
24+
{{if $data.OpenMilestones}}
25+
<div class="divider"></div>
26+
<div class="header">{{ctx.Locale.Tr "repo.issues.new.open_milestone"}}</div>
27+
{{range $data.OpenMilestones}}
28+
<a class="item muted" data-value="{{.ID}}" href="{{$pageMeta.RepoLink}}/issues?milestone={{.ID}}">
29+
{{svg "octicon-milestone" 18}} {{.Name}}
30+
</a>
31+
{{end}}
3032
{{end}}
31-
{{end}}
32-
{{if $data.ClosedMilestones}}
33-
<div class="divider"></div>
34-
<div class="header">{{ctx.Locale.Tr "repo.issues.new.closed_milestone"}}</div>
35-
{{range $data.ClosedMilestones}}
36-
<a class="item muted" data-value="{{.ID}}" href="{{$pageMeta.RepoLink}}/issues?milestone={{.ID}}">
37-
{{svg "octicon-milestone" 18}} {{.Name}}
38-
</a>
33+
{{if $data.ClosedMilestones}}
34+
<div class="divider"></div>
35+
<div class="header">{{ctx.Locale.Tr "repo.issues.new.closed_milestone"}}</div>
36+
{{range $data.ClosedMilestones}}
37+
<a class="item muted" data-value="{{.ID}}" href="{{$pageMeta.RepoLink}}/issues?milestone={{.ID}}">
38+
{{svg "octicon-milestone" 18}} {{.Name}}
39+
</a>
40+
{{end}}
3941
{{end}}
4042
{{end}}
41-
{{end}}
43+
</div>
4244
</div>
4345
</div>
4446

‎templates/repo/issue/sidebar/project_list.tmpl

+18-16
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,26 @@
1818
</div>
1919
{{end}}
2020
<div class="item clear-selection">{{ctx.Locale.Tr "repo.issues.new.clear_projects"}}</div>
21-
{{if $data.OpenProjects}}
22-
<div class="divider"></div>
23-
<div class="header">{{ctx.Locale.Tr "repo.issues.new.open_projects"}}</div>
24-
{{range $data.OpenProjects}}
25-
<a class="item muted" data-value="{{.ID}}" href="{{.Link ctx}}">
26-
{{svg .IconName 18}} {{.Title}}
27-
</a>
21+
<div class="scrolling menu">
22+
{{if $data.OpenProjects}}
23+
<div class="divider"></div>
24+
<div class="header">{{ctx.Locale.Tr "repo.issues.new.open_projects"}}</div>
25+
{{range $data.OpenProjects}}
26+
<a class="item muted" data-value="{{.ID}}" href="{{.Link ctx}}">
27+
{{svg .IconName 18}} {{.Title}}
28+
</a>
29+
{{end}}
2830
{{end}}
29-
{{end}}
30-
{{if $data.ClosedProjects}}
31-
<div class="divider"></div>
32-
<div class="header">{{ctx.Locale.Tr "repo.issues.new.closed_projects"}}</div>
33-
{{range $data.ClosedProjects}}
34-
<a class="item muted" data-value="{{.ID}}" href="{{.Link ctx}}">
35-
{{svg .IconName 18}} {{.Title}}
36-
</a>
31+
{{if $data.ClosedProjects}}
32+
<div class="divider"></div>
33+
<div class="header">{{ctx.Locale.Tr "repo.issues.new.closed_projects"}}</div>
34+
{{range $data.ClosedProjects}}
35+
<a class="item muted" data-value="{{.ID}}" href="{{.Link ctx}}">
36+
{{svg .IconName 18}} {{.Title}}
37+
</a>
38+
{{end}}
3739
{{end}}
38-
{{end}}
40+
</div>
3941
</div>
4042
</div>
4143
<div class="ui list">

‎templates/repo/issue/sidebar/reviewer_list.tmpl

+19-17
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,29 @@
1717
<input type="text" placeholder="{{ctx.Locale.Tr "repo.issues.filter_reviewers"}}">
1818
</div>
1919
{{end}}
20-
{{range $data.Reviewers}}
21-
{{if .User}}
22-
<a class="item muted {{if .Requested}}checked{{end}}" href="{{.User.HomeLink}}" data-value="{{.ItemID}}" data-can-change="{{.CanChange}}"
23-
{{if not .CanChange}}data-tooltip-content="{{ctx.Locale.Tr "repo.issues.remove_request_review_block"}}"{{end}}>
24-
<span class="item-check-mark">{{svg "octicon-check"}}</span>
25-
{{ctx.AvatarUtils.Avatar .User 20}} {{template "repo/search_name" .User}}
26-
</a>
27-
{{end}}
28-
{{end}}
29-
{{if $data.TeamReviewers}}
30-
{{if $data.Reviewers}}<div class="divider"></div>{{end}}
31-
{{range $data.TeamReviewers}}
32-
{{if .Team}}
33-
<a class="item muted {{if .Requested}}checked{{end}}" href="#" data-value="{{.ItemID}}" data-can-change="{{.CanChange}}"
34-
{{if not .CanChange}} data-tooltip-content="{{ctx.Locale.Tr "repo.issues.remove_request_review_block"}}"{{end}}>
20+
<div class="scrolling menu">
21+
{{range $data.Reviewers}}
22+
{{if .User}}
23+
<a class="item muted {{if .Requested}}checked{{end}}" href="{{.User.HomeLink}}" data-value="{{.ItemID}}" data-can-change="{{.CanChange}}"
24+
{{if not .CanChange}}data-tooltip-content="{{ctx.Locale.Tr "repo.issues.remove_request_review_block"}}"{{end}}>
3525
<span class="item-check-mark">{{svg "octicon-check"}}</span>
36-
{{svg "octicon-people" 20}} {{$repoOwnerName}}/{{.Team.Name}}
26+
{{ctx.AvatarUtils.Avatar .User 20}} {{template "repo/search_name" .User}}
3727
</a>
3828
{{end}}
3929
{{end}}
40-
{{end}}
30+
{{if $data.TeamReviewers}}
31+
{{if $data.Reviewers}}<div class="divider"></div>{{end}}
32+
{{range $data.TeamReviewers}}
33+
{{if .Team}}
34+
<a class="item muted {{if .Requested}}checked{{end}}" href="#" data-value="{{.ItemID}}" data-can-change="{{.CanChange}}"
35+
{{if not .CanChange}} data-tooltip-content="{{ctx.Locale.Tr "repo.issues.remove_request_review_block"}}"{{end}}>
36+
<span class="item-check-mark">{{svg "octicon-check"}}</span>
37+
{{svg "octicon-people" 20}} {{$repoOwnerName}}/{{.Team.Name}}
38+
</a>
39+
{{end}}
40+
{{end}}
41+
{{end}}
42+
</div>
4143
</div>
4244
</div>
4345

‎web_src/css/repo.css

+6
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,12 @@
6666
overflow-x: auto;
6767
}
6868

69+
.issue-content-right .dropdown > .menu .item-secondary-info small {
70+
display: block;
71+
text-overflow: ellipsis;
72+
overflow: hidden;
73+
}
74+
6975
@media (max-width: 767.98px) {
7076
.issue-content-left,
7177
.issue-content-right {

0 commit comments

Comments
 (0)