Browse Source

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

tags/v1.22.0-rc1
wxiaoguang 1 week ago
parent
commit
2ee93ea178
No account linked to committer's email address
1 changed files with 3 additions and 1 deletions
  1. 3
    1
      templates/repo/issue/view_content/pull.tmpl

+ 3
- 1
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">

Loading…
Cancel
Save