summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
author赵智超 <1012112796@qq.com>2020-04-06 01:01:12 +0800
committerGitHub <noreply@github.com>2020-04-05 20:01:12 +0300
commit9814dd68addc0f1c8337557216fdee13a993c1ee (patch)
treec7dd834d562303dfc61abd76eb1e5f6986ccbac1 /templates
parent686850e21f7561b002a4ffce3b9d221665c06377 (diff)
downloadgitea-9814dd68addc0f1c8337557216fdee13a993c1ee.tar.gz
gitea-9814dd68addc0f1c8337557216fdee13a993c1ee.zip
fix merge box icon color bug (#10974)
that because need some space beturn ``text`` and color defines Signed-off-by: a1012112796 <1012112796@qq.com>
Diffstat (limited to 'templates')
-rw-r--r--templates/repo/issue/view_content/pull.tmpl3
1 files changed, 1 insertions, 2 deletions
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl
index 3714e15cfe..c7cf737b34 100644
--- a/templates/repo/issue/view_content/pull.tmpl
+++ b/templates/repo/issue/view_content/pull.tmpl
@@ -39,8 +39,7 @@
</div>
{{end}}
<div class="comment merge box">
- <a class="avatar text
- {{- if .Issue.PullRequest.HasMerged}}purple
+ <a class="avatar text {{if .Issue.PullRequest.HasMerged}}purple
{{- else if .Issue.IsClosed}}grey
{{- else if .IsPullWorkInProgress}}grey
{{- else if .IsFilesConflicted}}grey