diff options
| author | Phil Hughes <me@iamphill.com> | 2019-02-22 08:48:40 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-02-22 08:48:40 +0000 |
| commit | 21924bc770e78175118619a4bd326382cb3882cc (patch) | |
| tree | a25e467fe42f9a3354162662cee98a137051d325 | |
| parent | 07363237d7449a0c6638b2cb61cdcbaf1315b339 (diff) | |
| parent | 4321f32d19f7b2b4419edb8b361aa08ba6207079 (diff) | |
| download | gitlab-ce-21924bc770e78175118619a4bd326382cb3882cc.tar.gz | |
Merge branch '52198-timer-is-vertically-misaligned-for-delayed-jobs-in-pipeline-actions' into 'master'
fix-52198-timer-is-vertically-misaligned-for-delayed-jobs-in-pipelactions
Closes #52198
See merge request gitlab-org/gitlab-ce!25117
| -rw-r--r-- | app/assets/javascripts/pipelines/components/pipelines_actions.vue | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/52198-timer-is-vertically-misaligned-for-delayed-jobs-in-pipeline-actions.yml | 5 |
2 files changed, 7 insertions, 2 deletions
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 |