diff options
| author | Cirno the Strongest <1447794+CirnoT@users.noreply.github.com> | 2020-05-25 21:08:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-25 20:08:06 +0100 |
| commit | 75739d00cb05b07706304bca742dc676e34b9a74 (patch) | |
| tree | 365f45b7924abb5d8c4ffdaccace4d556b702a50 | |
| parent | 0a7c5623d7a58a342f1734d00080ef71c5ed991e (diff) | |
| download | gitea-75739d00cb05b07706304bca742dc676e34b9a74.tar.gz gitea-75739d00cb05b07706304bca742dc676e34b9a74.zip | |
Fix styling for PR merge section when no checks (#11609)
Makes styling consistent between two cases. Also removed unnecessary double border.
| -rw-r--r-- | integrations/pull_merge_test.go | 2 | ||||
| -rw-r--r-- | templates/repo/issue/view_content/pull.tmpl | 2 | ||||
| -rw-r--r-- | web_src/less/_repository.less | 14 |
3 files changed, 15 insertions, 3 deletions
diff --git a/integrations/pull_merge_test.go b/integrations/pull_merge_test.go index b5ac9406ac..04e68ff3dc 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 diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index 3aee0773f8..a5d753ac09 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 388e2713df..f04ce05a91 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -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 { |