moparisthebest/mail
1
0
Fork 0
mirror of https://github.com/moparisthebest/mail synced 2024-11-22 08:52:15 -05:00
Code Issues Releases Wiki Activity

Merge pull request #184 from whiteout-io/dev/WO-711

Browse Source 
Dev/wo 711
This commit is contained in:
Tankred Hase 2014-11-12 17:41:04 +01:00
commit 70402d77a8
5 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/js/app.js
View File

@ -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) {

5
src/sass/blocks/basics/_buttons.scss
View File

@ -44,11 +44,6 @@
transform: translateX(2px) translateY(2px);
}
// prevent triggering ngAnimate animations
&.ng-animate {
transition: none;
}
&[disabled],
&[aria-disabled="true"] {
cursor: not-allowed;

4
src/sass/blocks/basics/_mail-addresses.scss
View File

@ -39,10 +39,6 @@
color: $color-blue;
text-decoration: underline;
}
&.ng-animate {
transition: none;
}
}
}

4
src/sass/blocks/basics/_tags-input.scss
View File

@ -49,10 +49,6 @@
}
}
li.ng-animate {
transition: none;
}
.autocomplete {
margin-top: 5px;
position: absolute;

23
src/sass/blocks/layout/_app.scss
View File

@ -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;
}
}
}