diff options
-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 | ||||
-rw-r--r-- | web_src/less/_base.less | 4 |
4 files changed, 7 insertions, 7 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> diff --git a/web_src/less/_base.less b/web_src/less/_base.less index 1c5626be0b..bafacac6e8 100644 --- a/web_src/less/_base.less +++ b/web_src/less/_base.less @@ -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; } |