1 files changed, 10 insertions, 5 deletions

diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index db07f16dfd0..fc1b78bf730 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -164,7 +164,7 @@ $system-note-svg-size: 16px;
     }
 
     .note-body {
-      padding: $gl-padding-4;
+      padding: $gl-padding-4 $gl-padding-4 $gl-padding-4 $gl-padding-8;
       overflow-x: auto;
       overflow-y: hidden;
 
@@ -305,7 +305,7 @@ $system-note-svg-size: 16px;
       height: $system-note-icon-size;
       border: 1px solid $gray-10;
       border-radius: $system-note-icon-size;
-      margin: -6px 20px 0 0;
+      margin: -6px 0 0;
 
       svg {
         width: $system-note-svg-size;
@@ -334,10 +334,14 @@ $system-note-svg-size: 16px;
     border-radius: 0;
 
     @media (min-width: map-get($grid-breakpoints, md)) {
-      top: calc(#{$mr-tabs-height} + #{$header-height});
+      --initial-top: calc(#{$header-height} + #{$mr-tabs-height});
+
+      &.is-sidebar-moved {
+        --initial-top: calc(#{$header-height} + #{$mr-tabs-height + 28px});
+      }
 
       .with-performance-bar & {
-        top: 123px;
+        --top: 123px;
       }
     }
 
@@ -551,6 +555,7 @@ $system-note-svg-size: 16px;
 .note-header {
   display: flex;
   justify-content: space-between;
+  align-items: center;
   flex-wrap: wrap;
 
   > .note-header-info,
@@ -581,7 +586,7 @@ $system-note-svg-size: 16px;
 
 .note-header-info {
   min-width: 0;
-  padding-left: $gl-padding-4;
+  padding-left: $gl-padding-8;
 
   &.discussion {
     padding-bottom: 0;