Merge branch '32715-fix-note-padding' into 'master'

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;

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;
       }
     }
 
@@ -163,7 +168,7 @@ ul.notes {
       margin-left: 65px;
     }
 
-    .note-header {
+    .note-header-info {
       padding-bottom: 0;
     }
 
@@ -373,7 +378,7 @@ ul.notes {
 
 .note-header-info {
   min-width: 0;
-  padding-bottom: 5px;
+  padding-bottom: 8px;
 }
 
 .system-note .note-header-info {

changelogs/unreleased/32715-fix-note-padding.yml

+---
+title: Make all notes use equal padding
+merge_request:
+author: