diff --git a/app/components/modals/modal-base.js b/app/components/modals/modal-base.js index d4bc44a492c..772f8ba611a 100644 --- a/app/components/modals/modal-base.js +++ b/app/components/modals/modal-base.js @@ -7,12 +7,13 @@ import { isTesting } from 'open-event-frontend/utils/testing'; export default UiModal.extend({ tagName : 'div', + classNames : ['centered-modal'], classNameBindings : ['isFullScreen:fullscreen', 'isSmall:small', 'isLarge:large'], openObserver: observer('isOpen', function() { const $element = $(this.element); if (this.isOpen) { - $element.modal('show'); + $element.modal(this.defaultOptions).modal('show'); } else { $element.modal('hide'); } @@ -46,8 +47,8 @@ export default UiModal.extend({ willInitSemantic(settings) { this._super(...arguments); - const defaultOptions = { - detachable : false, + this.defaultOptions = { + centered : false, duration : isTesting ? 0 : 200, dimmerSettings : { dimmerName : `${this.elementId}-modal-dimmer`, @@ -85,13 +86,13 @@ export default UiModal.extend({ } }; - const options = this.options ? merge(defaultOptions, this.options) : defaultOptions; + const options = this.options ? merge(this.defaultOptions, this.options) : this.defaultOptions; assign(settings, options); }, didInitSemantic() { if (this.isOpen) { - $(this.element).modal('show'); + $(this.element).modal(this.defaultOptions).modal('show'); } } }); diff --git a/app/components/modals/tax-info-modal.js b/app/components/modals/tax-info-modal.js index 7c6069c2ea1..6a585c473a5 100644 --- a/app/components/modals/tax-info-modal.js +++ b/app/components/modals/tax-info-modal.js @@ -7,9 +7,6 @@ import { orderBy } from 'lodash-es'; export default ModalBase.extend(FormMixin, { isSmall : false, - options : { - closable: false - }, autoScrollToErrors : true, isTaxIncludedInPrice : 'include', diff --git a/app/styles/partials/overrides.scss b/app/styles/partials/overrides.scss index 65ef4d81129..8265f10cc56 100644 --- a/app/styles/partials/overrides.scss +++ b/app/styles/partials/overrides.scss @@ -76,3 +76,9 @@ body.dimmable.undetached.dimmed { } } } + +.centered-modal { + margin-left: auto !important; + margin-top: auto !important; + left: auto !important; +} diff --git a/app/templates/components/modals/tax-info-modal.hbs b/app/templates/components/modals/tax-info-modal.hbs index eb3b26cbb7f..ab9770ecbf1 100644 --- a/app/templates/components/modals/tax-info-modal.hbs +++ b/app/templates/components/modals/tax-info-modal.hbs @@ -1,3 +1,4 @@ +
{{t 'Add tax information'}}