diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-05-24 19:10:15 +0000 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2017-05-25 04:55:06 +0000 |
| commit | a17b740a0b3e6c1570b1d2147074c2acbf2f2c1c (patch) | |
| tree | 3dc23cbdccdd1b5325dc3c36dd7e1963f3ede515 | |
| parent | 267a3b2ab2b3fe017827ba291cd20c0d07c99ec2 (diff) | |
| download | gitlab-ce-a17b740a0b3e6c1570b1d2147074c2acbf2f2c1c.tar.gz | |
Merge branch '32715-fix-note-padding' into 'master'
32715 Make all notes use equal padding
Closes #32715 and #32467
See merge request !11616
| -rw-r--r-- | app/assets/stylesheets/framework/timeline.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 13 | ||||
| -rw-r--r-- | changelogs/unreleased/32715-fix-note-padding.yml | 4 |
3 files changed, 13 insertions, 5 deletions
diff --git a/app/assets/stylesheets/framework/timeline.scss b/app/assets/stylesheets/framework/timeline.scss index aa0c512a277..70db1962228 100644 --- a/app/assets/stylesheets/framework/timeline.scss +++ b/app/assets/stylesheets/framework/timeline.scss @@ -23,7 +23,6 @@ } .timeline-entry { - padding: $gl-padding $gl-btn-padding 0; border-color: $white-normal; color: $gl-text-color; border-bottom: 1px solid $border-white-light; diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index c7569f71c19..99bcf612e8f 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -43,7 +43,11 @@ ul.notes { } .discussion-body { - padding-top: 15px; + padding-top: 8px; + + .panel { + margin-bottom: 0; + } } .discussion { @@ -53,6 +57,7 @@ ul.notes { } .note { + padding: $gl-padding $gl-btn-padding 0; display: block; position: relative; border-bottom: 1px solid $white-normal; @@ -78,7 +83,7 @@ ul.notes { &.note-discussion { &.timeline-entry { - padding: 14px 10px; + padding: $gl-padding 10px; } .system-note { @@ -167,7 +172,7 @@ ul.notes { margin-left: 65px; } - .note-header { + .note-header-info { padding-bottom: 0; } @@ -386,7 +391,7 @@ ul.notes { .note-header-info { min-width: 0; - padding-bottom: 5px; + padding-bottom: 8px; } .note-headline-light { diff --git a/changelogs/unreleased/32715-fix-note-padding.yml b/changelogs/unreleased/32715-fix-note-padding.yml new file mode 100644 index 00000000000..867ed7eb171 --- /dev/null +++ b/changelogs/unreleased/32715-fix-note-padding.yml @@ -0,0 +1,4 @@ +--- +title: Make all notes use equal padding +merge_request: +author: |