diff options
| author | Andrey Nering <andrey.nering@gmail.com> | 2017-01-28 14:01:07 -0200 |
|---|---|---|
| committer | Andrey Nering <andrey.nering@gmail.com> | 2017-01-28 14:01:07 -0200 |
| commit | 5348e8b71ab42ae04c59b70b5225035bfe05b0a0 (patch) | |
| tree | 216494ab0efe19e43e0509e4c9085ad193167c05 /templates/user/notification | |
| parent | 27d30f1a619ff716e39d79e7322c487e1299b75d (diff) | |
| download | gitea-5348e8b71ab42ae04c59b70b5225035bfe05b0a0.tar.gz gitea-5348e8b71ab42ae04c59b70b5225035bfe05b0a0.zip | |
Fix color: closed PR was showing as purple instead of red
Diffstat (limited to 'templates/user/notification')
| -rw-r--r-- | templates/user/notification/notification.tmpl | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/templates/user/notification/notification.tmpl b/templates/user/notification/notification.tmpl index 04f3bf5a08..eb09c21ff0 100644 --- a/templates/user/notification/notification.tmpl +++ b/templates/user/notification/notification.tmpl @@ -40,15 +40,19 @@ <i class="blue octicon octicon-pin"></i> {{else if $issue.IsPull}} {{if $issue.IsClosed}} - <i class="octicon octicon-git-merge"></i> + {{if $issue.GetPullRequest.HasMerged}} + <i class="purple octicon octicon-git-merge"></i> + {{else}} + <i class="red octicon octicon-git-pull-request"></i> + {{end}} {{else}} - <i class="octicon octicon-git-pull-request"></i> + <i class="green octicon octicon-git-pull-request"></i> {{end}} {{else}} {{if $issue.IsClosed}} - <i class="octicon octicon-issue-closed"></i> + <i class="red octicon octicon-issue-closed"></i> {{else}} - <i class="octicon octicon-issue-opened"></i> + <i class="green octicon octicon-issue-opened"></i> {{end}} {{end}} </td> |