diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index 0d98f08e69..758733fc44 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -158,26 +158,6 @@ {{$.i18n.Tr (printf "repo.signing.wont_sign.%s" .WontSignReason) }} {{end}} - {{if and .Divergence (gt .Divergence.Behind 0)}} -
-
-
- {{svg "octicon-alert" 16}} - {{$.i18n.Tr "repo.pulls.outdated_with_base_branch"}} -
- {{if .UpdateAllowed}} -
-
- {{.CsrfTokenHtml}} - -
-
- {{end}} -
-
- {{end}} {{if .AllowMerge}} {{$prUnit := .Repository.MustGetUnit $.UnitTypePullRequests}} {{$approvers := .Issue.PullRequest.GetApprovers}} @@ -307,6 +287,26 @@ {{end}} {{end}} + {{if and .Divergence (gt .Divergence.Behind 0)}} +
+
+
+ {{svg "octicon-alert" 16}} + {{$.i18n.Tr "repo.pulls.outdated_with_base_branch"}} +
+ {{if .UpdateAllowed}} +
+
+ {{.CsrfTokenHtml}} + +
+
+ {{end}} +
+
+ {{end}} {{else}} {{/* Merge conflict without specific file. Suggest manual merge, only if all reviews and status checks OK. */}} {{if .IsBlockedByApprovals}} diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index 65b722d268..255dd3d336 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -659,10 +659,14 @@ padding-left: 2px; } .branch-update.grid { - margin-bottom: -1.5rem; - margin-top: -.5rem; .row { padding-bottom: 0; + .icon { + margin-top: 1.1rem; + } + .ui.button { + margin-bottom: 1rem; + } } } }