Add latest changes from gitlab-org/gitlab@master

3 files changed, 4 insertions, 4 deletions

diff --git a/app/assets/javascripts/batch_comments/components/draft_note.vue b/app/assets/javascripts/batch_comments/components/draft_note.vue
index 6e0859571db..3e0ae6f65c6 100644
--- a/app/assets/javascripts/batch_comments/components/draft_note.vue
+++ b/app/assets/javascripts/batch_comments/components/draft_note.vue
@@ -86,7 +86,7 @@ export default {
         <publish-button
           :show-count="true"
           :should-publish="false"
-          class="btn btn-success btn-inverted append-right-8"
+          class="btn btn-success btn-inverted gl-mr-3"
         />
         <loading-button
           ref="publishNowButton"
diff --git a/app/assets/javascripts/batch_comments/components/preview_dropdown.vue b/app/assets/javascripts/batch_comments/components/preview_dropdown.vue
index 13b2291d44b..195e1b7ec5c 100644
--- a/app/assets/javascripts/batch_comments/components/preview_dropdown.vue
+++ b/app/assets/javascripts/batch_comments/components/preview_dropdown.vue
@@ -103,7 +103,7 @@ export default {
           :show-count="false"
           :should-publish="true"
           :label="__('Submit review')"
-          class="float-right append-right-8"
+          class="float-right gl-mr-3"
         />
       </div>
     </div>
diff --git a/app/assets/javascripts/batch_comments/components/preview_item.vue b/app/assets/javascripts/batch_comments/components/preview_item.vue
index 9cd74b19c48..df9c419ff96 100644
--- a/app/assets/javascripts/batch_comments/components/preview_item.vue
+++ b/app/assets/javascripts/batch_comments/components/preview_item.vue
@@ -83,7 +83,7 @@ export default {
     @click="scrollToDraft(draft)"
   >
     <span class="review-preview-item-header">
-      <icon class="append-right-8 flex-shrink-0" :name="iconName" />
+      <icon class="gl-mr-3 flex-shrink-0" :name="iconName" />
       <span class="bold text-nowrap">
         <span class="review-preview-item-header-text block-truncated"> {{ titleText }} </span>
         <template v-if="showLinePosition">
@@ -98,7 +98,7 @@ export default {
       v-if="draft.discussion_id && resolvedStatusMessage"
       class="review-preview-item-footer draft-note-resolution p-0"
     >
-      <icon class="append-right-8" name="status_success" /> {{ resolvedStatusMessage }}
+      <icon class="gl-mr-3" name="status_success" /> {{ resolvedStatusMessage }}
     </span>
   </button>
 </template>