From 50cbb204812f465ea00b2ffd31db58378e17f27b Mon Sep 17 00:00:00 2001 From: silverwind Date: Sun, 15 Nov 2020 19:11:58 +0100 Subject: [PATCH] Fix issue label rendering (#13570) * Fix issue label rendering Prevent rendering of inactive labels and make them wrap inline. Fixes: https://github.com/go-gitea/gitea/issues/13566 * also don't render the placeholder Co-authored-by: techknowlogick --- templates/repo/issue/new_form.tmpl | 8 +++++-- .../repo/issue/view_content/sidebar.tmpl | 21 ++++++++++++------- web_src/less/_repository.less | 14 +++++++++++++ 3 files changed, 33 insertions(+), 10 deletions(-) diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index 9540716e5..e585fc735 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -73,10 +73,14 @@
{{.i18n.Tr "repo.issues.new.no_label"}} {{range .Labels}} - {{.Name | RenderEmoji}} + {{if .IsChecked}} + {{.Name | RenderEmoji}} + {{end}} {{end}} {{range .OrgLabels}} - {{.Name | RenderEmoji}} + {{if .IsChecked}} + {{.Name | RenderEmoji}} + {{end}} {{end}}
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 55884f3fa..21c7a9d36 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -126,17 +126,22 @@
- {{.i18n.Tr "repo.issues.new.no_label"}} + {{if not .HasSelectedLabel}} + {{.i18n.Tr "repo.issues.new.no_label"}} + {{end}} {{range .Labels}} - + {{if .IsChecked}} + + {{end}} {{end}} {{range .OrgLabels}} - - + {{if .IsChecked}} + + {{end}} {{end}}
diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index de8000489..662a05771 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -2983,6 +2983,20 @@ } } +.labels.list { + display: flex; + flex-wrap: wrap; +} + +.labels.list .item { + padding: 0 !important; + margin-bottom: 2px; +} + +.labels.list .item + .item { + margin-left: 2px; +} + tbody.commit-list { vertical-align: baseline; }