Browse Source

Fix styling for PR merge section when no checks (#11609)

Makes styling consistent between two cases. Also removed unnecessary double border.
tags/v1.13.0-rc1
Cirno the Strongest 4 years ago
parent
commit
75739d00cb
No account linked to committer's email address

+ 1
- 1
integrations/pull_merge_test.go View File

@@ -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

+ 1
- 1
templates/repo/issue/view_content/pull.tmpl View File

@@ -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}}

+ 13
- 1
web_src/less/_repository.less View File

@@ -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 {

Loading…
Cancel
Save