diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-24 18:10:11 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-24 18:10:11 +0300 |
commit | 27622f7417713cbd2057a7f642e9ce128d9fc169 (patch) | |
tree | a3d4f20076d48d61c5bbd92e2ae895bb069fe92a /app/assets/javascripts/badges | |
parent | 4b9bde7848d9538c1635ffe7a5385ba013487b4a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/badges')
-rw-r--r-- | app/assets/javascripts/badges/components/badge.vue | 9 | ||||
-rw-r--r-- | app/assets/javascripts/badges/components/badge_list_row.vue | 9 |
2 files changed, 8 insertions, 10 deletions
diff --git a/app/assets/javascripts/badges/components/badge.vue b/app/assets/javascripts/badges/components/badge.vue index 3242993b06a..3dd05f73841 100644 --- a/app/assets/javascripts/badges/components/badge.vue +++ b/app/assets/javascripts/badges/components/badge.vue @@ -1,13 +1,12 @@ <script> -import { GlLoadingIcon, GlTooltipDirective } from '@gitlab/ui'; -import Icon from '~/vue_shared/components/icon.vue'; +import { GlLoadingIcon, GlTooltipDirective, GlIcon } from '@gitlab/ui'; export default { // name: 'Badge' is a false positive: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/25 // eslint-disable-next-line @gitlab/require-i18n-strings name: 'Badge', components: { - Icon, + GlIcon, GlLoadingIcon, }, directives: { @@ -84,7 +83,7 @@ export default { <div v-show="hasError" class="btn-group"> <div class="btn btn-default btn-sm disabled"> - <icon :size="16" class="gl-ml-3 gl-mr-3" name="doc-image" aria-hidden="true" /> + <gl-icon :size="16" class="gl-ml-3 gl-mr-3" name="doc-image" aria-hidden="true" /> </div> <div class="btn btn-default btn-sm disabled"> <span class="gl-ml-3 gl-mr-3">{{ s__('Badges|No badge image') }}</span> @@ -99,7 +98,7 @@ export default { type="button" @click="reloadImage" > - <icon :size="16" name="retry" /> + <gl-icon :size="16" name="retry" /> </button> </div> </template> diff --git a/app/assets/javascripts/badges/components/badge_list_row.vue b/app/assets/javascripts/badges/components/badge_list_row.vue index bad14666bb2..3343634ecad 100644 --- a/app/assets/javascripts/badges/components/badge_list_row.vue +++ b/app/assets/javascripts/badges/components/badge_list_row.vue @@ -1,8 +1,7 @@ <script> import { mapActions, mapState } from 'vuex'; -import { GlLoadingIcon } from '@gitlab/ui'; +import { GlLoadingIcon, GlIcon } from '@gitlab/ui'; import { s__ } from '~/locale'; -import Icon from '~/vue_shared/components/icon.vue'; import { PROJECT_BADGE } from '../constants'; import Badge from './badge.vue'; @@ -10,7 +9,7 @@ export default { name: 'BadgeListRow', components: { Badge, - Icon, + GlIcon, GlLoadingIcon, }, props: { @@ -58,7 +57,7 @@ export default { type="button" @click="editBadge(badge)" > - <icon :size="16" :aria-label="__('Edit')" name="pencil" /> + <gl-icon :size="16" :aria-label="__('Edit')" name="pencil" /> </button> <button :disabled="badge.isDeleting" @@ -68,7 +67,7 @@ export default { data-target="#delete-badge-modal" @click="updateBadgeInModal(badge)" > - <icon :size="16" :aria-label="__('Delete')" name="remove" /> + <gl-icon :size="16" :aria-label="__('Delete')" name="remove" /> </button> <gl-loading-icon v-show="badge.isDeleting" :inline="true" /> </div> |