diff options
author | tauriedavis <taurie@gitlab.com> | 2017-05-22 12:00:56 -0700 |
---|---|---|
committer | tauriedavis <taurie@gitlab.com> | 2017-05-23 13:47:57 -0700 |
commit | 1725dc0857c5bb0f973f78632680cf1a9904c424 (patch) | |
tree | bb562bdba034d235d7010750926d78cb3a98263c | |
parent | 374aad38ac87d43f5449d518c2f5241c2116199a (diff) | |
download | gitlab-ce-32715-fix-note-padding.tar.gz |
32715 Make all notes use equal padding32715-fix-note-padding
-rw-r--r-- | app/assets/stylesheets/framework/timeline.scss | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/note_form.scss | 4 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 13 | ||||
-rw-r--r-- | changelogs/unreleased/32715-fix-note-padding.yml | 4 |
4 files changed, 13 insertions, 9 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/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index 9db26f99a75..49e453c7dbc 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -164,10 +164,6 @@ .discussion-body, .diff-file { - .notes .note { - padding: 10px 15px; - } - .discussion-reply-holder { background-color: $white-light; padding: 10px 16px; diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 4b15fc2bd82..23bfa83fb89 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; } @@ -377,7 +382,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: |