Commit 280776b4 authored by Olena Horal-Koretska's avatar Olena Horal-Koretska

Merge branch 'gl-badge-badges' into 'master'

Move badge to vue component in project badges

See merge request gitlab-org/gitlab!58045
parents a0fdf1ba 869b425b
<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">
......
---
title: Move badge to vue component in project badges
merge_request: 58045
author: Yogi (@yo)
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