Commit 5e2ad450 authored by Ezekiel Kigbo's avatar Ezekiel Kigbo

Merge branch 'fix-gl-icon-badge-usage-license-compliance' into 'master'

Migrate legacy icon badge usage

See merge request gitlab-org/gitlab!78308
parents 5807d22a 764721dd
...@@ -3,7 +3,6 @@ import { ...@@ -3,7 +3,6 @@ import {
GlLink, GlLink,
GlDeprecatedSkeletonLoading as GlSkeletonLoading, GlDeprecatedSkeletonLoading as GlSkeletonLoading,
GlBadge, GlBadge,
GlIcon,
GlFriendlyWrap, GlFriendlyWrap,
} from '@gitlab/ui'; } from '@gitlab/ui';
import { LICENSE_APPROVAL_CLASSIFICATION } from 'ee/vue_shared/license_compliance/constants'; import { LICENSE_APPROVAL_CLASSIFICATION } from 'ee/vue_shared/license_compliance/constants';
...@@ -16,7 +15,6 @@ export default { ...@@ -16,7 +15,6 @@ export default {
GlLink, GlLink,
GlSkeletonLoading, GlSkeletonLoading,
GlBadge, GlBadge,
GlIcon,
GlFriendlyWrap, GlFriendlyWrap,
}, },
props: { props: {
...@@ -81,10 +79,8 @@ export default { ...@@ -81,10 +79,8 @@ export default {
<div class="table-mobile-content d-md-flex justify-content-between align-items-center"> <div class="table-mobile-content d-md-flex justify-content-between align-items-center">
<license-component-links :components="license.components" :title="license.name" /> <license-component-links :components="license.components" :title="license.name" />
<div v-if="isDenied" class="d-inline-block"> <div v-if="isDenied" class="d-inline-block">
<!-- This badge usage will be simplified in https://gitlab.com/gitlab-org/gitlab/-/issues/213789 --> <gl-badge variant="warning" icon="warning">
<gl-badge variant="warning"> {{ s__('Licenses|Policy violation: denied') }}
<gl-icon name="warning" class="mr-1" />
<span>{{ s__('Licenses|Policy violation: denied') }}</span>
</gl-badge> </gl-badge>
</div> </div>
</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