From 5873e8aaae9ab0dd681e5fe1e7c1c80308cdb516 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 6 Nov 2025 22:45:09 +0100 Subject: [PATCH 1/9] Misc CSS fixes --- templates/repo/home_sidebar_bottom.tmpl | 4 ++-- templates/repo/home_sidebar_top.tmpl | 2 +- templates/repo/issue/branch_selector_field.tmpl | 4 ++-- templates/repo/issue/view_content/add_reaction.tmpl | 2 +- templates/shared/search/code/results.tmpl | 4 ++-- web_src/css/repo.css | 10 ++++++---- web_src/css/repo/reactions.css | 11 ++++++----- web_src/js/components/RepoActionView.vue | 4 ++-- 8 files changed, 22 insertions(+), 19 deletions(-) diff --git a/templates/repo/home_sidebar_bottom.tmpl b/templates/repo/home_sidebar_bottom.tmpl index 01e630ccbfb2a..04d033aeb12c5 100644 --- a/templates/repo/home_sidebar_bottom.tmpl +++ b/templates/repo/home_sidebar_bottom.tmpl @@ -4,10 +4,10 @@
- + {{ctx.Locale.Tr "repo.releases"}} - {{.NumReleases}} + {{.NumReleases}}
diff --git a/templates/repo/home_sidebar_top.tmpl b/templates/repo/home_sidebar_top.tmpl index 8c2089c839a52..edbf01db09636 100644 --- a/templates/repo/home_sidebar_top.tmpl +++ b/templates/repo/home_sidebar_top.tmpl @@ -9,7 +9,7 @@
{{ctx.Locale.Tr "repo.repo_desc"}}
-
+
{{- $description := .Repository.DescriptionHTML ctx -}} diff --git a/templates/repo/issue/branch_selector_field.tmpl b/templates/repo/issue/branch_selector_field.tmpl index dc77755349c95..5ced5764cfabc 100644 --- a/templates/repo/issue/branch_selector_field.tmpl +++ b/templates/repo/issue/branch_selector_field.tmpl @@ -15,11 +15,11 @@ Still needs to figure out: */}} {{if and (not .Issue.IsPull) (not .PageIsComparePull)}} -
-
+
{{if .Reference}}{{$.RefEndName}}{{else}}{{ctx.Locale.Tr "repo.issues.no_ref"}}{{end}} {{if .HasIssuesOrPullsWritePermission}}{{svg "octicon-triangle-down" 14 "dropdown icon"}}{{end}}
diff --git a/templates/repo/issue/view_content/add_reaction.tmpl b/templates/repo/issue/view_content/add_reaction.tmpl index 2f5764d9643f7..c24072783892f 100644 --- a/templates/repo/issue/view_content/add_reaction.tmpl +++ b/templates/repo/issue/view_content/add_reaction.tmpl @@ -1,5 +1,5 @@ {{if ctx.RootData.IsSigned}} -
+
{{svg "octicon-smiley"}}
{{range $value := AllowedReactions}} diff --git a/templates/shared/search/code/results.tmpl b/templates/shared/search/code/results.tmpl index 8a08f5c25cb0d..d7966032ad172 100644 --- a/templates/shared/search/code/results.tmpl +++ b/templates/shared/search/code/results.tmpl @@ -12,7 +12,7 @@ {{range $result := .SearchResults}} {{$repo := or $.Repo (index $.RepoMaps .RepoID)}}
-

+

{{if not $.Repo}} {{$repo.FullName}} @@ -24,7 +24,7 @@ {{else}} {{.Filename}} {{end}} - {{ctx.Locale.Tr "repo.diff.view_file"}} + {{ctx.Locale.Tr "repo.diff.view_file"}}

{{template "shared/searchfile" dict "RepoLink" $repo.Link "SearchResult" .}} diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 206a591fbdaf1..5070a6f32cf86 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -654,13 +654,15 @@ td .commit-summary { .repository.view.issue .comment-list .code-comment { border: 1px solid transparent; - margin: 0; + margin: 0 -4px; + padding: 8px; } .repository.view.issue .comment-list .code-comment .comment-header { background: transparent; border-bottom: 0; padding: 0; + min-height: auto; } .repository.view.issue .comment-list .code-comment .comment-content { @@ -1286,9 +1288,9 @@ td .commit-summary { box-shadow: 0 0 0 3px var(--color-primary-alpha-30) !important; } -.comment:target .header::before { +.comment:target .comment-header::before { border-right-color: var(--color-primary) !important; - filter: drop-shadow(-3px 0 0 var(--color-primary-alpha-30)) !important; + filter: drop-shadow(-4px 0 0 var(--color-primary-alpha-30)) !important; } .code-comment:target, @@ -1339,7 +1341,7 @@ td .commit-summary { .comment-header-right { display: flex; align-items: center; - gap: 0.5em; + gap: 6px; } .comment-header-right { diff --git a/web_src/css/repo/reactions.css b/web_src/css/repo/reactions.css index 8fe01af4f0676..22cb5fd0b5b3a 100644 --- a/web_src/css/repo/reactions.css +++ b/web_src/css/repo/reactions.css @@ -41,16 +41,17 @@ margin-left: 4px; } -.ui.dropdown.select-reaction .menu { - min-width: 170px; /* item-outer-width * 4 */ +.ui.dropdown.select-reaction .menu.visible { + display: grid !important; + grid-template-columns: repeat(4, 1fr); + padding: 4px; } .ui.dropdown.select-reaction .menu > .item { - float: left; - margin: 4px; - font-size: 20px; width: 34px; height: 34px; + font-size: 16px; + aspect-ratio: 1; border-radius: var(--border-radius); display: flex; align-items: center; diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index 300f635793456..00748ee9bb260 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -489,7 +489,7 @@ export default defineComponent({ -
@@ -520,7 +520,7 @@ export default defineComponent({ {{ job.name }}
- + {{ job.duration }} From b95cc38b2c2a50f1e062b823567b743e1feaf7b1 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 6 Nov 2025 22:51:56 +0100 Subject: [PATCH 2/9] fix --- templates/repo/issue/branch_selector_field.tmpl | 4 ++-- web_src/css/repo.css | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/templates/repo/issue/branch_selector_field.tmpl b/templates/repo/issue/branch_selector_field.tmpl index 5ced5764cfabc..dc77755349c95 100644 --- a/templates/repo/issue/branch_selector_field.tmpl +++ b/templates/repo/issue/branch_selector_field.tmpl @@ -15,11 +15,11 @@ Still needs to figure out: */}} {{if and (not .Issue.IsPull) (not .PageIsComparePull)}} -
-
+
{{if .Reference}}{{$.RefEndName}}{{else}}{{ctx.Locale.Tr "repo.issues.no_ref"}}{{end}} {{if .HasIssuesOrPullsWritePermission}}{{svg "octicon-triangle-down" 14 "dropdown icon"}}{{end}}
diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 5070a6f32cf86..52cfb8f1b7cf8 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -601,9 +601,6 @@ td .commit-summary { width: 100%; margin: 0; } - .repository.view.issue .comment-list .comment .content .form .button:not(:last-child) { - margin-bottom: 1rem; - } } .repository.view.issue .comment-list .comment .merge-section { From 4726f43f0e736570873d1293d2e3d67ffebf9fac Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 6 Nov 2025 22:59:13 +0100 Subject: [PATCH 3/9] Update templates/repo/home_sidebar_bottom.tmpl Signed-off-by: silverwind --- templates/repo/home_sidebar_bottom.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/home_sidebar_bottom.tmpl b/templates/repo/home_sidebar_bottom.tmpl index 04d033aeb12c5..4ba6aa05bf67f 100644 --- a/templates/repo/home_sidebar_bottom.tmpl +++ b/templates/repo/home_sidebar_bottom.tmpl @@ -4,7 +4,7 @@
- + {{ctx.Locale.Tr "repo.releases"}} {{.NumReleases}} From be8392ca09758c31eca640e16f839d67c7faf1d8 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 6 Nov 2025 23:02:31 +0100 Subject: [PATCH 4/9] add margin --- web_src/css/repo.css | 1 + 1 file changed, 1 insertion(+) diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 52cfb8f1b7cf8..6f66e9e1edf8f 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -660,6 +660,7 @@ td .commit-summary { border-bottom: 0; padding: 0; min-height: auto; + margin-bottom: 4px; } .repository.view.issue .comment-list .code-comment .comment-content { From 97a05d9fec80cdefae48265e5eb01e6c4a21334b Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 6 Nov 2025 23:03:30 +0100 Subject: [PATCH 5/9] cleanup --- web_src/css/repo/reactions.css | 1 - 1 file changed, 1 deletion(-) diff --git a/web_src/css/repo/reactions.css b/web_src/css/repo/reactions.css index 22cb5fd0b5b3a..f7db80fbbcc65 100644 --- a/web_src/css/repo/reactions.css +++ b/web_src/css/repo/reactions.css @@ -51,7 +51,6 @@ width: 34px; height: 34px; font-size: 16px; - aspect-ratio: 1; border-radius: var(--border-radius); display: flex; align-items: center; From 6e00ba16fb6066af013d684b4ef520d14a3bf449 Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 7 Nov 2025 06:39:21 +0100 Subject: [PATCH 6/9] flex-text-block --- templates/shared/search/code/results.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/shared/search/code/results.tmpl b/templates/shared/search/code/results.tmpl index d7966032ad172..a35422010d5c1 100644 --- a/templates/shared/search/code/results.tmpl +++ b/templates/shared/search/code/results.tmpl @@ -12,7 +12,7 @@ {{range $result := .SearchResults}} {{$repo := or $.Repo (index $.RepoMaps .RepoID)}}
-

+

{{if not $.Repo}} {{$repo.FullName}} @@ -24,7 +24,7 @@ {{else}} {{.Filename}} {{end}} - {{ctx.Locale.Tr "repo.diff.view_file"}} + {{ctx.Locale.Tr "repo.diff.view_file"}}

{{template "shared/searchfile" dict "RepoLink" $repo.Link "SearchResult" .}} From 204404b4240638436c379a20aea25c3dde027d79 Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 7 Nov 2025 11:27:08 +0100 Subject: [PATCH 7/9] Update templates/shared/search/code/results.tmpl Co-authored-by: wxiaoguang Signed-off-by: silverwind --- templates/shared/search/code/results.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/shared/search/code/results.tmpl b/templates/shared/search/code/results.tmpl index a35422010d5c1..42f7a181a385a 100644 --- a/templates/shared/search/code/results.tmpl +++ b/templates/shared/search/code/results.tmpl @@ -12,7 +12,7 @@ {{range $result := .SearchResults}} {{$repo := or $.Repo (index $.RepoMaps .RepoID)}}
-

+

{{if not $.Repo}} {{$repo.FullName}} From 9336b3126eb3545610d8da342aa35221fb0d5e4a Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 7 Nov 2025 13:24:56 +0100 Subject: [PATCH 8/9] improve issue timeline wrapping and padding --- web_src/css/repo.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 6f66e9e1edf8f..3b47af1639698 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -528,9 +528,10 @@ td .commit-summary { } .repository.view.issue .comment-list .timeline-item .comment-text-line { - line-height: 32px; - vertical-align: middle; color: var(--color-text-light); + overflow-wrap: break-word; + max-width: 100%; + padding: .5rem 1rem .5rem 0; } .repository.view.issue .comment-list .timeline-item .comment-text-line .ui.label { From da2aea92faa059e795118c99893b46a21f975a2f Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 7 Nov 2025 14:05:24 +0100 Subject: [PATCH 9/9] fix regressions --- web_src/css/repo.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 3b47af1639698..5249948745e2a 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -528,10 +528,12 @@ td .commit-summary { } .repository.view.issue .comment-list .timeline-item .comment-text-line { + line-height: 32px; + vertical-align: middle; color: var(--color-text-light); overflow-wrap: break-word; max-width: 100%; - padding: .5rem 1rem .5rem 0; + padding-right: 1rem; } .repository.view.issue .comment-list .timeline-item .comment-text-line .ui.label {