Merge branch 'fix-broken-paperclip' into 'master'

Fix dropzone paperclip and loading icons

See merge request gitlab-org/gitlab!46093

app/assets/javascripts/dropzone_input.js

@@ -26,7 +26,7 @@ function getErrorMessage(res) {
 
 export default function dropzoneInput(form, config = { parallelUploads: 2 }) {
   const divHover = '<div class="div-dropzone-hover"></div>';
-  const iconPaperclip = spriteIcon('paperclip', 'div-dropzone-icon');
+  const iconPaperclip = spriteIcon('paperclip', 'div-dropzone-icon s24');
   const $attachButton = form.find('.button-attach-file');
   const $attachingFileMessage = form.find('.attaching-file-message');
   const $cancelButton = form.find('.button-cancel-uploading-files');

app/assets/javascripts/vue_shared/components/markdown/toolbar.vue

@@ -61,17 +61,17 @@ export default {
     <span v-if="canAttachFile" class="uploading-container">
       <span class="uploading-progress-container hide">
         <template>
-          <gl-icon name="media" :size="16" class="gl-vertical-align-text-bottom" />
+          <gl-icon name="media" />
         </template>
         <span class="attaching-file-message"></span>
         <!-- eslint-disable-next-line @gitlab/vue-require-i18n-strings -->
         <span class="uploading-progress">0%</span>
-        <gl-loading-icon inline class="align-text-bottom" />
+        <gl-loading-icon inline />
       </span>
       <span class="uploading-error-container hide">
         <span class="uploading-error-icon">
           <template>
-            <gl-icon name="media" :size="16" class="gl-vertical-align-text-bottom" />
+            <gl-icon name="media" />
           </template>
         </span>
         <span class="uploading-error-message"></span>

changelogs/unreleased/fix-broken-paperclip.yml

+---
+title: Fix dropzone paperclip and loading icons
+merge_request: 46093
+author:
+type: fixed

spec/frontend/snippets/components/__snapshots__/snippet_description_edit_spec.js.snap

@@ -53,7 +53,7 @@ exports[`Snippet Description Edit component rendering matches the snapshot 1`] =
               class="div-dropzone-hover"
             >
               <svg
-                class="div-dropzone-icon"
+                class="div-dropzone-icon s24"
               >
                 <use
                   xlink:href="undefined#paperclip"