Commit 55084497 authored by Ezekiel Kigbo's avatar Ezekiel Kigbo

Merge branch 'mw-replace-fa-warning-in-limit-warning-component' into 'master'

Replace fa-warning with GitLab SVG icon in VSA limit warning

See merge request gitlab-org/gitlab!43994
parents 9c885651 2ae52e2b
<script> <script>
import { GlTooltipDirective } from '@gitlab/ui'; import { GlIcon, GlTooltipDirective } from '@gitlab/ui';
export default { export default {
components: {
GlIcon,
},
directives: { directives: {
GlTooltip: GlTooltipDirective, GlTooltip: GlTooltipDirective,
}, },
...@@ -15,15 +18,17 @@ export default { ...@@ -15,15 +18,17 @@ export default {
</script> </script>
<template> <template>
<span v-if="count === 50" class="events-info float-right"> <span v-if="count === 50" class="events-info float-right">
<i <gl-icon
v-gl-tooltip v-gl-tooltip="{
:title=" title: n__(
n__('Limited to showing %d event at most', 'Limited to showing %d events at most', 50) 'Limited to showing %d event at most',
" 'Limited to showing %d events at most',
class="fa fa-warning" 50,
),
}"
name="warning"
aria-hidden="true" aria-hidden="true"
> />
</i>
{{ n__('Showing %d event', 'Showing %d events', 50) }} {{ n__('Showing %d event', 'Showing %d events', 50) }}
</span> </span>
</template> </template>
---
title: 'VSA: Replace fa-warning with GitLab SVG icon'
merge_request: 43994
author:
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