Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

1 files changed, 4 insertions, 7 deletions

diff --git a/app/assets/javascripts/notes/components/note_actions.vue b/app/assets/javascripts/notes/components/note_actions.vue
index 24399e669a6..0cc818c6d0e 100644
--- a/app/assets/javascripts/notes/components/note_actions.vue
+++ b/app/assets/javascripts/notes/components/note_actions.vue
@@ -278,7 +278,6 @@ export default {
       v-if="canResolve"
       ref="resolveButton"
       v-gl-tooltip
-      size="small"
       category="tertiary"
       :variant="resolveVariant"
       :class="{ 'is-disabled': !resolvable, 'is-active': isResolved }"
@@ -292,7 +291,7 @@ export default {
     <template v-if="canAwardEmoji">
       <emoji-picker
         v-if="glFeatures.improvedEmojiPicker"
-        toggle-class="note-action-button note-emoji-button gl-text-gray-600 gl-m-2 gl-p-0! gl-shadow-none! gl-bg-transparent!"
+        toggle-class="note-action-button note-emoji-button gl-text-gray-600 gl-m-3 gl-p-0! gl-shadow-none! gl-bg-transparent!"
         @click="setAwardEmoji"
       >
         <template #button-content>
@@ -305,10 +304,9 @@ export default {
         v-else
         v-gl-tooltip
         :class="{ 'js-user-authored': isAuthoredByCurrentUser }"
-        class="note-action-button note-emoji-button add-reaction-button js-add-award js-note-emoji"
+        class="note-action-button note-emoji-button add-reaction-button btn-icon js-add-award js-note-emoji"
         category="tertiary"
         variant="default"
-        size="small"
         :title="$options.i18n.addReactionLabel"
         :aria-label="$options.i18n.addReactionLabel"
         data-position="right"
@@ -336,7 +334,6 @@ export default {
       :title="$options.i18n.editCommentLabel"
       :aria-label="$options.i18n.editCommentLabel"
       icon="pencil"
-      size="small"
       category="tertiary"
       class="note-action-button js-note-edit"
       data-qa-selector="note_edit_button"
@@ -347,24 +344,24 @@ export default {
       v-gl-tooltip
       :title="$options.i18n.deleteCommentLabel"
       :aria-label="$options.i18n.deleteCommentLabel"
-      size="small"
       icon="remove"
       category="tertiary"
       class="note-action-button js-note-delete"
       @click="onDelete"
     />
     <div v-else-if="shouldShowActionsDropdown" class="dropdown more-actions">
+      <!-- eslint-disable @gitlab/vue-no-data-toggle -->
       <gl-button
         v-gl-tooltip
         :title="$options.i18n.moreActionsLabel"
         :aria-label="$options.i18n.moreActionsLabel"
         icon="ellipsis_v"
-        size="small"
         category="tertiary"
         class="note-action-button more-actions-toggle"
         data-toggle="dropdown"
         @click="closeTooltip"
       />
+      <!-- eslint-enable @gitlab/vue-no-data-toggle -->
       <ul class="dropdown-menu more-actions-dropdown dropdown-open-left">
         <gl-dropdown-item v-if="canReportAsAbuse" :href="reportAbusePath">
           {{ __('Report abuse to admin') }}