Merge branch '31727-timestamps-in-merge-request-discussion-overflow-role-badge' into 'master'

app/assets/stylesheets/pages/notes.scss

@@ -130,12 +130,6 @@ ul.notes {
     }
 
     .note-header {
-      padding-bottom: 8px;
-      padding-right: 20px;
-
-      @media (min-width: $screen-sm-min) {
-        padding-right: 0;
-      }
 
       @media (max-width: $screen-xs-min) {
         .inline {
@@ -384,10 +378,15 @@ ul.notes {
 .note-header {
   display: flex;
   justify-content: space-between;
+
+  @media (max-width: $screen-xs-max) {
+    flex-flow: row wrap;
+  }
 }
 
 .note-header-info {
   min-width: 0;
+  padding-bottom: 5px;
 }
 
 .note-headline-light {
@@ -435,6 +434,11 @@ ul.notes {
   margin-left: 10px;
   color: $gray-darkest;
 
+  @media (max-width: $screen-xs-max) {
+    float: none;
+    margin-left: 0;
+  }
+
   .note-action-button {
     margin-left: 8px;
   }