From 6f07a21bb8c5768f9bf0dfb2a39b51f84ce013fc Mon Sep 17 00:00:00 2001 From: Shivam Dave Date: Tue, 14 Jul 2015 13:10:28 -0700 Subject: [PATCH] [Mobile] Clean-up Cleaned up scss and also, the edit/new tab/full screen buttons are hidden in mobile, temporarily. --- .../browse/res/templates/browse-object.html | 4 +- .../commonUI/browse/res/templates/browse.html | 2 +- .../general/res/css/theme-espresso.css | 44 ++++++------------- .../general/res/sass/mobile/_layout.scss | 13 +----- 4 files changed, 18 insertions(+), 45 deletions(-) diff --git a/platform/commonUI/browse/res/templates/browse-object.html b/platform/commonUI/browse/res/templates/browse-object.html index 6730d5a186..7a5bd09470 100644 --- a/platform/commonUI/browse/res/templates/browse-object.html +++ b/platform/commonUI/browse/res/templates/browse-object.html @@ -25,8 +25,8 @@ - -
+ +
diff --git a/platform/commonUI/browse/res/templates/browse.html b/platform/commonUI/browse/res/templates/browse.html index 4ea43b7b06..730cffbeef 100644 --- a/platform/commonUI/browse/res/templates/browse.html +++ b/platform/commonUI/browse/res/templates/browse.html @@ -42,7 +42,7 @@
-
m
diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index b9422ddc62..1eea14670f 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -767,7 +767,7 @@ mct-container { left: 0px; } } /* line 47, ../sass/mobile/_layout.scss */ -.button-show { +.button-pos { position: absolute; -moz-transition-duration: 0.2s; -o-transition-duration: 0.2s; @@ -775,76 +775,60 @@ mct-container { transition-duration: 0.2s; } @media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 1024px) and (max-device-height: 799px) { /* line 47, ../sass/mobile/_layout.scss */ - .button-show { + .button-pos { left: 257px; } } @media screen and (orientation: portrait) and (min-width: 515px) and (max-width: 799px) and (min-height: 741px) and (max-height: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 1024px) and (max-device-height: 799px) { /* line 47, ../sass/mobile/_layout.scss */ - .button-show { + .button-pos { left: 399.5px; } } /* line 58, ../sass/mobile/_layout.scss */ -.button-hide { - position: absolute; - -moz-transition-duration: 0.2s; - -o-transition-duration: 0.2s; - -webkit-transition-duration: 0.2s; - transition-duration: 0.2s; } - @media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 1024px) and (max-device-height: 799px) { - /* line 58, ../sass/mobile/_layout.scss */ - .button-hide { - left: 257px; } } - @media screen and (orientation: portrait) and (min-width: 515px) and (max-width: 799px) and (min-height: 741px) and (max-height: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 1024px) and (max-device-height: 799px) { - /* line 58, ../sass/mobile/_layout.scss */ - .button-hide { - left: 399.5px; } } - -/* line 69, ../sass/mobile/_layout.scss */ .object-header-mobile { position: relative; } @media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 1024px) and (max-device-height: 799px) { - /* line 69, ../sass/mobile/_layout.scss */ + /* line 58, ../sass/mobile/_layout.scss */ .object-header-mobile { left: 25.7px; } } @media screen and (orientation: portrait) and (min-width: 515px) and (max-width: 799px) and (min-height: 741px) and (max-height: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 1024px) and (max-device-height: 799px) { - /* line 69, ../sass/mobile/_layout.scss */ + /* line 58, ../sass/mobile/_layout.scss */ .object-header-mobile { left: 39.95px; } } -/* line 79, ../sass/mobile/_layout.scss */ +/* line 68, ../sass/mobile/_layout.scss */ .mobile-menu-icon { top: 5px; } @media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 1024px) and (max-device-height: 799px) { - /* line 79, ../sass/mobile/_layout.scss */ + /* line 68, ../sass/mobile/_layout.scss */ .mobile-menu-icon { font-size: 125%; } } @media screen and (orientation: portrait) and (min-width: 515px) and (max-width: 799px) and (min-height: 741px) and (max-height: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 1024px) and (max-device-height: 799px) { - /* line 79, ../sass/mobile/_layout.scss */ + /* line 68, ../sass/mobile/_layout.scss */ .mobile-menu-icon { font-size: 175%; } } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 79, ../sass/mobile/_layout.scss */ + /* line 68, ../sass/mobile/_layout.scss */ .mobile-menu-icon { display: none; } } @media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 1024px) and (max-device-height: 799px) { - /* line 92, ../sass/mobile/_layout.scss */ + /* line 81, ../sass/mobile/_layout.scss */ .mobile-hide { display: none; } } @media screen and (orientation: portrait) and (min-width: 515px) and (max-width: 799px) and (min-height: 741px) and (max-height: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 1024px) and (max-device-height: 799px) { - /* line 92, ../sass/mobile/_layout.scss */ + /* line 81, ../sass/mobile/_layout.scss */ .mobile-hide { display: none; } } @media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 1024px) and (max-device-height: 799px) { - /* line 101, ../sass/mobile/_layout.scss */ + /* line 90, ../sass/mobile/_layout.scss */ .browse-manage { width: 257px; } } @media screen and (orientation: portrait) and (min-width: 515px) and (max-width: 799px) and (min-height: 741px) and (max-height: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 1024px) and (max-device-height: 799px) { - /* line 101, ../sass/mobile/_layout.scss */ + /* line 90, ../sass/mobile/_layout.scss */ .browse-manage { width: 399.5px; } } @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) { - /* line 101, ../sass/mobile/_layout.scss */ + /* line 90, ../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 04f8898a72..26b677688d 100644 --- a/platform/commonUI/general/res/sass/mobile/_layout.scss +++ b/platform/commonUI/general/res/sass/mobile/_layout.scss @@ -44,7 +44,7 @@ } } -.button-show { +.button-pos { position: absolute; @include transition-duration(.2s); @include phone { @@ -55,17 +55,6 @@ } } -.button-hide { - position: absolute; - @include transition-duration(.2s); - @include phone { - left: $phoneSlideMenuWidth; - } - @include tablet { - left: $tabletSlideMenuWidth; - } -} - .object-header-mobile { position: relative; @include phone {