diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-22 18:09:56 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-22 18:09:56 +0300 |
| commit | 5f5f492fe278f3322e9533b617522321e2ccafcc (patch) | |
| tree | 2f9f65c206d555d44034d386f4a03e0835059b04 /app/assets/javascripts/badges | |
| parent | 4b074c5f634f8e1e550107f9e8237f07878ca0e8 (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_list.vue | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/badges/components/badge_list.vue b/app/assets/javascripts/badges/components/badge_list.vue index f16a547e441..86c7b4c7a6e 100644 --- a/app/assets/javascripts/badges/components/badge_list.vue +++ b/app/assets/javascripts/badges/components/badge_list.vue @@ -1,5 +1,5 @@ <script> -import { GlLoadingIcon } from '@gitlab/ui'; +import { GlLoadingIcon, GlBadge } from '@gitlab/ui'; import { mapState } from 'vuex'; import { GROUP_BADGE } from '../constants'; import BadgeListRow from './badge_list_row.vue'; @@ -9,6 +9,7 @@ export default { components: { BadgeListRow, GlLoadingIcon, + GlBadge, }, computed: { ...mapState(['badges', 'isLoading', 'kind']), @@ -26,7 +27,7 @@ export default { <div class="card"> <div class="card-header"> {{ s__('Badges|Your badges') }} - <span v-show="!isLoading" class="badge badge-pill">{{ badges.length }}</span> + <gl-badge v-show="!isLoading" size="sm">{{ badges.length }}</gl-badge> </div> <gl-loading-icon v-show="isLoading" size="lg" class="card-body" /> <div v-if="hasNoBadges" class="card-body"> |