From 8e6a32d05b65b0d0d1e3e8b95c25d96f31baa6b9 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Fri, 9 Nov 2018 19:53:50 +0000
Subject: Merge branch '53768-diff-comment-action-btns' into 'master'

Fix alignment of diff comment buttons

Closes #53768

See merge request gitlab-org/gitlab-ce!22944

(cherry picked from commit d5027d774b2c26a2ee29b249b9919197ce499bff)

a597103a Fix alignment of diff comment buttons
---
 app/assets/javascripts/notes/components/noteable_discussion.vue | 6 +++---
 app/assets/stylesheets/pages/notes.scss                         | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/notes/components/noteable_discussion.vue
index a153edd0476..c1dfa036678 100644
--- a/app/assets/javascripts/notes/components/noteable_discussion.vue
+++ b/app/assets/javascripts/notes/components/noteable_discussion.vue
@@ -433,7 +433,7 @@ Please check your network connection and try again.`;
                     <div class="discussion-with-resolve-btn">
                       <button
                         type="button"
-                        class="js-vue-discussion-reply btn btn-text-field mr-2 qa-discussion-reply"
+                        class="js-vue-discussion-reply btn btn-text-field mr-sm-2 qa-discussion-reply"
                         title="Add a reply"
                         @click="showReplyForm"
                       >
@@ -442,7 +442,7 @@ Please check your network connection and try again.`;
                       <div v-if="discussion.resolvable">
                         <button
                           type="button"
-                          class="btn btn-default mx-sm-2"
+                          class="btn btn-default mr-sm-2"
                           @click="resolveHandler()"
                         >
                           <i
@@ -455,7 +455,7 @@ Please check your network connection and try again.`;
                       </div>
                       <div
                         v-if="discussion.resolvable"
-                        class="btn-group discussion-actions"
+                        class="btn-group discussion-actions ml-sm-2"
                         role="group"
                       >
                         <div
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index dcb1275d182..c57c1eee350 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -595,7 +595,6 @@ $note-form-margin-left: 70px;
 
 .discussion-actions {
   float: right;
-  margin-left: 10px;
   color: $gray-darkest;
 
   @include media-breakpoint-down(xs) {
-- 
cgit v1.2.1