kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

32715 Make all notes use equal padding

Browse source
This commit is contained in:
tauriedavis 2017-05-22 12:00:56 -07:00
parent 374aad38ac
commit 1725dc0857
4 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/stylesheets/framework/timeline.scss
View file

@ -23,7 +23,6 @@
} }
.timeline-entry { .timeline-entry {
padding: $gl-padding $gl-btn-padding 0;
border-color: $white-normal; border-color: $white-normal;
color: $gl-text-color; color: $gl-text-color;
border-bottom: 1px solid $border-white-light; border-bottom: 1px solid $border-white-light;

4
app/assets/stylesheets/pages/note_form.scss
View file

@ -164,10 +164,6 @@
.discussion-body, .discussion-body,
.diff-file { .diff-file {
.notes .note {
padding: 10px 15px;
}
.discussion-reply-holder { .discussion-reply-holder {
background-color: $white-light; background-color: $white-light;
padding: 10px 16px; padding: 10px 16px;

13
app/assets/stylesheets/pages/notes.scss
View file

@ -43,7 +43,11 @@ ul.notes {
} }
.discussion-body { .discussion-body {
padding-top: 15px; padding-top: 8px;
.panel {
margin-bottom: 0;
}
} }
.discussion { .discussion {
@ -53,6 +57,7 @@ ul.notes {
} }
.note { .note {
padding: $gl-padding $gl-btn-padding 0;
display: block; display: block;
position: relative; position: relative;
border-bottom: 1px solid $white-normal; border-bottom: 1px solid $white-normal;
@ -78,7 +83,7 @@ ul.notes {
&.note-discussion { &.note-discussion {
&.timeline-entry { &.timeline-entry {
padding: 14px 10px; padding: $gl-padding 10px;
} }
.system-note { .system-note {
@ -167,7 +172,7 @@ ul.notes {
margin-left: 65px; margin-left: 65px;
} }
.note-header { .note-header-info {
padding-bottom: 0; padding-bottom: 0;
} }
@ -377,7 +382,7 @@ ul.notes {
.note-header-info { .note-header-info {
min-width: 0; min-width: 0;
padding-bottom: 5px; padding-bottom: 8px;
} }
.note-headline-light { .note-headline-light {

4
changelogs/unreleased/32715-fix-note-padding.yml Normal file
View file

@ -0,0 +1,4 @@
---
title: Make all notes use equal padding
merge_request:
author: