diff options
| author | zeripath <art27@cantab.net> | 2021-04-11 16:00:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-11 11:00:14 -0400 |
| commit | 8171478d1d692de9a10f22392e1d166fd7f0e332 (patch) | |
| tree | 928399ef23066e5f44ac894c16762cbc9c456cb2 | |
| parent | 63411309fb010d2b7f739dd21dc3de06cfbfcc86 (diff) | |
| download | gitea-8171478d1d692de9a10f22392e1d166fd7f0e332.tar.gz gitea-8171478d1d692de9a10f22392e1d166fd7f0e332.zip | |
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>
| -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 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> |