From eec955317a39a4905bcc8c682cca349461a0a1a8 Mon Sep 17 00:00:00 2001
From: Shivam Dave <sdave@ucsc.edu>
Date: Fri, 10 Jul 2015 12:47:00 -0700
Subject: [PATCH] revert back to

4d9dc3624b02acf348d67d8aa812547aa4a2ef4e
---
 platform/commonUI/general/res/css/items.css   | 10 ++---
 .../general/res/css/theme-espresso.css        | 38 ++++++++---------
 .../general/res/sass/mobile/_constants.scss   | 42 +++++++------------
 .../general/res/sass/mobile/_mixins.scss      |  6 ++-
 4 files changed, 44 insertions(+), 52 deletions(-)

diff --git a/platform/commonUI/general/res/css/items.css b/platform/commonUI/general/res/css/items.css
index 104acc4bd1..bf0f5094ce 100644
--- a/platform/commonUI/general/res/css/items.css
+++ b/platform/commonUI/general/res/css/items.css
@@ -347,26 +347,26 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-@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) {
+@media screen and (max-width: 514px) and (max-height: 740px) and (max-device-width: 800px) and (max-device-height: 1024px) and (orientation: portrait), screen and (max-height: 514px) and (max-width: 740px) and (orientation: landscape) {
   /* line 24, ../sass/mobile/_item.scss */
   .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-width: 515px) and (max-width: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (min-width: 741px) and (max-width: 1024px) and (orientation: landscape) {
+@media screen and (min-width: 515px) and (max-width: 800px) and (min-height: 741px) and (max-height: 1024px) and (max-device-width: 800px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-height: 515px) and (max-height: 800px) and (min-width: 741px) and (max-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: 800px) and (min-device-height: 1025px) and (orientation: portrait), screen and (min-device-height: 800px) and (min-height: 800px) and (min-device-width: 1025px) and (min-width: 1025px) and (orientation: landscape) {
+@media screen and (min-width: 801px) and (orientation: portrait), screen and (min-device-width: 801px) and (orientation: portrait), screen and (min-width: 1025px) and (orientation: landscape), screen and (min-device-width: 1025px) and (orientation: landscape) {
   /* line 24, ../sass/mobile/_item.scss */
   .items-holder .item.grid-item {
     width: 200px;
     height: 200px; } }
-@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) {
+@media screen and (max-width: 514px) and (max-height: 740px) and (max-device-width: 800px) and (max-device-height: 1024px) and (orientation: portrait), screen and (max-height: 514px) and (max-width: 740px) and (orientation: landscape) {
   /* 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-width: 515px) and (max-width: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (min-width: 741px) and (max-width: 1024px) and (orientation: landscape) {
+@media screen and (min-width: 515px) and (max-width: 800px) and (min-height: 741px) and (max-height: 1024px) and (max-device-width: 800px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-height: 515px) and (max-height: 800px) and (min-width: 741px) 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 6ec675ea30..1778fb4848 100644
--- a/platform/commonUI/general/res/css/theme-espresso.css
+++ b/platform/commonUI/general/res/css/theme-espresso.css
@@ -731,7 +731,7 @@ 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-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) {
+@media screen and (max-width: 514px) and (max-height: 740px) and (max-device-width: 800px) and (max-device-height: 1024px) and (orientation: portrait), screen and (max-height: 514px) and (max-width: 740px) and (orientation: landscape) {
   /* line 26, ../sass/mobile/_layout.scss */
   .holder-hide {
     -moz-transition-duration: 0.2s;
@@ -739,16 +739,16 @@ 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-width: 515px) and (max-width: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (min-width: 741px) and (max-width: 1024px) and (orientation: landscape) {
+@media screen and (min-width: 515px) and (max-width: 800px) and (min-height: 741px) and (max-height: 1024px) and (max-device-width: 800px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-height: 515px) and (max-height: 800px) and (min-width: 741px) and (max-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: -512px; } }
+    left: -400px; } }
 
-@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) {
+@media screen and (max-width: 514px) and (max-height: 740px) and (max-device-width: 800px) and (max-device-height: 1024px) and (orientation: portrait), screen and (max-height: 514px) and (max-width: 740px) and (orientation: landscape) {
   /* line 37, ../sass/mobile/_layout.scss */
   .holder-show {
     -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-width: 515px) and (max-width: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (min-width: 741px) and (max-width: 1024px) and (orientation: landscape) {
+@media screen and (min-width: 515px) and (max-width: 800px) and (min-height: 741px) and (max-height: 1024px) and (max-device-width: 800px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-height: 515px) and (max-height: 800px) and (min-width: 741px) and (max-width: 1024px) and (orientation: landscape) {
   /* line 37, ../sass/mobile/_layout.scss */
   .holder-show {
     -moz-transition-duration: 0.2s;
@@ -768,7 +768,7 @@ mct-container {
 /* line 48, ../sass/mobile/_layout.scss */
 .button-show {
   position: absolute; }
-  @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) {
+  @media screen and (max-width: 514px) and (max-height: 740px) and (max-device-width: 800px) and (max-device-height: 1024px) and (orientation: portrait), screen and (max-height: 514px) and (max-width: 740px) and (orientation: landscape) {
     /* line 48, ../sass/mobile/_layout.scss */
     .button-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: 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-width: 515px) and (max-width: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (min-width: 741px) and (max-width: 1024px) and (orientation: landscape) {
+  @media screen and (min-width: 515px) and (max-width: 800px) and (min-height: 741px) and (max-height: 1024px) and (max-device-width: 800px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-height: 515px) and (max-height: 800px) and (min-width: 741px) and (max-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: 512px; } }
+      left: 400px; } }
 
 /* line 60, ../sass/mobile/_layout.scss */
 .button-hide {
@@ -792,44 +792,44 @@ mct-container {
   -o-transition-duration: 0.2s;
   -webkit-transition-duration: 0.2s;
   transition-duration: 0.2s; }
-  @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) {
+  @media screen and (max-width: 514px) and (max-height: 740px) and (max-device-width: 800px) and (max-device-height: 1024px) and (orientation: portrait), screen and (max-height: 514px) and (max-width: 740px) and (orientation: landscape) {
     /* 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-width: 515px) and (max-width: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (min-width: 741px) and (max-width: 1024px) and (orientation: landscape) {
+  @media screen and (min-width: 515px) and (max-width: 800px) and (min-height: 741px) and (max-height: 1024px) and (max-device-width: 800px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-height: 515px) and (max-height: 800px) and (min-width: 741px) and (max-width: 1024px) and (orientation: landscape) {
     /* line 60, ../sass/mobile/_layout.scss */
     .button-hide {
-      left: 512px; } }
+      left: 400px; } }
 
 /* line 71, ../sass/mobile/_layout.scss */
 .object-header-mobile {
   position: relative; }
-  @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) {
+  @media screen and (max-width: 514px) and (max-height: 740px) and (max-device-width: 800px) and (max-device-height: 1024px) and (orientation: portrait), screen and (max-height: 514px) and (max-width: 740px) and (orientation: landscape) {
     /* 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-width: 515px) and (max-width: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (min-width: 741px) and (max-width: 1024px) and (orientation: landscape) {
+  @media screen and (min-width: 515px) and (max-width: 800px) and (min-height: 741px) and (max-height: 1024px) and (max-device-width: 800px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-height: 515px) and (max-height: 800px) and (min-width: 741px) and (max-width: 1024px) and (orientation: landscape) {
     /* line 71, ../sass/mobile/_layout.scss */
     .object-header-mobile {
-      left: 51.2px; } }
+      left: 40px; } }
 
 /* line 81, ../sass/mobile/_layout.scss */
 .mobile-menu-icon {
   top: 5px; }
-  @media screen and (min-device-width: 800px) and (min-device-height: 1025px) and (orientation: portrait), screen and (min-device-height: 800px) and (min-height: 800px) and (min-device-width: 1025px) and (min-width: 1025px) and (orientation: landscape) {
+  @media screen and (min-width: 801px) and (orientation: portrait), screen and (min-device-width: 801px) and (orientation: portrait), screen and (min-width: 1025px) and (orientation: landscape), screen and (min-device-width: 1025px) and (orientation: landscape) {
     /* line 81, ../sass/mobile/_layout.scss */
     .mobile-menu-icon {
       display: none; } }
 
-@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) {
+@media screen and (max-width: 514px) and (max-height: 740px) and (max-device-width: 800px) and (max-device-height: 1024px) and (orientation: portrait), screen and (max-height: 514px) and (max-width: 740px) and (orientation: landscape) {
   /* 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-width: 515px) and (max-width: 799px) and (min-device-width: 741px) and (max-device-width: 1024px) and (min-width: 741px) and (max-width: 1024px) and (orientation: landscape) {
+@media screen and (min-width: 515px) and (max-width: 800px) and (min-height: 741px) and (max-height: 1024px) and (max-device-width: 800px) and (max-device-height: 1024px) and (orientation: portrait), screen and (min-height: 515px) and (max-height: 800px) and (min-width: 741px) and (max-width: 1024px) and (orientation: landscape) {
   /* line 88, ../sass/mobile/_layout.scss */
   .browse-manage {
-    width: 512px; } }
-@media screen and (min-device-width: 800px) and (min-device-height: 1025px) and (orientation: portrait), screen and (min-device-height: 800px) and (min-height: 800px) and (min-device-width: 1025px) and (min-width: 1025px) and (orientation: landscape) {
+    width: 400px; } }
+@media screen and (min-width: 801px) and (orientation: portrait), screen and (min-device-width: 801px) and (orientation: portrait), screen and (min-width: 1025px) and (orientation: landscape), screen 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 cf0482bfdf..2f5ddc08e3 100644
--- a/platform/commonUI/general/res/sass/mobile/_constants.scss
+++ b/platform/commonUI/general/res/sass/mobile/_constants.scss
@@ -22,48 +22,38 @@
 
 /************************** WINDOW DIMENSIONS FOR RWD */
 $phoMaxW: 514px;
-$phoWidPorCheck: "(max-device-width: #{$phoMaxW})";
-$phoWidLanCheck: "(max-device-height: #{$phoMaxW})";
+$phoWidPorCheck: "(max-width: #{$phoMaxW})";
+$phoWidLanCheck: "(max-height: #{$phoMaxW})";
 
 $phoMaxH: 740px;
-$phoHeiPorCheck: "(max-device-height: #{$phoMaxH})";
-$phoHeiLanCheck: "(max-device-width: #{$phoMaxH})";
+$phoHeiPorCheck: "(max-height: #{$phoMaxH})";
+$phoHeiLanCheck: "(max-width: #{$phoMaxH})";
 
 $tabMinW: 515px;
-$tabMaxW: 799px;
-$tabWidPorCheck: "(min-device-width: #{$tabMinW}) and (max-device-width: #{$tabMaxW})";
-$tabWidLanCheck: "(min-device-height: #{$tabMinW}) and (max-device-height: #{$tabMaxW}) and (min-width: #{$tabMinW}) and (max-width: #{$tabMaxW})";
+$tabMaxW: 800px;
+$tabWidPorCheck: "(min-width: #{$tabMinW}) and (max-width: #{$tabMaxW})";
+$tabWidLanCheck: "(min-height: #{$tabMinW}) and (max-height: #{$tabMaxW})";
 
 $tabMinH: 741px;
 $tabMaxH: 1024px;
-$tabHeiPorCheck: "(min-device-height: #{$tabMinH}) and (max-device-height: #{$tabMaxH})";
-$tabHeiLanCheck: "(min-device-width: #{$tabMinH}) and (max-device-width: #{$tabMaxH}) and (min-width: #{$tabMinH}) and (max-width: #{$tabMaxH})";
+$tabHeiPorCheck: "(min-height: #{$tabMinH}) and (max-height: #{$tabMaxH})";
+$tabHeiLanCheck: "(min-width: #{$tabMinH}) and (max-width: #{$tabMaxH})";
 
-$phoneWidth: "screen and #{$phoWidPorCheck} and #{$phoHeiPorCheck} and (orientation: portrait)";
+$mobileDevice: "(max-device-width: #{$tabMaxW}) and (max-device-height: #{$tabMaxH})";
+
+$phoneWidth: "screen and #{$phoWidPorCheck} and #{$phoHeiPorCheck} and #{$mobileDevice} and (orientation: portrait)";
 $phoneHeight: "screen and #{$phoWidLanCheck} and #{$phoHeiLanCheck} and (orientation: landscape)";
 
-//$phoneBoth: "screen and #{$phoWidPorCheck} and #{$phoHeiPorCheck}";
-
-$tabletWidth: "screen and #{$tabWidPorCheck} and #{$tabHeiPorCheck} and (orientation: portrait)";
+$tabletWidth: "screen and #{$tabWidPorCheck} and #{$tabHeiPorCheck} and #{$mobileDevice} and (orientation: portrait)";
 $tabletHeight: "screen and #{$tabWidLanCheck} and #{$tabHeiLanCheck} and (orientation: landscape)";
 
-//$tabletBoth: "screen and #{$tabWidPorCheck} and #{$tabHeiPorCheck} and (orientation: portrait)";
-
-$compMinW: 800px;
-$compWidPorCheck: "(min-device-width: #{$compMinW})";
-$compWidLanCheck: "(min-device-height: #{$compMinW}) and (min-height: #{$compMinW})";
-
+$compMinW: 801px;
 $compMinH: 1025px;
-$compHeiPorCheck: "(min-device-height: #{$compMinH})";
-$compHeiLanCheck: "(min-device-width: #{$compMinH}) and (min-width: #{$compMinH})";
 
-$compWidth: "screen and #{$compWidPorCheck} and #{$compHeiPorCheck} and (orientation: portrait)";
-$compHeight: "screen and #{$compWidLanCheck} and #{$compHeiLanCheck} and (orientation: landscape)";
-
-//$compBoth: "screen and (min-device-width: #{$compMinW}) and (min-device-height: #{$compMinH})";
+$deskTopDevice: "(min-device-width: #{$compMinW}) and (min-device-height: #{$compMinH})";
 
 $leftPhone: $phoMaxW/2;
-$leftTab: $tabMaxH/2;
+$leftTab: $tabMaxW/2;
 
 $hideRatioPhone: 1;
 $hideRatioTab: 1;
diff --git a/platform/commonUI/general/res/sass/mobile/_mixins.scss b/platform/commonUI/general/res/sass/mobile/_mixins.scss
index 58127a0c14..f23b8bc1d6 100644
--- a/platform/commonUI/general/res/sass/mobile/_mixins.scss
+++ b/platform/commonUI/general/res/sass/mobile/_mixins.scss
@@ -43,8 +43,10 @@
 //}
 
 @mixin desktop {
-    @media #{$compWidth},
-           #{$compHeight} {
+    @media screen and (min-width: $compMinW) and (orientation: portrait),
+           screen and (min-device-width: $compMinW) and (orientation: portrait),
+           screen and (min-width: $compMinH) and (orientation: landscape),
+           screen and (min-device-width: $compMinH) and (orientation: landscape) {
         @content
     }
 }