diff options
| author | 赵智超 <1012112796@qq.com> | 2020-04-18 00:35:12 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-17 12:35:12 -0400 |
| commit | 6e4baee91d1b21366abf0ba68ca08ab74609ffa4 (patch) | |
| tree | 301b878538a9952eeb3348e579ec516ef164b433 /templates | |
| parent | c52d48aae46af879fdfcfd94d03b7072878b5441 (diff) | |
| download | gitea-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')
| -rw-r--r-- | templates/explore/code.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/branch/list.tmpl | 6 | ||||
| -rw-r--r-- | templates/repo/search.tmpl | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/templates/explore/code.tmpl b/templates/explore/code.tmpl index 43b44af4bf..4a1b792b05 100644 --- a/templates/explore/code.tmpl +++ b/templates/explore/code.tmpl @@ -18,7 +18,7 @@ </h3> <div> {{range $term := .SearchResultLanguages}} - <a class="ui language-label {{if eq $.Language $term.Language}}primary {{end}}basic label" href="{{AppSubUrl}}/explore/code?q={{$.Keyword}}{{if ne $.Language $term.Language}}&l={{$term.Language}}{{end}}"> + <a class="ui text-label {{if eq $.Language $term.Language}}primary {{end}}basic label" href="{{AppSubUrl}}/explore/code?q={{$.Keyword}}{{if ne $.Language $term.Language}}&l={{$term.Language}}{{end}}"> <i class="color-icon" style="background-color: {{$term.Color}}"></i> {{$term.Language}} <div class="detail">{{$term.Count}}</div> 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> diff --git a/templates/repo/search.tmpl b/templates/repo/search.tmpl index 984b3fe9e5..3e39287732 100644 --- a/templates/repo/search.tmpl +++ b/templates/repo/search.tmpl @@ -18,7 +18,7 @@ </h3> <div> {{range $term := .SearchResultLanguages}} - <a class="ui language-label {{if eq $.Language $term.Language}}primary {{end}}basic label" href="{{EscapePound $.SourcePath}}/search?q={{$.Keyword}}{{if ne $.Language $term.Language}}&l={{$term.Language}}{{end}}"> + <a class="ui text-label {{if eq $.Language $term.Language}}primary {{end}}basic label" href="{{EscapePound $.SourcePath}}/search?q={{$.Keyword}}{{if ne $.Language $term.Language}}&l={{$term.Language}}{{end}}"> <i class="color-icon" style="background-color: {{$term.Color}}"></i> {{$term.Language}} <div class="detail">{{$term.Count}}</div> |