From 7974f33781c166a1b14a91b9581b55685c8545e2 Mon Sep 17 00:00:00 2001 From: Dave Date: Wed, 8 Jul 2015 16:28:40 -0700 Subject: [PATCH] [Mobile] Phone Adjusted to differentiate phones and tablets. --- .../general/res/css/theme-espresso.css | 18 +++++++++++++----- .../general/res/sass/mobile/_layout.scss | 8 ++++++-- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index a2258128ca..a8942f1d28 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -731,7 +731,15 @@ mct-container { * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -@media screen and (max-width: 800px) { +@media screen and (max-width: 514px) { + /* line 26, ../sass/mobile/_layout.scss */ + .holder-hide { + -moz-transition-duration: 0.2s; + -o-transition-duration: 0.2s; + -webkit-transition-duration: 0.2s; + transition-duration: 0.2s; + left: -108px; } } +@media screen and (min-width: 515px) and (max-width: 800px) { /* line 26, ../sass/mobile/_layout.scss */ .holder-hide { -moz-transition-duration: 0.2s; @@ -741,7 +749,7 @@ mct-container { left: -150px; } } @media screen and (max-width: 800px) { - /* line 33, ../sass/mobile/_layout.scss */ + /* line 37, ../sass/mobile/_layout.scss */ .holder-show { -moz-transition-duration: 0.2s; -o-transition-duration: 0.2s; @@ -750,15 +758,15 @@ mct-container { left: 0px; } } @media screen and (max-width: 514px) { - /* line 40, ../sass/mobile/_layout.scss */ + /* line 44, ../sass/mobile/_layout.scss */ .browse-manage { width: 100px; } } @media screen and (min-width: 515px) and (max-width: 800px) { - /* line 40, ../sass/mobile/_layout.scss */ + /* line 44, ../sass/mobile/_layout.scss */ .browse-manage { width: 150px; } } @media screen and (min-width: 801px) { - /* line 40, ../sass/mobile/_layout.scss */ + /* line 44, ../sass/mobile/_layout.scss */ .browse-manage { min-width: 150px; max-width: 800px; diff --git a/platform/commonUI/general/res/sass/mobile/_layout.scss b/platform/commonUI/general/res/sass/mobile/_layout.scss index 797018c7e0..b7bb8e8297 100644 --- a/platform/commonUI/general/res/sass/mobile/_layout.scss +++ b/platform/commonUI/general/res/sass/mobile/_layout.scss @@ -24,10 +24,14 @@ // NOTE: Added to adjust the browse folder tree list view .holder-hide { - @include phoneandtablet { + @include phone { + @include transition-duration(.2s); + left: -108px; + } + @include tablet { @include transition-duration(.2s); left: -150px; - } + } } .holder-show {