From 4bfdcde473a39a583af77624a0d4bbe094a5d135 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sat, 9 Sep 2023 11:14:05 +0800 Subject: [PATCH 1/2] fix --- templates/shared/issuelist.tmpl | 12 +++++------- web_src/css/repo/issue-list.css | 15 +++++++++++++++ web_src/css/shared/flex-list.css | 8 +++++--- 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl index 8e91a58d5162c..80d4e3dd85e1c 100644 --- a/templates/shared/issuelist.tmpl +++ b/templates/shared/issuelist.tmpl @@ -2,16 +2,14 @@ {{$approvalCounts := .ApprovalCounts}} {{range .Issues}}
-
+ +
{{if $.CanWriteIssuesOrPulls}} -
- -
+ {{end}} -
- {{template "shared/issueicon" .}} -
+ {{template "shared/issueicon" .}}
+
diff --git a/web_src/css/repo/issue-list.css b/web_src/css/repo/issue-list.css index f76b690cb1020..a66f2189a3e73 100644 --- a/web_src/css/repo/issue-list.css +++ b/web_src/css/repo/issue-list.css @@ -33,6 +33,21 @@ } } +#issue-list .flex-item-title .labels-list { + display: flex; + gap: 0.25em; +} + +#issue-list .flex-item-title .labels-list a { + display: flex; + text-decoration: none; +} + +#issue-list .flex-item-title .labels-list .label { + padding: 2px 6px; + margin: 0; +} + #issue-list .flex-item-body .branches { display: inline-flex; } diff --git a/web_src/css/shared/flex-list.css b/web_src/css/shared/flex-list.css index b5ae5cbd49277..3a0fce536dae3 100644 --- a/web_src/css/shared/flex-list.css +++ b/web_src/css/shared/flex-list.css @@ -34,9 +34,11 @@ } .flex-item .flex-item-icon { - display: flex; - align-items: center; - height: 20px; /* match the default flex-item-title height */ + align-self: baseline; /* mainly used by the issue list, to align the leading icon with the title */ +} + +.flex-item .flex-item-icon + .flex-item-main { + align-self: baseline; } .flex-item .flex-item-trailing { From cbb8a94bea09bfdcdb708be5008af294324c2450 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sat, 9 Sep 2023 18:04:11 +0800 Subject: [PATCH 2/2] fine tune height --- web_src/css/repo/issue-list.css | 3 ++- web_src/css/shared/flex-list.css | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web_src/css/repo/issue-list.css b/web_src/css/repo/issue-list.css index a66f2189a3e73..17ae6ea38fc67 100644 --- a/web_src/css/repo/issue-list.css +++ b/web_src/css/repo/issue-list.css @@ -44,8 +44,9 @@ } #issue-list .flex-item-title .labels-list .label { - padding: 2px 6px; + padding: 0 6px; margin: 0; + min-height: 20px; } #issue-list .flex-item-body .branches { diff --git a/web_src/css/shared/flex-list.css b/web_src/css/shared/flex-list.css index 3a0fce536dae3..a7cfc8f163963 100644 --- a/web_src/css/shared/flex-list.css +++ b/web_src/css/shared/flex-list.css @@ -61,7 +61,6 @@ font-weight: var(--font-weight-semibold); word-break: break-word; min-width: 0; - min-height: 20px; } .flex-item .flex-item-title a {