1 files changed, 16 insertions, 6 deletions

diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 84095819db9..82fe307bde9 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -98,7 +98,14 @@ $system-note-svg-size: 1rem;
             border-left: 1px solid $border-color;
             border-right: 1px solid $border-color;
             background-color: $white;
-            padding: $gl-padding-8 $gl-padding-8 $gl-padding-8 $gl-padding;
+
+            .timeline-content {
+              padding: $gl-padding-8 $gl-padding-8 $gl-padding-8 $gl-padding;
+            }
+
+            .timeline-avatar {
+              margin: $gl-padding-8 0 0 $gl-padding;
+            }
 
             .timeline-discussion-body {
               margin-left: 2rem;
@@ -252,7 +259,7 @@ $system-note-svg-size: 1rem;
     }
 
     .note-body {
-      padding: $gl-padding-8;
+      padding: 0 $gl-padding-8 $gl-padding-8;
       overflow-x: auto;
       overflow-y: hidden;
 
@@ -281,7 +288,7 @@ $system-note-svg-size: 1rem;
     padding: $gl-padding-8 0;
     margin: $gl-padding 0;
     background-color: transparent;
-    font-size: $gl-font-size-sm;
+    font-size: $gl-font-size;
 
     .note-header-info {
       padding-bottom: 0;
@@ -815,17 +822,20 @@ $system-note-svg-size: 1rem;
 }
 
 .note-actions {
-  align-self: flex-start;
   justify-content: flex-end;
   flex-shrink: 1;
   display: inline-flex;
   align-items: center;
-  margin-left: 10px;
+  margin-left: $gl-padding-8;
   color: $gray-400;
 
   @include notes-media('max', map-get($grid-breakpoints, sm) - 1) {
+    justify-content: flex-start;
     float: none;
-    margin-left: 0;
+
+    .note-actions__mobile-spacer {
+      flex-grow: 1;
+    }
   }
 }