From 6e4baee91d1b21366abf0ba68ca08ab74609ffa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=99=BA=E8=B6=85?= <1012112796@qq.com> Date: Sat, 18 Apr 2020 00:35:12 +0800 Subject: [PATCH] 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> --- templates/explore/code.tmpl | 2 +- templates/repo/branch/list.tmpl | 6 +++--- templates/repo/search.tmpl | 2 +- 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 @@
{{range $term := .SearchResultLanguages}} - + {{$term.Language}}
{{$term.Count}}
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}}
{{if not .LatestPullRequest.IsSameRepo}}{{.LatestPullRequest.BaseRepo.FullName}}{{end}}#{{.LatestPullRequest.Issue.Index}} {{if .LatestPullRequest.HasMerged}} - {{svg "octicon-git-pull-request" 16}} {{$.i18n.Tr "repo.pulls.merged"}} + {{svg "octicon-git-merge" 16}} {{$.i18n.Tr "repo.pulls.merged"}} {{else if .LatestPullRequest.Issue.IsClosed}} - {{svg "octicon-issue-closed" 16}} {{$.i18n.Tr "repo.issues.closed_title"}} + {{svg "octicon-issue-closed" 16}} {{$.i18n.Tr "repo.issues.closed_title"}} {{else}} - {{svg "octicon-issue-opened" 16}} {{$.i18n.Tr "repo.issues.open_title"}} + {{svg "octicon-issue-opened" 16}} {{$.i18n.Tr "repo.issues.open_title"}} {{end}} {{end}} 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 @@
{{range $term := .SearchResultLanguages}} - + {{$term.Language}}
{{$term.Count}}
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; }