From b7b5f87002fa5664ce15f88f824e52ecbd624ba4 Mon Sep 17 00:00:00 2001 From: Dave Date: Fri, 10 Jul 2015 12:16:43 -0700 Subject: [PATCH] [Mobile] Device Adjusted Comp Constant. --- platform/commonUI/general/res/css/items.css | 6 ++--- .../general/res/css/theme-espresso.css | 26 +++++++++---------- .../general/res/sass/mobile/_constants.scss | 4 +-- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/platform/commonUI/general/res/css/items.css b/platform/commonUI/general/res/css/items.css index 6ad915844f..0951ef0d3c 100644 --- a/platform/commonUI/general/res/css/items.css +++ b/platform/commonUI/general/res/css/items.css @@ -352,12 +352,12 @@ .items-holder .item.grid-item { width: 100%; height: 50px; } } -@media screen and (min-device-width: 515px) and (max-device-width: 800px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 800px) 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 (orientation: landscape) { /* line 24, ../sass/mobile/_item.scss */ .items-holder .item.grid-item { width: 100%; height: 100px; } } -@media screen and (min-device-width: 801px) and (min-device-height: 1025px) and (orientation: portrait), screen and (min-device-height: 801px) and (min-device-width: 1025px) and (orientation: landscape) { +@media screen and (min-device-width: 800px) and (min-device-height: 1025px) and (orientation: portrait), screen and (min-device-height: 800px) and (min-device-width: 1025px) and (orientation: landscape) { /* line 24, ../sass/mobile/_item.scss */ .items-holder .item.grid-item { width: 200px; @@ -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: 800px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 800px) 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 (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 da94f6e1ab..3a20d43ec3 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -739,14 +739,14 @@ mct-container { -webkit-transition-duration: 0.2s; transition-duration: 0.2s; left: -257px; } } -@media screen and (min-device-width: 515px) and (max-device-width: 800px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 800px) 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 (orientation: landscape) { /* 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: -400px; } } + left: -399.5px; } } @media screen and (max-device-width: 514px) and (max-device-height: 740px) and (orientation: portrait), screen and (max-device-height: 514px) and (max-device-width: 740px) and (orientation: landscape) { /* line 37, ../sass/mobile/_layout.scss */ @@ -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: 800px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 800px) 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 (orientation: landscape) { /* line 37, ../sass/mobile/_layout.scss */ .holder-show { -moz-transition-duration: 0.2s; @@ -776,14 +776,14 @@ mct-container { -webkit-transition-duration: 0.2s; transition-duration: 0.2s; left: 257px; } } - @media screen and (min-device-width: 515px) and (max-device-width: 800px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 800px) 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 (orientation: landscape) { /* line 48, ../sass/mobile/_layout.scss */ .button-show { -moz-transition-duration: 0.2s; -o-transition-duration: 0.2s; -webkit-transition-duration: 0.2s; transition-duration: 0.2s; - left: 400px; } } + left: 399.5px; } } /* line 60, ../sass/mobile/_layout.scss */ .button-hide { @@ -796,10 +796,10 @@ mct-container { /* line 60, ../sass/mobile/_layout.scss */ .button-hide { left: 257px; } } - @media screen and (min-device-width: 515px) and (max-device-width: 800px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 800px) 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 (orientation: landscape) { /* line 60, ../sass/mobile/_layout.scss */ .button-hide { - left: 400px; } } + left: 399.5px; } } /* line 71, ../sass/mobile/_layout.scss */ .object-header-mobile { @@ -808,15 +808,15 @@ 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: 800px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 800px) 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 (orientation: landscape) { /* line 71, ../sass/mobile/_layout.scss */ .object-header-mobile { - left: 40px; } } + left: 39.95px; } } /* line 81, ../sass/mobile/_layout.scss */ .mobile-menu-icon { top: 5px; } - @media screen and (min-device-width: 801px) and (min-device-height: 1025px) and (orientation: portrait), screen and (min-device-height: 801px) and (min-device-width: 1025px) and (orientation: landscape) { + @media screen and (min-device-width: 800px) and (min-device-height: 1025px) and (orientation: portrait), screen and (min-device-height: 800px) and (min-device-width: 1025px) and (orientation: landscape) { /* line 81, ../sass/mobile/_layout.scss */ .mobile-menu-icon { display: none; } } @@ -825,11 +825,11 @@ mct-container { /* line 88, ../sass/mobile/_layout.scss */ .browse-manage { width: 257px; } } -@media screen and (min-device-width: 515px) and (max-device-width: 800px) and (min-device-height: 741px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-device-height: 515px) and (max-device-height: 800px) 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 (orientation: landscape) { /* line 88, ../sass/mobile/_layout.scss */ .browse-manage { - width: 400px; } } -@media screen and (min-device-width: 801px) and (min-device-height: 1025px) and (orientation: portrait), screen and (min-device-height: 801px) and (min-device-width: 1025px) and (orientation: landscape) { + width: 399.5px; } } +@media screen and (min-device-width: 800px) and (min-device-height: 1025px) and (orientation: portrait), screen and (min-device-height: 800px) and (min-device-width: 1025px) and (orientation: landscape) { /* line 88, ../sass/mobile/_layout.scss */ .browse-manage { min-width: 150px; diff --git a/platform/commonUI/general/res/sass/mobile/_constants.scss b/platform/commonUI/general/res/sass/mobile/_constants.scss index cdaa5c1836..bd79c2c5d6 100644 --- a/platform/commonUI/general/res/sass/mobile/_constants.scss +++ b/platform/commonUI/general/res/sass/mobile/_constants.scss @@ -30,7 +30,7 @@ $phoHeiPorCheck: "(max-device-height: #{$phoMaxH})"; $phoHeiLanCheck: "(max-device-width: #{$phoMaxH})"; $tabMinW: 515px; -$tabMaxW: 800px; +$tabMaxW: 799px; $tabWidPorCheck: "(min-device-width: #{$tabMinW}) and (max-device-width: #{$tabMaxW})"; $tabWidLanCheck: "(min-device-height: #{$tabMinW}) and (max-device-height: #{$tabMaxW})"; @@ -49,7 +49,7 @@ $tabletHeight: "screen and #{$tabWidLanCheck} and #{$tabHeiLanCheck} and (orient //$tabletBoth: "screen and #{$tabWidPorCheck} and #{$tabHeiPorCheck} and (orientation: portrait)"; -$compMinW: 801px; +$compMinW: 800px; $compWidPorCheck: "(min-device-width: #{$compMinW})"; $compWidLanCheck: "(min-device-height: #{$compMinW})";