diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-19 12:08:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-19 12:08:59 +0300 |
| commit | c1fc5da123a1fe670e32740669a9d5e59eff38f5 (patch) | |
| tree | 9e872d4057232aed3e5e0304cdfa04db74ba8464 /app/assets/javascripts/vue_shared/components | |
| parent | 82a708b9f0adca259062555d16a9720f9955993b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared/components')
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/markdown/toolbar.vue | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue b/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue index 5140184eb8e..4da99e00165 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue @@ -1,10 +1,11 @@ <script> /* eslint-disable @gitlab/vue-i18n/no-bare-strings */ -import { GlLink } from '@gitlab/ui'; +import { GlLink, GlLoadingIcon } from '@gitlab/ui'; export default { components: { GlLink, + GlLoadingIcon, }, props: { markdownDocsPath: { @@ -54,9 +55,7 @@ export default { <i class="fa fa-file-image-o toolbar-button-icon" aria-hidden="true"></i> <span class="attaching-file-message"></span> <span class="uploading-progress">0%</span> - <span class="uploading-spinner"> - <i class="fa fa-spinner fa-spin toolbar-button-icon" aria-hidden="true"></i> - </span> + <gl-loading-icon inline class="align-text-bottom" /> </span> <span class="uploading-error-container hide"> <span class="uploading-error-icon"> |