From 006572c78a13150491b8117229f116279dd1c679 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Mon, 21 Aug 2023 05:52:47 +0000 Subject: [PATCH 1/8] improve --- web_src/css/repo.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 8e8125a5f4a71..8d98ffd380d6b 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -1142,12 +1142,18 @@ .repository.view.issue .comment-list .event .detail { margin-top: 4px; margin-left: 14px; + display: flex; + align-items: center; } .repository.view.issue .comment-list .event .detail .svg { margin-right: 2px; } +.repository.view.issue .comment-list .event .detail span{ + display: flex; +} + .repository.view.issue .comment-list .event .segments { box-shadow: none; } From 7e92ff1dfd38a502c9ef9cf62ddb3e5b42a89a66 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Tue, 22 Aug 2023 05:05:39 +0000 Subject: [PATCH 2/8] improve --- web_src/css/repo.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 466c95ec9a0ff..cfcc11ab3961f 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -1144,13 +1144,14 @@ margin-left: 14px; display: flex; align-items: center; + gap: 0.25rem; } .repository.view.issue .comment-list .event .detail .svg { margin-right: 2px; } -.repository.view.issue .comment-list .event .detail span{ +.repository.view.issue .comment-list .event .detail .muted-links{ display: flex; } From e4c89d1bece6e2280ba8f88aaf2530122d7e1c4c Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 23 Aug 2023 00:27:59 +0200 Subject: [PATCH 3/8] Update web_src/css/repo.css --- web_src/css/repo.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/css/repo.css b/web_src/css/repo.css index cfcc11ab3961f..e41d1cf39c823 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -1151,7 +1151,7 @@ margin-right: 2px; } -.repository.view.issue .comment-list .event .detail .muted-links{ +.repository.view.issue .comment-list .event .detail .muted-links { display: flex; } From 2de63e738193c7858d94464b98d76184eb6c55ee Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Wed, 23 Aug 2023 06:22:58 +0000 Subject: [PATCH 4/8] improve --- templates/repo/issue/view_content/comments.tmpl | 10 +++++----- web_src/css/repo.css | 4 ---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index 57756e36b99e4..84a09c8b66164 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -156,7 +156,7 @@ {{if eq .RefAction 3}}{{end}}
- {{.RefIssueTitle}} {{.RefIssueIdent}} + {{.RefIssueTitle}} {{.RefIssueIdent}}
{{else if eq .Type 4}} @@ -169,7 +169,7 @@
{{svg "octicon-git-commit"}} - {{.Content | Str2html}} + {{.Content | Str2html}}
{{else if eq .Type 7}} @@ -342,7 +342,7 @@ {{if .DependentIssue}}
{{svg "octicon-plus"}} - + {{if eq .DependentIssue.RepoID .Issue.RepoID}} #{{.DependentIssue.Index}} {{.DependentIssue.Title}} @@ -364,8 +364,8 @@ {{if .DependentIssue}}
- {{svg "octicon-trash"}} - + {{svg "octicon-trash"}} + {{if eq .DependentIssue.RepoID .Issue.RepoID}} #{{.DependentIssue.Index}} {{.DependentIssue.Title}} diff --git a/web_src/css/repo.css b/web_src/css/repo.css index e41d1cf39c823..305a01038e724 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -1151,10 +1151,6 @@ margin-right: 2px; } -.repository.view.issue .comment-list .event .detail .muted-links { - display: flex; -} - .repository.view.issue .comment-list .event .segments { box-shadow: none; } From 691546d69eaaba553e4867b5d3731121adfbbdaa Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Wed, 13 Mar 2024 08:05:21 +0000 Subject: [PATCH 5/8] remove --- templates/repo/issue/view_content/comments.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index 912d2e1363bf7..67ffb2d4948e5 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -356,7 +356,7 @@ {{if .DependentIssue}}
{{svg "octicon-trash"}} - + {{if eq .DependentIssue.RepoID .Issue.RepoID}} #{{.DependentIssue.Index}} {{.DependentIssue.Title}} From 728f8a9094401a3074879c8851bcd1842e7c181a Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Wed, 13 Mar 2024 08:12:30 +0000 Subject: [PATCH 6/8] remove --- templates/repo/issue/view_content/comments.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index 67ffb2d4948e5..b842be4fb7821 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -333,7 +333,7 @@ {{if .DependentIssue}}
{{svg "octicon-plus"}} - + {{if eq .DependentIssue.RepoID .Issue.RepoID}} #{{.DependentIssue.Index}} {{.DependentIssue.Title}} @@ -355,7 +355,7 @@ {{if .DependentIssue}}
- {{svg "octicon-trash"}} + {{svg "octicon-trash"}} {{if eq .DependentIssue.RepoID .Issue.RepoID}} From 34c4e1409ea18910bcdd8053668b66d713ca8d60 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Wed, 13 Mar 2024 08:19:47 +0000 Subject: [PATCH 7/8] remove --- templates/repo/issue/view_content/comments.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index b842be4fb7821..94bbb623d68e6 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -162,7 +162,7 @@
{{svg "octicon-git-commit"}} - {{.Content | SanitizeHTML}} + {{.Content | SanitizeHTML}}
{{else if eq .Type 7}} From f87996822165d0d1fa158c25fa42d585fe99197b Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 14 Mar 2024 19:32:43 +0100 Subject: [PATCH 8/8] use flex-text-block --- templates/repo/issue/view_content/comments.tmpl | 14 +++++++------- web_src/css/repo.css | 9 +-------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index 94bbb623d68e6..a9c6bbe31859d 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -148,7 +148,7 @@ {{if eq .RefAction 3}}{{end}} -
+
{{.RefIssueTitle ctx}} {{.RefIssueIdent ctx}}
@@ -160,7 +160,7 @@ {{template "shared/user/authorlink" .Poster}} {{ctx.Locale.Tr "repo.issues.commit_ref_at" .EventTag $createdStr}} -
+
{{svg "octicon-git-commit"}} {{.Content | SanitizeHTML}}
@@ -252,7 +252,7 @@ {{ctx.Locale.Tr "repo.issues.stop_tracking_history" $createdStr}} {{template "repo/issue/view_content/comments_delete_time" dict "ctxData" $ "comment" .}} -
+
{{svg "octicon-clock"}} {{if .RenderedContent}} {{/* compatibility with time comments made before v1.21 */}} @@ -271,7 +271,7 @@ {{ctx.Locale.Tr "repo.issues.add_time_history" $createdStr}} {{template "repo/issue/view_content/comments_delete_time" dict "ctxData" $ "comment" .}} -
+
{{svg "octicon-clock"}} {{if .RenderedContent}} {{/* compatibility with time comments made before v1.21 */}} @@ -331,7 +331,7 @@ {{ctx.Locale.Tr "repo.issues.dependency.added_dependency" $createdStr}} {{if .DependentIssue}} -
+
{{svg "octicon-plus"}} @@ -354,7 +354,7 @@ {{ctx.Locale.Tr "repo.issues.dependency.removed_dependency" $createdStr}} {{if .DependentIssue}} -
+
{{svg "octicon-trash"}} @@ -506,7 +506,7 @@ {{ctx.Locale.Tr "repo.issues.del_time_history" $createdStr}} -
+
{{svg "octicon-clock"}} {{if .RenderedContent}} {{/* compatibility with time comments made before v1.21 */}} diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 09515d4b72779..c9c27acf3459a 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -1065,14 +1065,7 @@ .repository.view.issue .comment-list .event .detail { margin-top: 4px; - margin-left: 14px; - display: flex; - align-items: center; - gap: 0.25rem; -} - -.repository.view.issue .comment-list .event .detail .svg { - margin-right: 2px; + margin-left: 15px; } .repository.view.issue .comment-list .event .segments {