Browse Source

Backport various styling fixes (#11619)

* Fix inconsistent font size for markdown preview on new PR view (#11565)

We use same method for new issue form and issue view, but was missing from new PR view making it one place where markdown preview is inconsistent in font size.

(cherry picked from commit 04afd9d1e2)

* Fix margin on PR form (#11566)

(cherry picked from commit f2a0be1683)

* Fix margin for attached top header on code review (#11571)

Introduced naively by #11463

The margin was being applied too widely.

(cherry picked from commit e682a92295)

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

Makes styling consistent between two cases. Also removed unnecessary double border.

* Normalize avatar radius
tags/v1.12.0-rc2
Cirno the Strongest 4 years ago
parent
commit
5331af1854
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}}

+ 6
- 1
web_src/less/_base.less View File

@@ -576,7 +576,12 @@ code,
font-weight: normal;
}

.avatar.image {
.avatar.image,
.avatar.image img,
.avatar.image svg,
.avatar.images .image,
.avatar.images img,
.avatar.images svg {
border-radius: 3px;
}


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

@@ -898,8 +898,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 {
@@ -1234,6 +1246,14 @@
}
}
}

.pullrequest-form {
margin-bottom: 1.5rem;
}

.markdown {
font-size: 14px;
}
}

.filter.dropdown .menu {

+ 4
- 1
web_src/less/_review.less View File

@@ -19,8 +19,11 @@

.add-comment-left.add-comment-right .ui.attached.header {
border: 1px solid #d4d4d5;
margin-bottom: .5em;
margin-top: .5em;

&:not(.top) {
margin-bottom: .5em;
}
}

.focus-lines-new .ui.button.add-code-comment.add-code-comment-right,

Loading…
Cancel
Save