diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2024-04-24 03:24:10 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-23 19:24:10 +0000 |
| commit | 2ee93ea17869de8fe24c6965fa3416ff30d55c5a (patch) | |
| tree | dd7d3133c387b047e4490111a9aea7b48a757da5 /templates | |
| parent | 2f6b1c46a1a4a90f56ca0f3ad7840e8e70daeab5 (diff) | |
| download | gitea-2ee93ea17869de8fe24c6965fa3416ff30d55c5a.tar.gz gitea-2ee93ea17869de8fe24c6965fa3416ff30d55c5a.zip | |
Avoid doubled border for the PR info segment (#30663)
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/repo/issue/view_content/pull.tmpl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index 117cd7b7a3..77378ef1bd 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -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"> |