summaryrefslogtreecommitdiffstats
path: root/templates/repo/branch
diff options
context:
space:
mode:
author赵智超 <1012112796@qq.com>2020-04-18 00:35:12 +0800
committerGitHub <noreply@github.com>2020-04-17 12:35:12 -0400
commit6e4baee91d1b21366abf0ba68ca08ab74609ffa4 (patch)
tree301b878538a9952eeb3348e579ec516ef164b433 /templates/repo/branch
parentc52d48aae46af879fdfcfd94d03b7072878b5441 (diff)
downloadgitea-6e4baee91d1b21366abf0ba68ca08ab74609ffa4.tar.gz
gitea-6e4baee91d1b21366abf0ba68ca08ab74609ffa4.zip
ui: fix status label on branches list vertical alignment (#11109)
change status icon for merged PR to git-merge Signed-off-by: a1012112796 <1012112796@qq.com>
Diffstat (limited to 'templates/repo/branch')
-rw-r--r--templates/repo/branch/list.tmpl6
1 files changed, 3 insertions, 3 deletions
diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl
index 26a14eb6ff..b310edfbd3 100644
--- a/templates/repo/branch/list.tmpl
+++ b/templates/repo/branch/list.tmpl
@@ -93,11 +93,11 @@
{{else}}
<a href="{{.LatestPullRequest.Issue.HTMLURL}}">{{if not .LatestPullRequest.IsSameRepo}}{{.LatestPullRequest.BaseRepo.FullName}}{{end}}#{{.LatestPullRequest.Issue.Index}}</a>
{{if .LatestPullRequest.HasMerged}}
- <a href="{{.LatestPullRequest.Issue.HTMLURL}}" class="ui purple mini label">{{svg "octicon-git-pull-request" 16}} {{$.i18n.Tr "repo.pulls.merged"}}</a>
+ <a href="{{.LatestPullRequest.Issue.HTMLURL}}" class="ui text-label purple mini label">{{svg "octicon-git-merge" 16}} {{$.i18n.Tr "repo.pulls.merged"}}</a>
{{else if .LatestPullRequest.Issue.IsClosed}}
- <a href="{{.LatestPullRequest.Issue.HTMLURL}}" class="ui red mini label">{{svg "octicon-issue-closed" 16}} {{$.i18n.Tr "repo.issues.closed_title"}}</a>
+ <a href="{{.LatestPullRequest.Issue.HTMLURL}}" class="ui text-label red mini label">{{svg "octicon-issue-closed" 16}} {{$.i18n.Tr "repo.issues.closed_title"}}</a>
{{else}}
- <a href="{{.LatestPullRequest.Issue.HTMLURL}}" class="ui green mini label">{{svg "octicon-issue-opened" 16}} {{$.i18n.Tr "repo.issues.open_title"}}</a>
+ <a href="{{.LatestPullRequest.Issue.HTMLURL}}" class="ui text-label green mini label">{{svg "octicon-issue-opened" 16}} {{$.i18n.Tr "repo.issues.open_title"}}</a>
{{end}}
{{end}}
</td>