fix-52198-timer-is-vertically-misaligned-for-delayed-jobs-in-pipelactions

This commit is contained in:
Gokhan Apaydin 2019-02-22 08:48:40 +00:00 committed by Phil Hughes
parent 07363237d7
commit 4321f32d19
2 changed files with 7 additions and 2 deletions

View file

@ -78,11 +78,11 @@ export default {
<gl-button <gl-button
:class="{ disabled: isActionDisabled(action) }" :class="{ disabled: isActionDisabled(action) }"
:disabled="isActionDisabled(action)" :disabled="isActionDisabled(action)"
class="js-pipeline-action-link no-btn btn" class="js-pipeline-action-link no-btn btn d-flex align-items-center justify-content-between flex-wrap"
@click="onClickAction(action)" @click="onClickAction(action)"
> >
{{ action.name }} {{ action.name }}
<span v-if="action.scheduled_at" class="pull-right"> <span v-if="action.scheduled_at">
<icon name="clock" /> <icon name="clock" />
<gl-countdown :end-date-string="action.scheduled_at" /> <gl-countdown :end-date-string="action.scheduled_at" />
</span> </span>

View file

@ -0,0 +1,5 @@
---
title: 'Timer and action name aligned vertically for delayed jobs in pipeline actions'
merge_request: 25117
author: Gokhan Apaydin
type: fixed