Commit db23496b authored by Kev's avatar Kev

Replace v-safe-html with gl-icon in time_ago

parent 480103e8
<script> <script>
import { GlSafeHtmlDirective as SafeHtml } from '@gitlab/ui'; import { GlIcon } from '@gitlab/ui';
import iconTimerSvg from 'icons/_icon_timer.svg'; import iconTimerSvg from 'icons/_icon_timer.svg';
import '~/lib/utils/datetime_utility'; import '~/lib/utils/datetime_utility';
import tooltip from '~/vue_shared/directives/tooltip'; import tooltip from '~/vue_shared/directives/tooltip';
...@@ -8,8 +8,8 @@ import timeagoMixin from '~/vue_shared/mixins/timeago'; ...@@ -8,8 +8,8 @@ import timeagoMixin from '~/vue_shared/mixins/timeago';
export default { export default {
directives: { directives: {
tooltip, tooltip,
SafeHtml,
}, },
components: { GlIcon },
mixins: [timeagoMixin], mixins: [timeagoMixin],
props: { props: {
finishedTime: { finishedTime: {
...@@ -61,11 +61,12 @@ export default { ...@@ -61,11 +61,12 @@ export default {
<div class="table-mobile-header" role="rowheader">{{ s__('Pipeline|Duration') }}</div> <div class="table-mobile-header" role="rowheader">{{ s__('Pipeline|Duration') }}</div>
<div class="table-mobile-content"> <div class="table-mobile-content">
<p v-if="hasDuration" class="duration"> <p v-if="hasDuration" class="duration">
<span v-safe-html="iconTimerSvg"> </span> {{ durationFormatted }} <gl-icon name="timer" class="gl-vertical-align-baseline!" aria-hidden="true" />
{{ durationFormatted }}
</p> </p>
<p v-if="hasFinishedTime" class="finished-at d-none d-sm-none d-md-block"> <p v-if="hasFinishedTime" class="finished-at d-none d-sm-none d-md-block">
<i class="fa fa-calendar" aria-hidden="true"> </i> <gl-icon name="calendar" class="gl-vertical-align-baseline!" aria-hidden="true" />
<time <time
v-tooltip v-tooltip
......
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