mirror of
https://github.com/nasa/openmct.git
synced 2025-03-11 15:04:10 +00:00
[Mobile] Device Change
Now instead of min-width, max-width, ... etc, uses the device-width/height. This allows the devices to use the slide menu while the browser on a desktop consistently stays as desktop mode, no matter if it is resized. As a result of this the rwd is clear on phones/tablets, but not if user resizes browser super small.
This commit is contained in:
parent
4d9dc3624b
commit
5c99e469d5
@ -347,12 +347,12 @@
|
|||||||
* this source code distribution or the Licensing information page available
|
* this source code distribution or the Licensing information page available
|
||||||
* at runtime from the About dialog for additional information.
|
* at runtime from the About dialog for additional information.
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
@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) {
|
@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 24, ../sass/mobile/_item.scss */
|
/* line 24, ../sass/mobile/_item.scss */
|
||||||
.items-holder .item.grid-item {
|
.items-holder .item.grid-item {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 50px; } }
|
height: 50px; } }
|
||||||
@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) {
|
@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) {
|
||||||
/* line 24, ../sass/mobile/_item.scss */
|
/* line 24, ../sass/mobile/_item.scss */
|
||||||
.items-holder .item.grid-item {
|
.items-holder .item.grid-item {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
@ -362,11 +362,11 @@
|
|||||||
.items-holder .item.grid-item {
|
.items-holder .item.grid-item {
|
||||||
width: 200px;
|
width: 200px;
|
||||||
height: 200px; } }
|
height: 200px; } }
|
||||||
@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) {
|
@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 49, ../sass/mobile/_item.scss */
|
/* line 49, ../sass/mobile/_item.scss */
|
||||||
.items-holder .item.grid-item .icon {
|
.items-holder .item.grid-item .icon {
|
||||||
display: none; } }
|
display: none; } }
|
||||||
@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) {
|
@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) {
|
||||||
/* line 49, ../sass/mobile/_item.scss */
|
/* line 49, ../sass/mobile/_item.scss */
|
||||||
.items-holder .item.grid-item .icon {
|
.items-holder .item.grid-item .icon {
|
||||||
display: none; } }
|
display: none; } }
|
||||||
|
@ -731,7 +731,7 @@ mct-container {
|
|||||||
* this source code distribution or the Licensing information page available
|
* this source code distribution or the Licensing information page available
|
||||||
* at runtime from the About dialog for additional information.
|
* at runtime from the About dialog for additional information.
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
@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) {
|
@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 26, ../sass/mobile/_layout.scss */
|
/* line 26, ../sass/mobile/_layout.scss */
|
||||||
.holder-hide {
|
.holder-hide {
|
||||||
-moz-transition-duration: 0.2s;
|
-moz-transition-duration: 0.2s;
|
||||||
@ -739,7 +739,7 @@ mct-container {
|
|||||||
-webkit-transition-duration: 0.2s;
|
-webkit-transition-duration: 0.2s;
|
||||||
transition-duration: 0.2s;
|
transition-duration: 0.2s;
|
||||||
left: -257px; } }
|
left: -257px; } }
|
||||||
@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) {
|
@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) {
|
||||||
/* line 26, ../sass/mobile/_layout.scss */
|
/* line 26, ../sass/mobile/_layout.scss */
|
||||||
.holder-hide {
|
.holder-hide {
|
||||||
-moz-transition-duration: 0.2s;
|
-moz-transition-duration: 0.2s;
|
||||||
@ -748,7 +748,7 @@ mct-container {
|
|||||||
transition-duration: 0.2s;
|
transition-duration: 0.2s;
|
||||||
left: -400px; } }
|
left: -400px; } }
|
||||||
|
|
||||||
@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) {
|
@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 */
|
/* line 37, ../sass/mobile/_layout.scss */
|
||||||
.holder-show {
|
.holder-show {
|
||||||
-moz-transition-duration: 0.2s;
|
-moz-transition-duration: 0.2s;
|
||||||
@ -756,7 +756,7 @@ mct-container {
|
|||||||
-webkit-transition-duration: 0.2s;
|
-webkit-transition-duration: 0.2s;
|
||||||
transition-duration: 0.2s;
|
transition-duration: 0.2s;
|
||||||
left: 0px; } }
|
left: 0px; } }
|
||||||
@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) {
|
@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) {
|
||||||
/* line 37, ../sass/mobile/_layout.scss */
|
/* line 37, ../sass/mobile/_layout.scss */
|
||||||
.holder-show {
|
.holder-show {
|
||||||
-moz-transition-duration: 0.2s;
|
-moz-transition-duration: 0.2s;
|
||||||
@ -768,7 +768,7 @@ mct-container {
|
|||||||
/* line 48, ../sass/mobile/_layout.scss */
|
/* line 48, ../sass/mobile/_layout.scss */
|
||||||
.button-show {
|
.button-show {
|
||||||
position: absolute; }
|
position: absolute; }
|
||||||
@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) {
|
@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 48, ../sass/mobile/_layout.scss */
|
/* line 48, ../sass/mobile/_layout.scss */
|
||||||
.button-show {
|
.button-show {
|
||||||
-moz-transition-duration: 0.2s;
|
-moz-transition-duration: 0.2s;
|
||||||
@ -776,7 +776,7 @@ mct-container {
|
|||||||
-webkit-transition-duration: 0.2s;
|
-webkit-transition-duration: 0.2s;
|
||||||
transition-duration: 0.2s;
|
transition-duration: 0.2s;
|
||||||
left: 257px; } }
|
left: 257px; } }
|
||||||
@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) {
|
@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) {
|
||||||
/* line 48, ../sass/mobile/_layout.scss */
|
/* line 48, ../sass/mobile/_layout.scss */
|
||||||
.button-show {
|
.button-show {
|
||||||
-moz-transition-duration: 0.2s;
|
-moz-transition-duration: 0.2s;
|
||||||
@ -792,11 +792,11 @@ mct-container {
|
|||||||
-o-transition-duration: 0.2s;
|
-o-transition-duration: 0.2s;
|
||||||
-webkit-transition-duration: 0.2s;
|
-webkit-transition-duration: 0.2s;
|
||||||
transition-duration: 0.2s; }
|
transition-duration: 0.2s; }
|
||||||
@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) {
|
@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 60, ../sass/mobile/_layout.scss */
|
/* line 60, ../sass/mobile/_layout.scss */
|
||||||
.button-hide {
|
.button-hide {
|
||||||
left: 257px; } }
|
left: 257px; } }
|
||||||
@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) {
|
@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) {
|
||||||
/* line 60, ../sass/mobile/_layout.scss */
|
/* line 60, ../sass/mobile/_layout.scss */
|
||||||
.button-hide {
|
.button-hide {
|
||||||
left: 400px; } }
|
left: 400px; } }
|
||||||
@ -804,11 +804,11 @@ mct-container {
|
|||||||
/* line 71, ../sass/mobile/_layout.scss */
|
/* line 71, ../sass/mobile/_layout.scss */
|
||||||
.object-header-mobile {
|
.object-header-mobile {
|
||||||
position: relative; }
|
position: relative; }
|
||||||
@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) {
|
@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 71, ../sass/mobile/_layout.scss */
|
/* line 71, ../sass/mobile/_layout.scss */
|
||||||
.object-header-mobile {
|
.object-header-mobile {
|
||||||
left: 25.7px; } }
|
left: 25.7px; } }
|
||||||
@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) {
|
@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) {
|
||||||
/* line 71, ../sass/mobile/_layout.scss */
|
/* line 71, ../sass/mobile/_layout.scss */
|
||||||
.object-header-mobile {
|
.object-header-mobile {
|
||||||
left: 40px; } }
|
left: 40px; } }
|
||||||
@ -821,11 +821,11 @@ mct-container {
|
|||||||
.mobile-menu-icon {
|
.mobile-menu-icon {
|
||||||
display: none; } }
|
display: none; } }
|
||||||
|
|
||||||
@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) {
|
@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 88, ../sass/mobile/_layout.scss */
|
/* line 88, ../sass/mobile/_layout.scss */
|
||||||
.browse-manage {
|
.browse-manage {
|
||||||
width: 257px; } }
|
width: 257px; } }
|
||||||
@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) {
|
@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) {
|
||||||
/* line 88, ../sass/mobile/_layout.scss */
|
/* line 88, ../sass/mobile/_layout.scss */
|
||||||
.browse-manage {
|
.browse-manage {
|
||||||
width: 400px; } }
|
width: 400px; } }
|
||||||
|
@ -22,36 +22,32 @@
|
|||||||
|
|
||||||
/************************** WINDOW DIMENSIONS FOR RWD */
|
/************************** WINDOW DIMENSIONS FOR RWD */
|
||||||
$phoMaxW: 514px;
|
$phoMaxW: 514px;
|
||||||
$phoWidPorCheck: "(max-width: #{$phoMaxW})";
|
$phoWidPorCheck: "(max-device-width: #{$phoMaxW})";
|
||||||
$phoWidLanCheck: "(max-height: #{$phoMaxW})";
|
$phoWidLanCheck: "(max-device-height: #{$phoMaxW})";
|
||||||
|
|
||||||
$phoMaxH: 740px;
|
$phoMaxH: 740px;
|
||||||
$phoHeiPorCheck: "(max-height: #{$phoMaxH})";
|
$phoHeiPorCheck: "(max-device-height: #{$phoMaxH})";
|
||||||
$phoHeiLanCheck: "(max-width: #{$phoMaxH})";
|
$phoHeiLanCheck: "(max-device-width: #{$phoMaxH})";
|
||||||
|
|
||||||
$tabMinW: 515px;
|
$tabMinW: 515px;
|
||||||
$tabMaxW: 800px;
|
$tabMaxW: 800px;
|
||||||
$tabWidPorCheck: "(min-width: #{$tabMinW}) and (max-width: #{$tabMaxW})";
|
$tabWidPorCheck: "(min-device-width: #{$tabMinW}) and (max-device-width: #{$tabMaxW})";
|
||||||
$tabWidLanCheck: "(min-height: #{$tabMinW}) and (max-height: #{$tabMaxW})";
|
$tabWidLanCheck: "(min-device-height: #{$tabMinW}) and (max-device-height: #{$tabMaxW})";
|
||||||
|
|
||||||
$tabMinH: 741px;
|
$tabMinH: 741px;
|
||||||
$tabMaxH: 1024px;
|
$tabMaxH: 1024px;
|
||||||
$tabHeiPorCheck: "(min-height: #{$tabMinH}) and (max-height: #{$tabMaxH})";
|
$tabHeiPorCheck: "(min-device-height: #{$tabMinH}) and (max-device-height: #{$tabMaxH})";
|
||||||
$tabHeiLanCheck: "(min-width: #{$tabMinH}) and (max-width: #{$tabMaxH})";
|
$tabHeiLanCheck: "(min-device-width: #{$tabMinH}) and (max-device-width: #{$tabMaxH})";
|
||||||
|
|
||||||
$mobileDevice: "(max-device-width: #{$tabMaxW}) and (max-device-height: #{$tabMaxH})";
|
$phoneWidth: "screen and #{$phoWidPorCheck} and #{$phoHeiPorCheck} and (orientation: portrait)";
|
||||||
|
|
||||||
$phoneWidth: "screen and #{$phoWidPorCheck} and #{$phoHeiPorCheck} and #{$mobileDevice} and (orientation: portrait)";
|
|
||||||
$phoneHeight: "screen and #{$phoWidLanCheck} and #{$phoHeiLanCheck} and (orientation: landscape)";
|
$phoneHeight: "screen and #{$phoWidLanCheck} and #{$phoHeiLanCheck} and (orientation: landscape)";
|
||||||
|
|
||||||
$tabletWidth: "screen and #{$tabWidPorCheck} and #{$tabHeiPorCheck} and #{$mobileDevice} and (orientation: portrait)";
|
$tabletWidth: "screen and #{$tabWidPorCheck} and #{$tabHeiPorCheck} and (orientation: portrait)";
|
||||||
$tabletHeight: "screen and #{$tabWidLanCheck} and #{$tabHeiLanCheck} and (orientation: landscape)";
|
$tabletHeight: "screen and #{$tabWidLanCheck} and #{$tabHeiLanCheck} and (orientation: landscape)";
|
||||||
|
|
||||||
$compMinW: 801px;
|
$compMinW: 801px;
|
||||||
$compMinH: 1025px;
|
$compMinH: 1025px;
|
||||||
|
|
||||||
$deskTopDevice: "(min-device-width: #{$compMinW}) and (min-device-height: #{$compMinH})";
|
|
||||||
|
|
||||||
$leftPhone: $phoMaxW/2;
|
$leftPhone: $phoMaxW/2;
|
||||||
$leftTab: $tabMaxW/2;
|
$leftTab: $tabMaxW/2;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user