diff options
Diffstat (limited to 'templates/repo')
| -rw-r--r-- | templates/repo/issue/sidebar/label_list.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/issue/sidebar/milestone_list.tmpl | 3 | ||||
| -rw-r--r-- | templates/repo/issue/sidebar/project_list.tmpl | 3 | ||||
| -rw-r--r-- | templates/repo/issue/sidebar/reviewer_list.tmpl | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/templates/repo/issue/sidebar/label_list.tmpl b/templates/repo/issue/sidebar/label_list.tmpl index 526eb1ec04..fb8f1a667e 100644 --- a/templates/repo/issue/sidebar/label_list.tmpl +++ b/templates/repo/issue/sidebar/label_list.tmpl @@ -27,7 +27,7 @@ {{$previousExclusiveScope = $exclusiveScope}} {{template "repo/issue/sidebar/label_list_item" dict "Label" .}} {{end}} - <div class="divider"></div> + {{if and $data.RepoLabels $data.OrgLabels}}<div class="divider"></div>{{end}} {{$previousExclusiveScope = "_no_scope"}} {{range $data.OrgLabels}} {{$exclusiveScope := .ExclusiveScope}} diff --git a/templates/repo/issue/sidebar/milestone_list.tmpl b/templates/repo/issue/sidebar/milestone_list.tmpl index 2d16c6e1b4..a5ed0eef55 100644 --- a/templates/repo/issue/sidebar/milestone_list.tmpl +++ b/templates/repo/issue/sidebar/milestone_list.tmpl @@ -22,7 +22,6 @@ <div class="item clear-selection">{{ctx.Locale.Tr "repo.issues.new.clear_milestone"}}</div> <div class="scrolling menu"> {{if $data.OpenMilestones}} - <div class="divider"></div> <div class="header">{{ctx.Locale.Tr "repo.issues.new.open_milestone"}}</div> {{range $data.OpenMilestones}} <a class="item muted" data-value="{{.ID}}" href="{{$pageMeta.RepoLink}}/issues?milestone={{.ID}}"> @@ -30,8 +29,8 @@ </a> {{end}} {{end}} + {{if and $data.OpenMilestones $data.ClosedMilestones}}<div class="divider"></div>{{end}} {{if $data.ClosedMilestones}} - <div class="divider"></div> <div class="header">{{ctx.Locale.Tr "repo.issues.new.closed_milestone"}}</div> {{range $data.ClosedMilestones}} <a class="item muted" data-value="{{.ID}}" href="{{$pageMeta.RepoLink}}/issues?milestone={{.ID}}"> diff --git a/templates/repo/issue/sidebar/project_list.tmpl b/templates/repo/issue/sidebar/project_list.tmpl index 6ca6156d2c..0cbbdce760 100644 --- a/templates/repo/issue/sidebar/project_list.tmpl +++ b/templates/repo/issue/sidebar/project_list.tmpl @@ -20,7 +20,6 @@ <div class="item clear-selection">{{ctx.Locale.Tr "repo.issues.new.clear_projects"}}</div> <div class="scrolling menu"> {{if $data.OpenProjects}} - <div class="divider"></div> <div class="header">{{ctx.Locale.Tr "repo.issues.new.open_projects"}}</div> {{range $data.OpenProjects}} <a class="item muted" data-value="{{.ID}}" href="{{.Link ctx}}"> @@ -28,8 +27,8 @@ </a> {{end}} {{end}} + {{if and $data.OpenProjects $data.ClosedProjects}}<div class="divider"></div>{{end}} {{if $data.ClosedProjects}} - <div class="divider"></div> <div class="header">{{ctx.Locale.Tr "repo.issues.new.closed_projects"}}</div> {{range $data.ClosedProjects}} <a class="item muted" data-value="{{.ID}}" href="{{.Link ctx}}"> diff --git a/templates/repo/issue/sidebar/reviewer_list.tmpl b/templates/repo/issue/sidebar/reviewer_list.tmpl index 16eea23d69..b3d9590d58 100644 --- a/templates/repo/issue/sidebar/reviewer_list.tmpl +++ b/templates/repo/issue/sidebar/reviewer_list.tmpl @@ -17,7 +17,7 @@ <input type="text" placeholder="{{ctx.Locale.Tr "repo.issues.filter_reviewers"}}"> </div> {{end}} - <div class="scrolling menu"> + <div class="scrolling menu flex-items-menu"> {{range $data.Reviewers}} {{if .User}} <a class="item muted {{if .Requested}}checked{{end}}" href="{{.User.HomeLink}}" data-value="{{.ItemID}}" data-can-change="{{.CanChange}}" |