From fe8c1b927cd1599513cfe7ccfe331f917be77b9e Mon Sep 17 00:00:00 2001 From: Benoit Favreault Date: Tue, 31 Mar 2015 10:50:05 -0400 Subject: [PATCH] Fix mobile transitions (sort of) --- UI/Templates/ContactsUI/UIxContactFoldersView.wox | 5 ++++- UI/WebServerResources/scss/components/card/card.scss | 2 ++ UI/WebServerResources/scss/styles.scss | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox index cace35f2e..714830305 100644 --- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox +++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox @@ -282,7 +282,10 @@ -
+
+ +
+ diff --git a/UI/WebServerResources/scss/components/card/card.scss b/UI/WebServerResources/scss/components/card/card.scss index 7c033e33c..8c5af6b8c 100644 --- a/UI/WebServerResources/scss/components/card/card.scss +++ b/UI/WebServerResources/scss/components/card/card.scss @@ -5,6 +5,7 @@ $card-box-shadow: $whiteframe-shadow-z1 !default; md-card { box-sizing: border-box; + overflow: hidden; display: flex; flex-direction: column; background-color: sg-color($sogoPaper, 50); @@ -18,5 +19,6 @@ md-card { md-card-content { order: 1; + transition: $swift-ease-in-out; } } diff --git a/UI/WebServerResources/scss/styles.scss b/UI/WebServerResources/scss/styles.scss index 9a6ab3c0e..44dd074e0 100755 --- a/UI/WebServerResources/scss/styles.scss +++ b/UI/WebServerResources/scss/styles.scss @@ -13,7 +13,7 @@ @import '_breakpoint.scss', '_sassy-maps.scss'; // This is no longer required because we use grunt-contrib-compass (ruby required) //@import '_compass.scss'; -@import 'SassyJSON'; +//@import 'SassyJSON'; @import 'core/variables'; // Will be replace by a complete 'config file