Skip to content

Commit ebfda38

Browse files
committed
Standardise icon on projects PR page (go-gitea#15387)
Backport go-gitea#15387 Fix go-gitea#15272 Signed-off-by: Andrew Thornton <[email protected]>
1 parent 015d11d commit ebfda38

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
@@ -112,10 +112,23 @@
112112
<div class="card board-card" data-issue="{{.ID}}">
113113
<div class="content">
114114
<div class="header">
115-
<span class="{{if .IsClosed}}red{{else}}green{{end}}">
116-
{{if .IsPull}}{{svg "octicon-git-merge"}}
117-
{{else if .IsClosed}}{{svg "octicon-issue-closed"}}
118-
{{else}}{{svg "octicon-issue-opened"}}
115+
<span>
116+
{{if .IsPull}}
117+
{{if .PullRequest.HasMerged}}
118+
{{svg "octicon-git-merge" 16 "text purple"}}
119+
{{else}}
120+
{{if .IsClosed}}
121+
{{svg "octicon-git-pull-request" 16 "text red"}}
122+
{{else}}
123+
{{svg "octicon-git-pull-request" 16 "text green"}}
124+
{{end}}
125+
{{end}}
126+
{{else}}
127+
{{if .IsClosed}}
128+
{{svg "octicon-issue-closed" 16 "text red"}}
129+
{{else}}
130+
{{svg "octicon-issue-opened" 16 "text green"}}
131+
{{end}}
119132
{{end}}
120133
</span>
121134
<a class="project-board-title" href="{{$.RepoLink}}/issues/{{.Index}}">#{{.Index}} {{.Title}}</a>

0 commit comments

Comments
 (0)