change status icon for merged PR to git-merge
Signed-off-by: a101211279
<1012112796@qq.com>
tags/v1.13.0-dev
@@ -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> |
@@ -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> |
@@ -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> |
@@ -1229,11 +1229,11 @@ i.icon.centerlock { | |||
text-overflow: ellipsis; | |||
} | |||
.language-label { | |||
.text-label { | |||
display: inline-flex !important; | |||
align-items: center !important; | |||
} | |||
.language-label .color-icon { | |||
.text-label .color-icon { | |||
position: static !important; | |||
} |