diff options
| author | zeripath | 2021-04-12 09:05:55 +0100 |
|---|---|---|
| committer | GitHub | 2021-04-12 10:05:55 +0200 |
| commit | bec60518e9cadb485030850e7a38881c7a17a9a9 (patch) | |
| tree | 455975982daa57217a813420b3637f7397b31eef | |
| parent | 015d11d26dd596703b40c0cc4121026282b9bbd3 (diff) | |
Standardise icon on projects PR page (#15387) (#15409)
Backport #15387
Fix #15272
Signed-off-by: Andrew Thornton <art27@cantab.net>
| -rw-r--r-- | templates/repo/projects/view.tmpl | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl index beb9fea7b..ab65ec0cb 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> |