Commit 082342b9 authored by Olena Horal-Koretska's avatar Olena Horal-Koretska

Merge branch '350370-false-positive-badge-pajamas' into 'master'

Make badge in false-positive-badge Pajamas compliant

See merge request gitlab-org/gitlab!78480
parents 67c9a3be 0f9921ac
<script> <script>
import { GlIcon, GlPopover, GlBadge, GlSprintf, GlLink } from '@gitlab/ui'; import { GlPopover, GlBadge, GlSprintf, GlLink } from '@gitlab/ui';
import { s__ } from '~/locale'; import { s__ } from '~/locale';
export default { export default {
components: { components: {
GlIcon,
GlPopover, GlPopover,
GlBadge, GlBadge,
GlSprintf, GlSprintf,
...@@ -40,9 +39,7 @@ export default { ...@@ -40,9 +39,7 @@ export default {
<template> <template>
<div v-if="canViewFalsePositive" class="gl-display-inline-block"> <div v-if="canViewFalsePositive" class="gl-display-inline-block">
<gl-badge ref="badge" variant="warning"> <gl-badge ref="badge" icon="false-positive" variant="warning" />
<gl-icon name="false-positive" />
</gl-badge>
<gl-popover ref="popover" :target="target" :title="$options.i18n.title" placement="top"> <gl-popover ref="popover" :target="target" :title="$options.i18n.title" placement="top">
<gl-sprintf :message="$options.i18n.message"> <gl-sprintf :message="$options.i18n.message">
<template #link="{ content }"> <template #link="{ content }">
......
...@@ -5,14 +5,10 @@ exports[`False positive badge component should render the alert badge 1`] = ` ...@@ -5,14 +5,10 @@ exports[`False positive badge component should render the alert badge 1`] = `
class="gl-display-inline-block" class="gl-display-inline-block"
> >
<gl-badge-stub <gl-badge-stub
icon="false-positive"
size="md" size="md"
variant="warning" variant="warning"
> />
<gl-icon-stub
name="false-positive"
size="16"
/>
</gl-badge-stub>
<gl-popover-stub <gl-popover-stub
cssclasses="" cssclasses=""
......
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