From 94c5a30c8bd2ae78ffd7bd3b39bee019c531e1e7 Mon Sep 17 00:00:00 2001
From: Giteabot <teabot@gitea.io>
Date: Fri, 10 May 2024 22:36:06 +0800
Subject: [PATCH] Fix some UI regressions for commit list (#30920) (#30937)
Backport #30920 by wxiaoguang
Close #30919
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: silverwind <me@silverwind.io>
---
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)}}
- <span class="tw-flex-1 gt-ellipsis tw-font-mono{{if gt .ParentCount 1}} grey text{{end}}" title="{{.Summary}}">{{RenderCommitMessageLinkSubject $.root.Context .Message $commitLink ($.comment.Issue.PullRequest.BaseRepo.ComposeMetas ctx)}}</span>
+ <span class="tw-flex-1 tw-font-mono gt-ellipsis" title="{{.Summary}}">
+ {{- RenderCommitMessageLinkSubject $.root.Context .Message $commitLink ($.comment.Issue.PullRequest.BaseRepo.ComposeMetas ctx) -}}
+ </span>
{{if IsMultilineCommitMessage .Message}}
- <button class="ui button js-toggle-commit-body ellipsis-button" aria-expanded="false">...</button>
- {{end}}
- {{if IsMultilineCommitMessage .Message}}
- <pre class="commit-body tw-hidden">{{RenderCommitBody $.root.Context .Message ($.comment.Issue.PullRequest.BaseRepo.ComposeMetas ctx)}}</pre>
+ <button class="ui button ellipsis-button show-panel toggle" data-panel="[data-singular-commit-body-for='{{$tag}}']">...</button>
{{end}}
<span class="shabox tw-flex tw-items-center">
@@ -47,5 +46,10 @@
</a>
</span>
</div>
+ {{if IsMultilineCommitMessage .Message}}
+ <pre class="commit-body tw-ml-[33px] tw-hidden" data-singular-commit-body-for="{{$tag}}">
+ {{- RenderCommitBody $.root.Context .Message ($.comment.Issue.PullRequest.BaseRepo.ComposeMetas ctx) -}}
+ </pre>
+ {{end}}
{{end}}
</div>
diff --git a/web_src/css/base.css b/web_src/css/base.css
index aa00c8875452..7a8f393f54a9 100644
--- a/web_src/css/base.css
+++ b/web_src/css/base.css
@@ -734,6 +734,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..67b178350ec7 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;
+ overflow-wrap: anywhere;
line-height: initial;
}
-/* PR-comment */
-.repository .timeline-item .commit-body {
- margin-left: 45px;
-}
-
.git-notes.top {
text-align: left;
}