From 9f0ea4c306efaeaf802ad7b9ab6992c9f4229fce Mon Sep 17 00:00:00 2001 From: zetta Date: Fri, 17 Feb 2023 17:36:22 +0800 Subject: [PATCH 1/5] fix misalignments --- templates/repo/issue/view_content/pull.tmpl | 2 +- web_src/less/_base.less | 6 ++++++ web_src/less/_explore.less | 2 ++ web_src/less/_repository.less | 4 ++++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index dff6b5daaa168..f9142e2a95128 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -13,7 +13,7 @@ {{avatar $.Context .User}} {{end}} - + {{if .User}} {{.User.GetDisplayName}} {{else if .Team}} diff --git a/web_src/less/_base.less b/web_src/less/_base.less index 4b65ae6812a01..a22e1245418fb 100644 --- a/web_src/less/_base.less +++ b/web_src/less/_base.less @@ -853,6 +853,12 @@ a.commit-statuses-trigger { color: var(--color-text); } +.ui.list > .item > img.ui.avatar + .content { + display: inline-block; + vertical-align: top; + padding-left: 0.5em; +} + .ui.list .list > .item .description, .ui.list > .item .description { color: var(--color-text); diff --git a/web_src/less/_explore.less b/web_src/less/_explore.less index 5a41f8dc553cd..ddbfca6212211 100644 --- a/web_src/less/_explore.less +++ b/web_src/less/_explore.less @@ -78,6 +78,8 @@ img.ui.avatar { width: 40px; height: 40px; + display: inline-block; + vertical-align: top; } .description { diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index 39362722de535..7fbc3839e928a 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -756,6 +756,10 @@ align-items: center; } + .review-item-left .reviewer-info { + margin-left: 0.25em; + } + .text { margin: .3em 0 .5em .5em; } From 441a7688144d05773356d882975ef127f24a903a Mon Sep 17 00:00:00 2001 From: zetta Date: Fri, 17 Feb 2023 18:30:28 +0800 Subject: [PATCH 2/5] lint code --- web_src/less/_base.less | 2 +- web_src/less/_repository.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web_src/less/_base.less b/web_src/less/_base.less index a22e1245418fb..0b0cfdb6858e3 100644 --- a/web_src/less/_base.less +++ b/web_src/less/_base.less @@ -856,7 +856,7 @@ a.commit-statuses-trigger { .ui.list > .item > img.ui.avatar + .content { display: inline-block; vertical-align: top; - padding-left: 0.5em; + padding-left: .5em; } .ui.list .list > .item .description, diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index 7fbc3839e928a..e7411a6716108 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -757,7 +757,7 @@ } .review-item-left .reviewer-info { - margin-left: 0.25em; + margin-left: .25em; } .text { From 63b69e3113197390b66fe7bdd3025e9fdccbffde Mon Sep 17 00:00:00 2001 From: Zettat123 Date: Sat, 18 Feb 2023 21:55:51 +0800 Subject: [PATCH 3/5] use gt-ml-2 class --- templates/repo/issue/view_content/pull.tmpl | 2 +- web_src/less/_repository.less | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index f9142e2a95128..6e447a6f6bbfe 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -13,7 +13,7 @@ {{avatar $.Context .User}} {{end}} - + {{if .User}} {{.User.GetDisplayName}} {{else if .Team}} diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index e7411a6716108..39362722de535 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -756,10 +756,6 @@ align-items: center; } - .review-item-left .reviewer-info { - margin-left: .25em; - } - .text { margin: .3em 0 .5em .5em; } From e1ceb01dc1c255b85adf6e5eeabd4d63f8912b7c Mon Sep 17 00:00:00 2001 From: Zettat123 Date: Sat, 18 Feb 2023 22:32:28 +0800 Subject: [PATCH 4/5] use helpers selectors --- templates/explore/users.tmpl | 2 +- web_src/less/_base.less | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/templates/explore/users.tmpl b/templates/explore/users.tmpl index aa397e65b7ee2..a43111ff3d1c0 100644 --- a/templates/explore/users.tmpl +++ b/templates/explore/users.tmpl @@ -8,7 +8,7 @@ {{range .Users}}
{{avatar $.Context .}} -
+
{{.Name}} {{.FullName}}
{{if .Location}} diff --git a/web_src/less/_base.less b/web_src/less/_base.less index 0b0cfdb6858e3..4b65ae6812a01 100644 --- a/web_src/less/_base.less +++ b/web_src/less/_base.less @@ -853,12 +853,6 @@ a.commit-statuses-trigger { color: var(--color-text); } -.ui.list > .item > img.ui.avatar + .content { - display: inline-block; - vertical-align: top; - padding-left: .5em; -} - .ui.list .list > .item .description, .ui.list > .item .description { color: var(--color-text); From 9b529ce6001aa21ee83436df2bd240a2fd3614f5 Mon Sep 17 00:00:00 2001 From: Zettat123 Date: Sat, 18 Feb 2023 22:37:32 +0800 Subject: [PATCH 5/5] use flex in user item --- templates/explore/users.tmpl | 2 +- web_src/less/_explore.less | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/explore/users.tmpl b/templates/explore/users.tmpl index a43111ff3d1c0..aa397e65b7ee2 100644 --- a/templates/explore/users.tmpl +++ b/templates/explore/users.tmpl @@ -8,7 +8,7 @@ {{range .Users}}
{{avatar $.Context .}} -
+
{{.Name}} {{.FullName}}
{{if .Location}} diff --git a/web_src/less/_explore.less b/web_src/less/_explore.less index ddbfca6212211..5caf21d417d28 100644 --- a/web_src/less/_explore.less +++ b/web_src/less/_explore.less @@ -69,6 +69,7 @@ .ui.user.list { .item { padding-bottom: 25px; + display: flex; &:not(:first-child) { border-top: 1px solid var(--color-secondary); @@ -78,8 +79,7 @@ img.ui.avatar { width: 40px; height: 40px; - display: inline-block; - vertical-align: top; + margin-right: 10px; } .description {