forked from gitea/gitea
Fix styling for PR merge section when no checks (#11609)
Makes styling consistent between two cases. Also removed unnecessary double border.
This commit is contained in:
parent
0a7c5623d7
commit
75739d00cb
|
@ -194,7 +194,7 @@ func TestCantMergeWorkInProgress(t *testing.T) {
|
||||||
req := NewRequest(t, "GET", resp.Header().Get("Location"))
|
req := NewRequest(t, "GET", resp.Header().Get("Location"))
|
||||||
resp = session.MakeRequest(t, req, http.StatusOK)
|
resp = session.MakeRequest(t, req, http.StatusOK)
|
||||||
htmlDoc := NewHTMLParser(t, resp.Body)
|
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")
|
assert.NotEmpty(t, text, "Can't find WIP text")
|
||||||
|
|
||||||
// remove <strong /> from lang
|
// remove <strong /> from lang
|
||||||
|
|
|
@ -75,7 +75,7 @@
|
||||||
{{- else}}red{{end}}">{{svg "octicon-git-merge" 32}}</a>
|
{{- else}}red{{end}}">{{svg "octicon-git-merge" 32}}</a>
|
||||||
<div class="content">
|
<div class="content">
|
||||||
{{template "repo/pulls/status" .}}
|
{{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}}
|
{{if .Issue.PullRequest.HasMerged}}
|
||||||
<div class="item text purple">
|
<div class="item text purple">
|
||||||
{{if .Issue.PullRequest.MergedCommitID}}
|
{{if .Issue.PullRequest.MergedCommitID}}
|
||||||
|
|
|
@ -919,8 +919,20 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
> .merge-section {
|
> .merge-section {
|
||||||
border-top: 1px solid #d4d4d5;
|
|
||||||
background-color: #f7f7f7;
|
background-color: #f7f7f7;
|
||||||
|
|
||||||
|
.item + .item {
|
||||||
|
padding-top: .5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.divider {
|
||||||
|
margin-left: -1rem;
|
||||||
|
margin-right: -1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
&.no-header {
|
||||||
|
#avatar-arrow;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.markdown {
|
.markdown {
|
||||||
|
|
Loading…
Reference in New Issue