From bec60518e9cadb485030850e7a38881c7a17a9a9 Mon Sep 17 00:00:00 2001
From: zeripath <art27@cantab.net>
Date: Mon, 12 Apr 2021 09:05:55 +0100
Subject: [PATCH] Standardise icon on projects PR page (#15387) (#15409)

Backport #15387

Fix #15272

Signed-off-by: Andrew Thornton <art27@cantab.net>
---
 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 beb9fea7b6..ab65ec0cb6 100644
--- a/templates/repo/projects/view.tmpl
+++ b/templates/repo/projects/view.tmpl
@@ -112,10 +112,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>