From 8171478d1d692de9a10f22392e1d166fd7f0e332 Mon Sep 17 00:00:00 2001
From: zeripath <art27@cantab.net>
Date: Sun, 11 Apr 2021 16:00:14 +0100
Subject: [PATCH] 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>
---
templates/repo/projects/view.tmpl | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl
index 7a1583e556..aa6abf0511 100644
--- a/templates/repo/projects/view.tmpl
+++ b/templates/repo/projects/view.tmpl
@@ -158,10 +158,23 @@
<div class="card board-card" data-issue="{{.ID}}">
<div class="content">
<div class="header">
- <span class="{{if .IsClosed}}red{{else}}green{{end}}">
- {{if .IsPull}}{{svg "octicon-git-merge"}}
- {{else if .IsClosed}}{{svg "octicon-issue-closed"}}
- {{else}}{{svg "octicon-issue-opened"}}
+ <span>
+ {{if .IsPull}}
+ {{if .PullRequest.HasMerged}}
+ {{svg "octicon-git-merge" 16 "text purple"}}
+ {{else}}
+ {{if .IsClosed}}
+ {{svg "octicon-git-pull-request" 16 "text red"}}
+ {{else}}
+ {{svg "octicon-git-pull-request" 16 "text green"}}
+ {{end}}
+ {{end}}
+ {{else}}
+ {{if .IsClosed}}
+ {{svg "octicon-issue-closed" 16 "text red"}}
+ {{else}}
+ {{svg "octicon-issue-opened" 16 "text green"}}
+ {{end}}
{{end}}
</span>
<a class="project-board-title" href="{{$.RepoLink}}/issues/{{.Index}}">#{{.Index}} {{.Title}}</a>