Commit 9cce321e authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '202274-migrate-fa-spinner-to-spinner' into 'master'

Migrate '.fa-spinner' to '.spinner' for 'app/assets/javascripts/vue_shared/components/markdown/toolbar.vue'

Closes #202274

See merge request gitlab-org/gitlab!25057
parents b0fb98a5 5ec94ef8
<script> <script>
/* eslint-disable @gitlab/vue-i18n/no-bare-strings */ /* eslint-disable @gitlab/vue-i18n/no-bare-strings */
import { GlLink } from '@gitlab/ui'; import { GlLink, GlLoadingIcon } from '@gitlab/ui';
export default { export default {
components: { components: {
GlLink, GlLink,
GlLoadingIcon,
}, },
props: { props: {
markdownDocsPath: { markdownDocsPath: {
...@@ -54,9 +55,7 @@ export default { ...@@ -54,9 +55,7 @@ export default {
<i class="fa fa-file-image-o toolbar-button-icon" aria-hidden="true"></i> <i class="fa fa-file-image-o toolbar-button-icon" aria-hidden="true"></i>
<span class="attaching-file-message"></span> <span class="attaching-file-message"></span>
<span class="uploading-progress">0%</span> <span class="uploading-progress">0%</span>
<span class="uploading-spinner"> <gl-loading-icon inline class="align-text-bottom" />
<i class="fa fa-spinner fa-spin toolbar-button-icon" aria-hidden="true"></i>
</span>
</span> </span>
<span class="uploading-error-container hide"> <span class="uploading-error-container hide">
<span class="uploading-error-icon"> <span class="uploading-error-icon">
......
---
title: New loading spinner for attachemnt uploads via discussion boxes
merge_request: 25057
author: Philip Jonas
type: changed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment