Skip to content

Commit 07373f1

Browse files
authored
1 parent efb55cd commit 07373f1

File tree

6 files changed

+8
-16
lines changed

6 files changed

+8
-16
lines changed

templates/repo/issue/sidebar/label_list.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
{{$previousExclusiveScope = $exclusiveScope}}
2828
{{template "repo/issue/sidebar/label_list_item" dict "Label" .}}
2929
{{end}}
30-
<div class="divider"></div>
30+
{{if and $data.RepoLabels $data.OrgLabels}}<div class="divider"></div>{{end}}
3131
{{$previousExclusiveScope = "_no_scope"}}
3232
{{range $data.OrgLabels}}
3333
{{$exclusiveScope := .ExclusiveScope}}

templates/repo/issue/sidebar/milestone_list.tmpl

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,15 @@
2222
<div class="item clear-selection">{{ctx.Locale.Tr "repo.issues.new.clear_milestone"}}</div>
2323
<div class="scrolling menu">
2424
{{if $data.OpenMilestones}}
25-
<div class="divider"></div>
2625
<div class="header">{{ctx.Locale.Tr "repo.issues.new.open_milestone"}}</div>
2726
{{range $data.OpenMilestones}}
2827
<a class="item muted" data-value="{{.ID}}" href="{{$pageMeta.RepoLink}}/issues?milestone={{.ID}}">
2928
{{svg "octicon-milestone" 18}} {{.Name}}
3029
</a>
3130
{{end}}
3231
{{end}}
32+
{{if and $data.OpenMilestones $data.ClosedMilestones}}<div class="divider"></div>{{end}}
3333
{{if $data.ClosedMilestones}}
34-
<div class="divider"></div>
3534
<div class="header">{{ctx.Locale.Tr "repo.issues.new.closed_milestone"}}</div>
3635
{{range $data.ClosedMilestones}}
3736
<a class="item muted" data-value="{{.ID}}" href="{{$pageMeta.RepoLink}}/issues?milestone={{.ID}}">

templates/repo/issue/sidebar/project_list.tmpl

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,15 @@
2020
<div class="item clear-selection">{{ctx.Locale.Tr "repo.issues.new.clear_projects"}}</div>
2121
<div class="scrolling menu">
2222
{{if $data.OpenProjects}}
23-
<div class="divider"></div>
2423
<div class="header">{{ctx.Locale.Tr "repo.issues.new.open_projects"}}</div>
2524
{{range $data.OpenProjects}}
2625
<a class="item muted" data-value="{{.ID}}" href="{{.Link ctx}}">
2726
{{svg .IconName 18}} {{.Title}}
2827
</a>
2928
{{end}}
3029
{{end}}
30+
{{if and $data.OpenProjects $data.ClosedProjects}}<div class="divider"></div>{{end}}
3131
{{if $data.ClosedProjects}}
32-
<div class="divider"></div>
3332
<div class="header">{{ctx.Locale.Tr "repo.issues.new.closed_projects"}}</div>
3433
{{range $data.ClosedProjects}}
3534
<a class="item muted" data-value="{{.ID}}" href="{{.Link ctx}}">

templates/repo/issue/sidebar/reviewer_list.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<input type="text" placeholder="{{ctx.Locale.Tr "repo.issues.filter_reviewers"}}">
1818
</div>
1919
{{end}}
20-
<div class="scrolling menu">
20+
<div class="scrolling menu flex-items-menu">
2121
{{range $data.Reviewers}}
2222
{{if .User}}
2323
<a class="item muted {{if .Requested}}checked{{end}}" href="{{.User.HomeLink}}" data-value="{{.ItemID}}" data-can-change="{{.CanChange}}"

web_src/css/base.css

+4
Original file line numberDiff line numberDiff line change
@@ -1397,6 +1397,10 @@ table th[data-sortt-desc] .svg {
13971397
gap: .5rem;
13981398
min-width: 0;
13991399
}
1400+
.ui.dropdown .menu.flex-items-menu > .item img,
1401+
.ui.dropdown .menu.flex-items-menu > .item svg {
1402+
margin: 0; /* use gap, but not margin */
1403+
}
14001404

14011405
.ui.dropdown.ellipsis-items-nowrap > .text {
14021406
overflow: hidden;

web_src/css/repo.css

-10
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,6 @@
5353
.issue-sidebar-combo .ui.dropdown .item:not(.checked) .item-check-mark {
5454
visibility: hidden;
5555
}
56-
/* ideally, we should move these styles to ".ui.dropdown .menu.flex-items-menu > .item ...", could be done later */
57-
.issue-sidebar-combo .ui.dropdown .menu > .item > img,
58-
.issue-sidebar-combo .ui.dropdown .menu > .item > svg {
59-
margin: 0;
60-
}
6156

6257
.issue-content-right .dropdown > .menu {
6358
max-width: 270px;
@@ -79,11 +74,6 @@
7974
}
8075
}
8176

82-
.repository .issue-content-right .filter.menu {
83-
max-height: 500px;
84-
overflow-x: auto;
85-
}
86-
8777
.repository .filter.menu.labels .label-filter .menu .info {
8878
display: inline-block;
8979
padding: 0.5rem 0;

0 commit comments

Comments
 (0)