Skip to content

Commit

Permalink
Avoid doubled border for the PR info segment (go-gitea#30663)
Browse files Browse the repository at this point in the history
  • Loading branch information
wxiaoguang authored Apr 23, 2024
1 parent 2f6b1c4 commit 2ee93ea
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion templates/repo/issue/view_content/pull.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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">
Expand Down

0 comments on commit 2ee93ea

Please sign in to comment.