From aff3854cb98343396721597c3667fbd7f1254c85 Mon Sep 17 00:00:00 2001 From: Mario Volke Date: Mon, 10 Nov 2014 13:03:32 +0100 Subject: [PATCH 1/3] activate ngAnimate for whitelisted classes only --- src/js/app.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/js/app.js b/src/js/app.js index d276e41..7480f02 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -58,7 +58,7 @@ var app = angular.module('mail', [ ]); // set router paths -app.config(function($routeProvider) { +app.config(function($routeProvider, $animateProvider) { $routeProvider.when('/login', { templateUrl: 'tpl/login.html', controller: LoginCtrl @@ -102,6 +102,9 @@ app.config(function($routeProvider) { $routeProvider.otherwise({ redirectTo: '/login' }); + + // activate ngAnimate for whitelisted classes only + $animateProvider.classNameFilter(/^lightbox$/); }); app.run(function($rootScope) { From f0b1d7934dc4e006b1b5f03f5c66fb2af74325da Mon Sep 17 00:00:00 2001 From: Mario Volke Date: Mon, 10 Nov 2014 13:04:14 +0100 Subject: [PATCH 2/3] make nav css transition more stable on iOS --- src/sass/blocks/layout/_app.scss | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/sass/blocks/layout/_app.scss b/src/sass/blocks/layout/_app.scss index b443f72..7fe3c3e 100644 --- a/src/sass/blocks/layout/_app.scss +++ b/src/sass/blocks/layout/_app.scss @@ -73,6 +73,7 @@ } &__main { height: 100%; + transform: translateZ(0); @include respond-to(lg) { position: absolute; @@ -85,6 +86,17 @@ } } + // Animation + @include respond-to(not-lg) { + will-change: transform; + transform-style: preserve-3d; + transition: transform 0.15s ease-out; + .app__container:after { + will-change: transform; + transform-style: preserve-3d; + } + } + // Modifier to open sidebar &--show-aside { @include respond-to(not-lg) { @@ -94,15 +106,4 @@ } } } - - // Animation - @include respond-to(not-lg) { - will-change: transform; - transform-style: preserve3d; - transition: transform 0.15s ease-out; - .app__container:after { - will-change: transform; - transform-style: preserve3d; - } - } } \ No newline at end of file From 38fce60e6c245b6df01e55ab834e772297813d97 Mon Sep 17 00:00:00 2001 From: Mario Volke Date: Mon, 10 Nov 2014 13:15:49 +0100 Subject: [PATCH 3/3] remove obsolete ng-animate css rules --- src/sass/blocks/basics/_buttons.scss | 5 ----- src/sass/blocks/basics/_mail-addresses.scss | 4 ---- src/sass/blocks/basics/_tags-input.scss | 4 ---- 3 files changed, 13 deletions(-) diff --git a/src/sass/blocks/basics/_buttons.scss b/src/sass/blocks/basics/_buttons.scss index 05d2811..6b430a7 100755 --- a/src/sass/blocks/basics/_buttons.scss +++ b/src/sass/blocks/basics/_buttons.scss @@ -44,11 +44,6 @@ transform: translateX(2px) translateY(2px); } - // prevent triggering ngAnimate animations - &.ng-animate { - transition: none; - } - &[disabled], &[aria-disabled="true"] { cursor: not-allowed; diff --git a/src/sass/blocks/basics/_mail-addresses.scss b/src/sass/blocks/basics/_mail-addresses.scss index 6f5ec05..af8631f 100644 --- a/src/sass/blocks/basics/_mail-addresses.scss +++ b/src/sass/blocks/basics/_mail-addresses.scss @@ -39,10 +39,6 @@ color: $color-blue; text-decoration: underline; } - - &.ng-animate { - transition: none; - } } } diff --git a/src/sass/blocks/basics/_tags-input.scss b/src/sass/blocks/basics/_tags-input.scss index 0fc15c6..07ac66a 100644 --- a/src/sass/blocks/basics/_tags-input.scss +++ b/src/sass/blocks/basics/_tags-input.scss @@ -49,10 +49,6 @@ } } - li.ng-animate { - transition: none; - } - .autocomplete { margin-top: 5px; position: absolute;