mirror/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-10 04:05:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Avoid doubled border for the PR info segment (#30663)

Browse source 
(cherry picked from commit 2ee93ea17869de8fe24c6965fa3416ff30d55c5a)
This commit is contained in:
wxiaoguang 2024-04-24 03:24:10 +08:00 committed by Earl Warren
parent 561a7cf520
commit bafe237375
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
templates/repo/issue/view_content/pull.tmpl
View file

@ -20,6 +20,7 @@
{{- else if .Issue.PullRequest.CanAutoMerge}}green
{{- else}}red{{end}}">{{svg "octicon-git-merge" 40}}</div>
<div class="content">
{{if .LatestCommitStatus}}
<div class="ui attached segment fitted">
{{template "repo/pulls/status" (dict
"CommitStatus" .LatestCommitStatus
@ -29,8 +30,9 @@
"is_context_required" .is_context_required
)}}
</div>
{{end}}
{{$showGeneralMergeForm := false}}
<div class="ui attached merge-section segment {{if not $.LatestCommitStatus}}no-header{{end}} flex-items-block">
<div class="ui attached segment merge-section {{if not $.LatestCommitStatus}}no-header{{end}} flex-items-block">
{{if .Issue.PullRequest.HasMerged}}
{{if .IsPullBranchDeletable}}
<div class="item item-section text tw-flex-1">