diff --git a/dev/Common/Knockout.js b/dev/Common/Knockout.js index b6c65fcd8..8d8a79bb8 100644 --- a/dev/Common/Knockout.js +++ b/dev/Common/Knockout.js @@ -110,15 +110,12 @@ ko.bindingHandlers.modal = { 'show': ko.utils.unwrapObservable(fValueAccessor()) }).on('hidden', function () { fValueAccessor()(false); + }).on('shown', function () { + Utils.windowResize(); }); }, 'update': function (oElement, fValueAccessor) { - var bValue = ko.utils.unwrapObservable(fValueAccessor()); - $(oElement).modal(bValue ? 'show' : 'hide'); - - _.delay(function () { - $(oElement).toggleClass('popup-active', bValue); - }, 1); + $(oElement).modal(ko.utils.unwrapObservable(fValueAccessor()) ? 'show' : 'hide'); } }; diff --git a/dev/Knoin/Knoin.js b/dev/Knoin/Knoin.js index f52203a35..068c9b06b 100644 --- a/dev/Knoin/Knoin.js +++ b/dev/Knoin/Knoin.js @@ -159,10 +159,15 @@ Knoin.prototype.hideScreenPopup = function (ViewModelClassToHide) { if (ViewModelClassToHide && ViewModelClassToHide.__vm && ViewModelClassToHide.__dom) { - ViewModelClassToHide.__dom.hide(); ViewModelClassToHide.__vm.modalVisibility(false); this.delegateRun(ViewModelClassToHide.__vm, 'onHide'); this.popupVisibility(false); + + Plugins.runHook('view-model-on-hide', [ViewModelClassToHide.__name, ViewModelClassToHide.__vm]); + + _.delay(function () { + ViewModelClassToHide.__dom.hide(); + }, 300); } }; diff --git a/dev/Styles/Animations.less b/dev/Styles/Animations.less index 912ea0fd8..e68355565 100644 --- a/dev/Styles/Animations.less +++ b/dev/Styles/Animations.less @@ -64,11 +64,13 @@ html.rl-started-trigger.no-mobile #rl-content { .rl-anim { &.csstransitions.no-mobile #rl-content { - .transition(~"0.4s opacity cubic-bezier(0.250, 0.460, 0.450, 0.940)"); + /*.transition(~"0.4s opacity cubic-bezier(0.250, 0.460, 0.450, 0.940)");*/ + .transition(opacity 0.3s ease-out); } &.csstransitions.no-mobile .b-login-content .loginFormWrapper { - .transition(~"0.4s all cubic-bezier(0.250, 0.460, 0.450, 0.940)"); + /*.transition(~"0.4s all cubic-bezier(0.250, 0.460, 0.450, 0.940)");*/ + .transition(all 0.3s ease-out); } &.rgba.cssanimations.backgroundsize .e-strip-animation { @@ -148,22 +150,18 @@ html.rl-started-trigger.no-mobile #rl-content { } } - &.csstransitions .modal-open .popups .modal { - -webkit-transform-origin: 50% 50%; - -moz-transform-origin: 50% 50%; - -o-transform-origin: 50% 50%; - transform-origin: 50% 50%; + &.csstransitions .modal.fade { + .transition(all 0.2s ease-out); + + -webkit-transform: translateY(-20px); + -moz-transform: translateY(-20px); + transform: translateY(-20px); - /*.transition(~"0.3s all cubic-bezier(0.250, 0.460, 0.450, 0.940)");*/ - .transition(0.1s all linear); - .scale(0.95); - } - - .modal-open .popups .popup-active.modal { - -webkit-transform: none; - -moz-transform: none; - -o-transform: none; - transform: none; + &.in { + -webkit-transform: none; + -moz-transform: none; + transform: none; + } } &.cssanimations .b-compose.loading .b-header-toolbar { diff --git a/dev/Styles/_BootstrapFix.less b/dev/Styles/_BootstrapFix.less index 868cbbb9d..84b8aa109 100644 --- a/dev/Styles/_BootstrapFix.less +++ b/dev/Styles/_BootstrapFix.less @@ -221,6 +221,15 @@ html.no-rgba .modal { } } +.modal.fade { + .transition(none); + top: 0; +} + +.modal.fade.in { + top: 0; +} + .modal.loginContent .modal-body, .modal.loginAdminContent .modal-body { background-color: transparent !important; } diff --git a/rainloop/v/0.0.0/app/templates/Views/PopupsActivate.html b/rainloop/v/0.0.0/app/templates/Views/PopupsActivate.html index 1ed8b1b93..91ef10ea2 100644 --- a/rainloop/v/0.0.0/app/templates/Views/PopupsActivate.html +++ b/rainloop/v/0.0.0/app/templates/Views/PopupsActivate.html @@ -1,5 +1,5 @@
-
+
diff --git a/rainloop/v/0.0.0/app/templates/Views/PopupsAddAccount.html b/rainloop/v/0.0.0/app/templates/Views/PopupsAddAccount.html index ed4461d1e..31a8e5f98 100644 --- a/rainloop/v/0.0.0/app/templates/Views/PopupsAddAccount.html +++ b/rainloop/v/0.0.0/app/templates/Views/PopupsAddAccount.html @@ -1,5 +1,5 @@
-