Commit 6112d3b3 authored by Martin Wortschack's avatar Martin Wortschack

Merge branch 'ph/344301/badgeListRowGlBadge' into 'master'

Convert badge_list_row badge to GlBadge

See merge request gitlab-org/gitlab!78914
parents 17bb2f47 8c2439fa
<script> <script>
import { GlLoadingIcon, GlButton, GlModalDirective } from '@gitlab/ui'; import { GlLoadingIcon, GlButton, GlModalDirective, GlBadge } from '@gitlab/ui';
import { mapActions, mapState } from 'vuex'; import { mapActions, mapState } from 'vuex';
import { s__ } from '~/locale'; import { s__ } from '~/locale';
import { PROJECT_BADGE } from '../constants'; import { PROJECT_BADGE } from '../constants';
...@@ -11,6 +11,7 @@ export default { ...@@ -11,6 +11,7 @@ export default {
Badge, Badge,
GlLoadingIcon, GlLoadingIcon,
GlButton, GlButton,
GlBadge,
}, },
directives: { directives: {
GlModal: GlModalDirective, GlModal: GlModalDirective,
...@@ -49,7 +50,7 @@ export default { ...@@ -49,7 +50,7 @@ export default {
/> />
<div class="table-section section-30"> <div class="table-section section-30">
<label class="label-bold str-truncated mb-0">{{ badge.name }}</label> <label class="label-bold str-truncated mb-0">{{ badge.name }}</label>
<span class="badge badge-pill">{{ badgeKindText }}</span> <gl-badge size="sm">{{ badgeKindText }}</gl-badge>
</div> </div>
<span class="table-section section-30 str-truncated">{{ badge.linkUrl }}</span> <span class="table-section section-30 str-truncated">{{ badge.linkUrl }}</span>
<div class="table-section section-10 table-button-footer"> <div class="table-section section-10 table-button-footer">
......
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