Makes styling consistent between two cases. Also removed unnecessary double border.tags/v1.13.0-rc1
@@ -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 |
@@ -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}} |
@@ -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 { |