From 4321f32d19f7b2b4419edb8b361aa08ba6207079 Mon Sep 17 00:00:00 2001
From: Gokhan Apaydin <gapay84@gmail.com>
Date: Fri, 22 Feb 2019 08:48:40 +0000
Subject: [PATCH] 
 fix-52198-timer-is-vertically-misaligned-for-delayed-jobs-in-pipelactions

---
 .../javascripts/pipelines/components/pipelines_actions.vue   | 4 ++--
 ...cally-misaligned-for-delayed-jobs-in-pipeline-actions.yml | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 changelogs/unreleased/52198-timer-is-vertically-misaligned-for-delayed-jobs-in-pipeline-actions.yml

diff --git a/app/assets/javascripts/pipelines/components/pipelines_actions.vue b/app/assets/javascripts/pipelines/components/pipelines_actions.vue
index a250e3236f5..244d332f38f 100644
--- a/app/assets/javascripts/pipelines/components/pipelines_actions.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines_actions.vue
@@ -78,11 +78,11 @@ export default {
         <gl-button
           :class="{ 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)"
         >
           {{ action.name }}
-          <span v-if="action.scheduled_at" class="pull-right">
+          <span v-if="action.scheduled_at">
             <icon name="clock" />
             <gl-countdown :end-date-string="action.scheduled_at" />
           </span>
diff --git a/changelogs/unreleased/52198-timer-is-vertically-misaligned-for-delayed-jobs-in-pipeline-actions.yml b/changelogs/unreleased/52198-timer-is-vertically-misaligned-for-delayed-jobs-in-pipeline-actions.yml
new file mode 100644
index 00000000000..84062c6db91
--- /dev/null
+++ b/changelogs/unreleased/52198-timer-is-vertically-misaligned-for-delayed-jobs-in-pipeline-actions.yml
@@ -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