Skip to content

Commit 8171478

Browse files
zeripathlunny
andauthored
Standardise icon on projects PR page (#15387)
Fix #15272 Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
1 parent 6341130 commit 8171478

File tree

1 file changed

+17
-4
lines changed

1 file changed

+17
-4
lines changed

templates/repo/projects/view.tmpl

+17-4
Original file line numberDiff line numberDiff line change
@@ -158,10 +158,23 @@
158158
<div class="card board-card" data-issue="{{.ID}}">
159159
<div class="content">
160160
<div class="header">
161-
<span class="{{if .IsClosed}}red{{else}}green{{end}}">
162-
{{if .IsPull}}{{svg "octicon-git-merge"}}
163-
{{else if .IsClosed}}{{svg "octicon-issue-closed"}}
164-
{{else}}{{svg "octicon-issue-opened"}}
161+
<span>
162+
{{if .IsPull}}
163+
{{if .PullRequest.HasMerged}}
164+
{{svg "octicon-git-merge" 16 "text purple"}}
165+
{{else}}
166+
{{if .IsClosed}}
167+
{{svg "octicon-git-pull-request" 16 "text red"}}
168+
{{else}}
169+
{{svg "octicon-git-pull-request" 16 "text green"}}
170+
{{end}}
171+
{{end}}
172+
{{else}}
173+
{{if .IsClosed}}
174+
{{svg "octicon-issue-closed" 16 "text red"}}
175+
{{else}}
176+
{{svg "octicon-issue-opened" 16 "text green"}}
177+
{{end}}
165178
{{end}}
166179
</span>
167180
<a class="project-board-title" href="{{$.RepoLink}}/issues/{{.Index}}">#{{.Index}} {{.Title}}</a>

0 commit comments

Comments
 (0)