From f42200b5c2dba2065ab6a3884d4357da16111b6c Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Thu, 9 May 2024 22:36:45 +0800 Subject: [PATCH 1/2] fix --- templates/repo/commits_list_small.tmpl | 14 +++++++++----- web_src/css/base.css | 1 + web_src/css/repo.css | 6 +----- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/templates/repo/commits_list_small.tmpl b/templates/repo/commits_list_small.tmpl index 6ca6dd5cdcb2..4c67319b8c05 100644 --- a/templates/repo/commits_list_small.tmpl +++ b/templates/repo/commits_list_small.tmpl @@ -13,13 +13,12 @@ {{$commitLink:= printf "%s/commit/%s" $.comment.Issue.PullRequest.BaseRepo.Link (PathEscape .ID.String)}} - {{RenderCommitMessageLinkSubject $.root.Context .Message $commitLink ($.comment.Issue.PullRequest.BaseRepo.ComposeMetas ctx)}} + + {{- RenderCommitMessageLinkSubject $.root.Context .Message $commitLink ($.comment.Issue.PullRequest.BaseRepo.ComposeMetas ctx) -}} + {{if IsMultilineCommitMessage .Message}} - - {{end}} - {{if IsMultilineCommitMessage .Message}} -
{{RenderCommitBody $.root.Context .Message ($.comment.Issue.PullRequest.BaseRepo.ComposeMetas ctx)}}
+ {{end}} @@ -47,5 +46,10 @@ + {{if IsMultilineCommitMessage .Message}} +
+		{{- RenderCommitBody $.root.Context .Message ($.comment.Issue.PullRequest.BaseRepo.ComposeMetas ctx) -}}
+	
+ {{end}} {{end}} diff --git a/web_src/css/base.css b/web_src/css/base.css index 412d9094e3b3..2d93690170f2 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -730,6 +730,7 @@ input:-webkit-autofill:active, font-weight: var(--font-weight-normal); margin: 0 6px; padding: 5px 10px; + flex-shrink: 0; } .ui .sha.label .shortsha { diff --git a/web_src/css/repo.css b/web_src/css/repo.css index f02b2b7578c6..b3254d6a14dc 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -2349,14 +2349,10 @@ tbody.commit-list { .commit-body { margin: 0.25em 0; white-space: pre-wrap; + word-break: break-word; line-height: initial; } -/* PR-comment */ -.repository .timeline-item .commit-body { - margin-left: 45px; -} - .git-notes.top { text-align: left; } From 520f936ba38a20935103250bdcf8a4c76ca2357f Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Fri, 10 May 2024 20:04:27 +0800 Subject: [PATCH 2/2] Update web_src/css/repo.css Co-authored-by: silverwind --- 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 b3254d6a14dc..67b178350ec7 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -2349,7 +2349,7 @@ tbody.commit-list { .commit-body { margin: 0.25em 0; white-space: pre-wrap; - word-break: break-word; + overflow-wrap: anywhere; line-height: initial; }