From 495638ae13473badfbfc7a29bbd9a2c26ea39696 Mon Sep 17 00:00:00 2001
From: CirnoT <1447794+CirnoT@users.noreply.github.com>
Date: Sun, 24 May 2020 19:53:04 +0200
Subject: [PATCH 1/5] Fix styling for PR merge section when no checks

---
 templates/repo/issue/view_content/pull.tmpl | 2 +-
 web_src/less/_repository.less               | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl
index 3aee0773f8599..a5d753ac09a04 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 0d18962a19d61..8e91b7caf9df5 100644
--- a/web_src/less/_repository.less
+++ b/web_src/less/_repository.less
@@ -881,6 +881,10 @@
                 }
 
                 .content {
+                    > .merge-section.no-header {
+                        #avatar-arrow;
+                    }
+
                     > .header {
                         #avatar-arrow;
                         font-weight: normal;
@@ -919,7 +923,6 @@
                     }
 
                     > .merge-section {
-                        border-top: 1px solid #d4d4d5;
                         background-color: #f7f7f7;
                     }
 

From 8bbc3be58e7f2a3d781c52027bf626aced86556b Mon Sep 17 00:00:00 2001
From: CirnoT <1447794+CirnoT@users.noreply.github.com>
Date: Sun, 24 May 2020 22:55:45 +0200
Subject: [PATCH 2/5] stretch ui divider to fill width

---
 web_src/less/_repository.less | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less
index 8e91b7caf9df5..3cceeb01feeb7 100644
--- a/web_src/less/_repository.less
+++ b/web_src/less/_repository.less
@@ -881,8 +881,15 @@
                 }
 
                 .content {
-                    > .merge-section.no-header {
-                        #avatar-arrow;
+                    > .merge-section {
+                        .divider {
+                            margin-left: -1rem;
+                            margin-right: -1rem;
+                        }
+
+                        &.no-header {
+                            #avatar-arrow;
+                        }
                     }
 
                     > .header {

From 3d4b1fd96accb2685d4819a995371a4e912b3afa Mon Sep 17 00:00:00 2001
From: CirnoT <1447794+CirnoT@users.noreply.github.com>
Date: Mon, 25 May 2020 00:13:39 +0200
Subject: [PATCH 3/5] merge duplicate ruleset

---
 web_src/less/_repository.less | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less
index 3cceeb01feeb7..7b79a48945c1c 100644
--- a/web_src/less/_repository.less
+++ b/web_src/less/_repository.less
@@ -881,17 +881,6 @@
                 }
 
                 .content {
-                    > .merge-section {
-                        .divider {
-                            margin-left: -1rem;
-                            margin-right: -1rem;
-                        }
-
-                        &.no-header {
-                            #avatar-arrow;
-                        }
-                    }
-
                     > .header {
                         #avatar-arrow;
                         font-weight: normal;
@@ -931,6 +920,15 @@
 
                     > .merge-section {
                         background-color: #f7f7f7;
+
+                        .divider {
+                            margin-left: -1rem;
+                            margin-right: -1rem;
+                        }
+
+                        &.no-header {
+                            #avatar-arrow;
+                        }
                     }
 
                     .markdown {

From 872ad0d79a0d6c15f9646878457c0b4fcf77eb11 Mon Sep 17 00:00:00 2001
From: CirnoT <1447794+CirnoT@users.noreply.github.com>
Date: Mon, 25 May 2020 01:08:14 +0200
Subject: [PATCH 4/5] add some padding between elements

---
 web_src/less/_repository.less | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less
index 7b79a48945c1c..983cc26570beb 100644
--- a/web_src/less/_repository.less
+++ b/web_src/less/_repository.less
@@ -921,6 +921,10 @@
                     > .merge-section {
                         background-color: #f7f7f7;
 
+                        .item + .item {
+                            padding-top: .5rem;
+                        }
+
                         .divider {
                             margin-left: -1rem;
                             margin-right: -1rem;

From ab42444be5c8865eb5872050f082df7d6417ab6c Mon Sep 17 00:00:00 2001
From: CirnoT <1447794+CirnoT@users.noreply.github.com>
Date: Mon, 25 May 2020 16:44:52 +0200
Subject: [PATCH 5/5] fix test

---
 integrations/pull_merge_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/integrations/pull_merge_test.go b/integrations/pull_merge_test.go
index b5ac9406aceef..04e68ff3dcc46 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