Resolve "Inconsistent spacing between note and user avatar in discussions"

3cfdda1c · Sam Bigelow · Annabel Dunstone Gray · e28e48eb · 3cfdda1c · 3cfdda1c
Commit 3cfdda1c authored Jan 09, 2019 by Sam Bigelow Committed by Annabel Dunstone Gray Jan 09, 2019
2 changed files
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -153,12 +153,12 @@ $note-form-margin-left: 72px;
    position: relative;

    .timeline-discussion-body {
-      margin-top: -8px;
+      margin-top: -$gl-padding-8;
      overflow-x: auto;
      overflow-y: hidden;

-      .discussion-resolved-text {
-        margin-bottom: 8px;
+      .note-body {
+        margin-top: $gl-padding-8;
      }
    }


--- a/changelogs/unreleased/55958-inconsistent-spacing-between-note-and-user-avatar-in-discussions.yml
+++ b/changelogs/unreleased/55958-inconsistent-spacing-between-note-and-user-avatar-in-discussions.yml
+---
+title: Fix spacing on discussions
+merge_request: !24197
+author:
+type: fixed