From 82c8d26264eae8b1bae5ae239c0d8a8a9ac7da47 Mon Sep 17 00:00:00 2001 From: Dave Date: Thu, 9 Jul 2015 11:16:41 -0700 Subject: [PATCH] [Mobile] Now does not display the icon for the slide menu on desktops. --- .../commonUI/browse/res/templates/browse.html | 2 +- .../general/res/css/theme-espresso.css | 44 ++++++++++--------- .../general/res/sass/mobile/_layout.scss | 15 ++++--- 3 files changed, 34 insertions(+), 27 deletions(-) diff --git a/platform/commonUI/browse/res/templates/browse.html b/platform/commonUI/browse/res/templates/browse.html index 37d5bf9ddb..9e47cc58f8 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 24bc9d9ad2..4844397666 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -748,15 +748,7 @@ mct-container { transition-duration: 0.2s; left: -150px; } } -@media screen and (max-width: 514px) { - /* line 37, ../sass/mobile/_layout.scss */ - .holder-show { - -moz-transition-duration: 0.2s; - -o-transition-duration: 0.2s; - -webkit-transition-duration: 0.2s; - transition-duration: 0.2s; - left: 0px; } } -@media screen and (min-width: 515px) and (max-width: 800px) { +@media screen and (max-width: 800px) { /* line 37, ../sass/mobile/_layout.scss */ .holder-show { -moz-transition-duration: 0.2s; @@ -765,40 +757,52 @@ mct-container { transition-duration: 0.2s; left: 0px; } } -/* line 48, ../sass/mobile/_layout.scss */ +/* line 44, ../sass/mobile/_layout.scss */ .button-hide { - position: absolute; } + position: absolute; + -moz-transition-duration: 0.2s; + -o-transition-duration: 0.2s; + -webkit-transition-duration: 0.2s; + transition-duration: 0.2s; } @media screen and (max-width: 514px) { - /* line 48, ../sass/mobile/_layout.scss */ + /* line 44, ../sass/mobile/_layout.scss */ .button-hide { left: 108px; } } @media screen and (min-width: 515px) and (max-width: 800px) { - /* line 48, ../sass/mobile/_layout.scss */ + /* line 44, ../sass/mobile/_layout.scss */ .button-hide { left: 150px; } } -/* line 59, ../sass/mobile/_layout.scss */ +/* line 55, ../sass/mobile/_layout.scss */ .object-header-mobile { position: relative; } @media screen and (max-width: 514px) { - /* line 59, ../sass/mobile/_layout.scss */ + /* line 55, ../sass/mobile/_layout.scss */ .object-header-mobile { - left: 17px; } } + left: 23px; } } @media screen and (min-width: 515px) and (max-width: 800px) { - /* line 59, ../sass/mobile/_layout.scss */ + /* line 55, ../sass/mobile/_layout.scss */ .object-header-mobile { left: 15px; } } +/* line 65, ../sass/mobile/_layout.scss */ +.mobile-menu-icon { + top: 5px; } + @media screen and (min-width: 801px) { + /* line 65, ../sass/mobile/_layout.scss */ + .mobile-menu-icon { + display: none; } } + @media screen and (max-width: 514px) { - /* line 69, ../sass/mobile/_layout.scss */ + /* line 72, ../sass/mobile/_layout.scss */ .browse-manage { width: 100px; } } @media screen and (min-width: 515px) and (max-width: 800px) { - /* line 69, ../sass/mobile/_layout.scss */ + /* line 72, ../sass/mobile/_layout.scss */ .browse-manage { width: 150px; } } @media screen and (min-width: 801px) { - /* line 69, ../sass/mobile/_layout.scss */ + /* line 72, ../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 80c2807772..9e5f51a21a 100644 --- a/platform/commonUI/general/res/sass/mobile/_layout.scss +++ b/platform/commonUI/general/res/sass/mobile/_layout.scss @@ -35,11 +35,7 @@ } .holder-show { - @include phone { - @include transition-duration(.2s); - left: 0px; - } - @include tablet { + @include phoneandtablet { @include transition-duration(.2s); left: 0px; } @@ -47,7 +43,7 @@ .button-hide { position: absolute; -// @include transition-duration(.2s); + @include transition-duration(.2s); @include phone { left: 108px; } @@ -66,6 +62,13 @@ } } +.mobile-menu-icon { + top: $interiorMargin; + @include desktop { + display: none; + } +} + .browse-manage { @include phone { width: 100px;