diff --git a/ui/app/components/two-step-button.js b/ui/app/components/two-step-button.js index 3cb115d2cec..4bf934eadb4 100644 --- a/ui/app/components/two-step-button.js +++ b/ui/app/components/two-step-button.js @@ -4,11 +4,12 @@ import { next } from '@ember/runloop'; import { equal } from '@ember/object/computed'; import { task, waitForEvent } from 'ember-concurrency'; import RSVP from 'rsvp'; -import { classNames } from '@ember-decorators/component'; +import { classNames, classNameBindings } from '@ember-decorators/component'; import classic from 'ember-classic-decorator'; @classic @classNames('two-step-button') +@classNameBindings('inlineText:has-inline-text') export default class TwoStepButton extends Component { idleText = ''; cancelText = ''; diff --git a/ui/app/styles/components/two-step-button.scss b/ui/app/styles/components/two-step-button.scss index 03ad779b99f..c4dfcbb2665 100644 --- a/ui/app/styles/components/two-step-button.scss +++ b/ui/app/styles/components/two-step-button.scss @@ -5,6 +5,20 @@ font-size: $body-size; line-height: 1; + &.has-inline-text { + display: inline-flex; + align-items: center; + + button { + margin-left: 0.5ch; + } + + .confirmation-text { + position: static; + margin-right: 0.5ch; + } + } + .confirmation-text { position: absolute; left: 0; @@ -20,23 +34,6 @@ right: 0; } - &.has-text-inline { - top: unset; - bottom: 0; - padding-bottom: 6.462px; - - left: 100%; - right: unset; - padding-left: 0.5rem; - - &.is-right-aligned { - padding-left: 0; - padding-right: 0.5rem; - left: unset; - right: 100%; - } - } - &.inherit-color { color: currentColor; } diff --git a/ui/app/templates/components/job-page/parts/latest-deployment.hbs b/ui/app/templates/components/job-page/parts/latest-deployment.hbs index 192646ecc38..f11111a34ee 100644 --- a/ui/app/templates/components/job-page/parts/latest-deployment.hbs +++ b/ui/app/templates/components/job-page/parts/latest-deployment.hbs @@ -26,7 +26,6 @@ @cancelText="Cancel" @confirmText="Yes, Fail" @confirmationMessage="Are you sure?" - @alignRight={{true}} @inlineText={{true}} @awaitingConfirmation={{this.fail.isRunning}} @disabled={{this.fail.isRunning}}