Commit 4a73592e authored by Phil Hughes's avatar Phil Hughes

Merge branch...

Merge branch '202264-migrate-fa-spinner-to-spinner-for-app-assets-javascripts-vue_shared-components-awards_list' into 'master'

Migrate '.fa-spinner' to '.spinner' for 'awards_list.vue'

See merge request gitlab-org/gitlab!45393
parents da977f43 e6ba1b2b
<script> <script>
/* eslint-disable vue/no-v-html */ /* eslint-disable vue/no-v-html */
import { groupBy } from 'lodash'; import { groupBy } from 'lodash';
import { GlIcon } from '@gitlab/ui'; import { GlIcon, GlLoadingIcon } from '@gitlab/ui';
import tooltip from '~/vue_shared/directives/tooltip'; import tooltip from '~/vue_shared/directives/tooltip';
import { glEmojiTag } from '../../emoji'; import { glEmojiTag } from '../../emoji';
import { __, sprintf } from '~/locale'; import { __, sprintf } from '~/locale';
...@@ -12,6 +12,7 @@ const NO_USER_ID = -1; ...@@ -12,6 +12,7 @@ const NO_USER_ID = -1;
export default { export default {
components: { components: {
GlIcon, GlIcon,
GlLoadingIcon,
}, },
directives: { directives: {
tooltip, tooltip,
...@@ -184,10 +185,7 @@ export default { ...@@ -184,10 +185,7 @@ export default {
<span class="award-control-icon award-control-icon-super-positive"> <span class="award-control-icon award-control-icon-super-positive">
<gl-icon aria-hidden="true" name="smiley" /> <gl-icon aria-hidden="true" name="smiley" />
</span> </span>
<i <gl-loading-icon size="md" color="dark" class="award-control-icon-loading" />
aria-hidden="true"
class="fa fa-spinner fa-spin award-control-icon award-control-icon-loading"
></i>
</button> </button>
</div> </div>
</div> </div>
......
---
title: Migrate '.fa-spinner' to '.spinner' for 'awards_list.vue'
merge_request: 45393
author:
type: changed
...@@ -228,9 +228,11 @@ exports[`vue_shared/components/awards_list default matches snapshot 1`] = ` ...@@ -228,9 +228,11 @@ exports[`vue_shared/components/awards_list default matches snapshot 1`] = `
/> />
</span> </span>
<i <gl-loading-icon-stub
aria-hidden="true" class="award-control-icon-loading"
class="fa fa-spinner fa-spin award-control-icon award-control-icon-loading" color="dark"
label="Loading"
size="md"
/> />
</button> </button>
</div> </div>
......
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