From dd457f26c6b20577bf7174e6f63c7e54d699e371 Mon Sep 17 00:00:00 2001 From: Dave Date: Fri, 10 Jul 2015 12:32:34 -0700 Subject: [PATCH] [Mobile] Device Added max width to tablet check. --- platform/commonUI/general/res/css/items.css | 4 ++-- platform/commonUI/general/res/css/theme-espresso.css | 12 ++++++------ .../commonUI/general/res/sass/mobile/_constants.scss | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/platform/commonUI/general/res/css/items.css b/platform/commonUI/general/res/css/items.css index 0951ef0d3c..8ca1234189 100644 --- a/platform/commonUI/general/res/css/items.css +++ b/platform/commonUI/general/res/css/items.css @@ -352,7 +352,7 @@ .items-holder .item.grid-item { width: 100%; height: 50px; } } -@media screen and (min-device-width: 515px) and (max-device-width: 799px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (orientation: landscape) { +@media screen and (min-device-width: 515px) and (max-device-width: 799px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (max-width: 1024px) and (orientation: landscape) { /* line 24, ../sass/mobile/_item.scss */ .items-holder .item.grid-item { width: 100%; @@ -366,7 +366,7 @@ /* line 49, ../sass/mobile/_item.scss */ .items-holder .item.grid-item .icon { display: none; } } -@media screen and (min-device-width: 515px) and (max-device-width: 799px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (orientation: landscape) { +@media screen and (min-device-width: 515px) and (max-device-width: 799px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (max-width: 1024px) and (orientation: landscape) { /* line 49, ../sass/mobile/_item.scss */ .items-holder .item.grid-item .icon { display: none; } } diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index cb399eb04c..6a3638f243 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -739,7 +739,7 @@ mct-container { -webkit-transition-duration: 0.2s; transition-duration: 0.2s; left: -257px; } } -@media screen and (min-device-width: 515px) and (max-device-width: 799px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (orientation: landscape) { +@media screen and (min-device-width: 515px) and (max-device-width: 799px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (max-width: 1024px) and (orientation: landscape) { /* line 26, ../sass/mobile/_layout.scss */ .holder-hide { -moz-transition-duration: 0.2s; @@ -756,7 +756,7 @@ mct-container { -webkit-transition-duration: 0.2s; transition-duration: 0.2s; left: 0px; } } -@media screen and (min-device-width: 515px) and (max-device-width: 799px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (orientation: landscape) { +@media screen and (min-device-width: 515px) and (max-device-width: 799px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (max-width: 1024px) and (orientation: landscape) { /* line 37, ../sass/mobile/_layout.scss */ .holder-show { -moz-transition-duration: 0.2s; @@ -776,7 +776,7 @@ mct-container { -webkit-transition-duration: 0.2s; transition-duration: 0.2s; left: 257px; } } - @media screen and (min-device-width: 515px) and (max-device-width: 799px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (orientation: landscape) { + @media screen and (min-device-width: 515px) and (max-device-width: 799px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (max-width: 1024px) and (orientation: landscape) { /* line 48, ../sass/mobile/_layout.scss */ .button-show { -moz-transition-duration: 0.2s; @@ -796,7 +796,7 @@ mct-container { /* line 60, ../sass/mobile/_layout.scss */ .button-hide { left: 257px; } } - @media screen and (min-device-width: 515px) and (max-device-width: 799px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (orientation: landscape) { + @media screen and (min-device-width: 515px) and (max-device-width: 799px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (max-width: 1024px) and (orientation: landscape) { /* line 60, ../sass/mobile/_layout.scss */ .button-hide { left: 512px; } } @@ -808,7 +808,7 @@ mct-container { /* line 71, ../sass/mobile/_layout.scss */ .object-header-mobile { left: 25.7px; } } - @media screen and (min-device-width: 515px) and (max-device-width: 799px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (orientation: landscape) { + @media screen and (min-device-width: 515px) and (max-device-width: 799px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (max-width: 1024px) and (orientation: landscape) { /* line 71, ../sass/mobile/_layout.scss */ .object-header-mobile { left: 51.2px; } } @@ -825,7 +825,7 @@ mct-container { /* line 88, ../sass/mobile/_layout.scss */ .browse-manage { width: 257px; } } -@media screen and (min-device-width: 515px) and (max-device-width: 799px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (orientation: landscape) { +@media screen and (min-device-width: 515px) and (max-device-width: 799px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (max-width: 1024px) and (orientation: landscape) { /* line 88, ../sass/mobile/_layout.scss */ .browse-manage { width: 512px; } } diff --git a/platform/commonUI/general/res/sass/mobile/_constants.scss b/platform/commonUI/general/res/sass/mobile/_constants.scss index 6e3d4f5fd7..f312ac8d91 100644 --- a/platform/commonUI/general/res/sass/mobile/_constants.scss +++ b/platform/commonUI/general/res/sass/mobile/_constants.scss @@ -37,7 +37,7 @@ $tabWidLanCheck: "(min-device-height: #{$tabMinW}) and (max-device-height: #{$ta $tabMinH: 741px; $tabMaxH: 1024px; $tabHeiPorCheck: "(min-device-height: #{$tabMinH}) and (max-device-height: #{$tabMaxH})"; -$tabHeiLanCheck: "(min-device-width: #{$tabMinH}) and (max-device-width: #{$tabMaxH})"; +$tabHeiLanCheck: "(min-device-width: #{$tabMinH}) and (max-device-width: #{$tabMaxH}) and (max-width: #{$tabMaxH})"; $phoneWidth: "screen and #{$phoWidPorCheck} and #{$phoHeiPorCheck} and (orientation: portrait)"; $phoneHeight: "screen and #{$phoWidLanCheck} and #{$phoHeiLanCheck} and (orientation: landscape)";