realaravinth/forgejo-federation
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity

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

Browse source 
Makes styling consistent between two cases. Also removed unnecessary double border.
This commit is contained in:
Cirno the Strongest 2020-05-25 21:08:06 +02:00 committed by GitHub
parent 0a7c5623d7
commit 75739d00cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
integrations/pull_merge_test.go
View file

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

2
templates/repo/issue/view_content/pull.tmpl
View file

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

14
web_src/less/_repository.less
View file

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