From 75739d00cb05b07706304bca742dc676e34b9a74 Mon Sep 17 00:00:00 2001
From: Cirno the Strongest <1447794+CirnoT@users.noreply.github.com>
Date: Mon, 25 May 2020 21:08:06 +0200
Subject: [PATCH] Fix styling for PR merge section when no checks (#11609)
Makes styling consistent between two cases. Also removed unnecessary double border.
---
integrations/pull_merge_test.go | 2 +-
templates/repo/issue/view_content/pull.tmpl | 2 +-
web_src/less/_repository.less | 14 +++++++++++++-
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/integrations/pull_merge_test.go b/integrations/pull_merge_test.go
index b5ac9406ac..04e68ff3dc 100644
--- a/integrations/pull_merge_test.go
+++ b/integrations/pull_merge_test.go
@@ -194,7 +194,7 @@ func TestCantMergeWorkInProgress(t *testing.T) {
req := NewRequest(t, "GET", resp.Header().Get("Location"))
resp = session.MakeRequest(t, req, http.StatusOK)
htmlDoc := NewHTMLParser(t, resp.Body)
- text := strings.TrimSpace(htmlDoc.doc.Find(".attached.header > .text.grey").Last().Text())
+ text := strings.TrimSpace(htmlDoc.doc.Find(".attached.merge-section.no-header > .text.grey").Last().Text())
assert.NotEmpty(t, text, "Can't find WIP text")
// remove <strong /> from lang
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl
index 3aee0773f8..a5d753ac09 100644
--- a/templates/repo/issue/view_content/pull.tmpl
+++ b/templates/repo/issue/view_content/pull.tmpl
@@ -75,7 +75,7 @@
{{- else}}red{{end}}">{{svg "octicon-git-merge" 32}}</a>
<div class="content">
{{template "repo/pulls/status" .}}
- <div class="ui {{if not $.LatestCommitStatus}}top attached header{{else}}attached merge-section segment{{end}}">
+ <div class="ui attached merge-section segment {{if not $.LatestCommitStatus}}no-header{{end}}">
{{if .Issue.PullRequest.HasMerged}}
<div class="item text purple">
{{if .Issue.PullRequest.MergedCommitID}}
diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less
index 388e2713df..f04ce05a91 100644
--- a/web_src/less/_repository.less
+++ b/web_src/less/_repository.less
@@ -919,8 +919,20 @@
}
> .merge-section {
- border-top: 1px solid #d4d4d5;
background-color: #f7f7f7;
+
+ .item + .item {
+ padding-top: .5rem;
+ }
+
+ .divider {
+ margin-left: -1rem;
+ margin-right: -1rem;
+ }
+
+ &.no-header {
+ #avatar-arrow;
+ }
}
.markdown {