diff --git a/app/assets/javascripts/app/lib/bootstrap/modal.js b/app/assets/javascripts/app/lib/bootstrap/modal.js index 5c059a2fe..1a23324c2 100644 --- a/app/assets/javascripts/app/lib/bootstrap/modal.js +++ b/app/assets/javascripts/app/lib/bootstrap/modal.js @@ -9,6 +9,7 @@ /* modified by Felix Jan-2014 - add this.$body = $(options.container || document.body) + - adjustBackdrop: also adopt left, top and width from $body */ @@ -233,6 +234,9 @@ Modal.prototype.adjustBackdrop = function () { this.$backdrop + .css('left', this.$body.offset().left) + .css('top', this.$body.offset().top) + .css('width', this.$body.width()) .css('height', 0) .css('height', this.$element[0].scrollHeight) } @@ -241,6 +245,9 @@ var modalIsOverflowing = this.$element[0].scrollHeight > document.documentElement.clientHeight this.$element.css({ + left: this.$body.offset().left, + top: this.$body.offset().top, + width: this.$body.width(), paddingLeft: !this.bodyIsOverflowing && modalIsOverflowing ? this.scrollbarWidth : '', paddingRight: this.bodyIsOverflowing && !modalIsOverflowing ? this.scrollbarWidth : '' }) diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 3cb2cdf0b..192d43ba1 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -4318,14 +4318,9 @@ footer { .modal.modal--local { display: block; padding-left: 40px; - position: absolute; - bottom: auto; - min-height: 100vh; .modal-backdrop { - position: absolute; background: hsla(210,17%,93%,.55); - height: 100% !important; opacity: 1; }