From a465074cfc57620866db04d35297a95ee01d6d3b Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Thu, 19 Oct 2017 10:27:15 -0400 Subject: [PATCH] in slide down on lock --- src/popup/app/settings/settingsController.js | 2 +- src/popup/less/animations.less | 27 ++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/src/popup/app/settings/settingsController.js b/src/popup/app/settings/settingsController.js index 23b4dbb881..87fc9ab458 100644 --- a/src/popup/app/settings/settingsController.js +++ b/src/popup/app/settings/settingsController.js @@ -57,7 +57,7 @@ $analytics.eventTrack('Lock Now'); lockService.lock().then(function () { return $state.go('lock', { - animation: 'in-slide-up' + animation: 'in-slide-down' }); }); }; diff --git a/src/popup/less/animations.less b/src/popup/less/animations.less index aaffb9b768..0d7fbca717 100644 --- a/src/popup/less/animations.less +++ b/src/popup/less/animations.less @@ -26,6 +26,33 @@ } } +.in-slide-down { + .main-view.ng-enter, + .main-view.ng-leave { + -webkit-transition: all 0.4s ease; + transition: all 0.4s ease; + } + + .main-view.ng-enter { + bottom: 100%; + z-index: 990; + .box-shadow(0 4px 2px -2px gray); + } + + .main-view.ng-enter.ng-enter-active { + bottom: 0; + } + + .main-view.ng-leave { + top: 0; + z-index: 970; + } + + .main-view.ng-leave.ng-leave-active { + top: 0; + } +} + .out-slide-down { .main-view.ng-enter, .main-view.ng-leave {