test1234
/
gitea
forked from gitea/gitea
1
0
Fork 0
Code Pull Requests Activity

fix merge box icon color bug (#10974) 

that because need some space beturn ``text`` and color defines

Signed-off-by: a1012112796 <1012112796@qq.com>
This commit is contained in:
赵智超 2020-04-06 01:01:12 +08:00 committed by GitHub
parent 686850e21f
commit 9814dd68ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
templates/repo/issue/view_content/pull.tmpl
View File

@ -39,8 +39,7 @@
</div> </div>
{{end}} {{end}}
<div class="comment merge box"> <div class="comment merge box">
<a class="avatar text <a class="avatar text {{if .Issue.PullRequest.HasMerged}}purple
{{- if .Issue.PullRequest.HasMerged}}purple
{{- else if .Issue.IsClosed}}grey {{- else if .Issue.IsClosed}}grey
{{- else if .IsPullWorkInProgress}}grey {{- else if .IsPullWorkInProgress}}grey
{{- else if .IsFilesConflicted}}grey {{- else if .IsFilesConflicted}}grey