ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-05 04:44:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Mobile] Device

Browse Source 
Removes splits desktop
settings into 2, one
for landscape and another
for portrait.
This commit is contained in:
Dave 2015-07-10 11:51:56 -07:00
parent 4d4776e0ef
commit b0c5d807e7
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/commonUI/general/res/css/items.css
View File

@ -357,7 +357,7 @@
.items-holder .item.grid-item { .items-holder .item.grid-item {
width: 100%; width: 100%;
height: 100px; } } height: 100px; } }
@media screen and (min-device-width: 801px) and (min-device-height: 1025px) { @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) {
/* line 24, ../sass/mobile/_item.scss */ /* line 24, ../sass/mobile/_item.scss */
.items-holder .item.grid-item { .items-holder .item.grid-item {
width: 200px; width: 200px;

4
platform/commonUI/general/res/css/theme-espresso.css
View File

@ -816,7 +816,7 @@ mct-container {
/* line 81, ../sass/mobile/_layout.scss */ /* line 81, ../sass/mobile/_layout.scss */
.mobile-menu-icon { .mobile-menu-icon {
top: 5px; } top: 5px; }
@media screen and (min-device-width: 801px) and (min-device-height: 1025px) { @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) {
/* line 81, ../sass/mobile/_layout.scss */ /* line 81, ../sass/mobile/_layout.scss */
.mobile-menu-icon { .mobile-menu-icon {
display: none; } } display: none; } }
@ -829,7 +829,7 @@ mct-container {
/* line 88, ../sass/mobile/_layout.scss */ /* line 88, ../sass/mobile/_layout.scss */
.browse-manage { .browse-manage {
width: 400px; } } width: 400px; } }
@media screen and (min-device-width: 801px) and (min-device-height: 1025px) { @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) {
/* line 88, ../sass/mobile/_layout.scss */ /* line 88, ../sass/mobile/_layout.scss */
.browse-manage { .browse-manage {
min-width: 150px; min-width: 150px;

18
platform/commonUI/general/res/sass/mobile/_constants.scss
View File

@ -42,13 +42,25 @@ $tabHeiLanCheck: "(min-device-width: #{$tabMinH}) and (max-device-width: #{$tabM
$phoneWidth: "screen and #{$phoWidPorCheck} and #{$phoHeiPorCheck} and (orientation: portrait)"; $phoneWidth: "screen and #{$phoWidPorCheck} and #{$phoHeiPorCheck} and (orientation: portrait)";
$phoneHeight: "screen and #{$phoWidLanCheck} and #{$phoHeiLanCheck} and (orientation: landscape)"; $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 (orientation: portrait)";
$tabletHeight: "screen and #{$tabWidLanCheck} and #{$tabHeiLanCheck} and (orientation: landscape)"; $tabletHeight: "screen and #{$tabWidLanCheck} and #{$tabHeiLanCheck} and (orientation: landscape)";
$compMinW: 801px; //$tabletBoth: "screen and #{$tabWidPorCheck} and #{$tabHeiPorCheck} and (orientation: portrait)";
$compMinH: 1025px;
$compBoth: "screen and (min-device-width: #{$compMinW}) and (min-device-height: #{$compMinH})"; $compMinW: 801px;
$compWidPorCheck: "(min-device-width: #{$compMinW})";
$compWidLanCheck: "(min-device-height: #{$compMinW})";
$compMinH: 1025px;
$compHeiPorCheck: "(min-device-height: #{$compMinH})";
$compHeiLanCheck: "(min-device-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})";
$leftPhone: $phoMaxW/2; $leftPhone: $phoMaxW/2;
$leftTab: $tabMaxW/2; $leftTab: $tabMaxW/2;

3
platform/commonUI/general/res/sass/mobile/_mixins.scss
View File

@ -43,7 +43,8 @@
//} //}
@mixin desktop { @mixin desktop {
@media #{$compBoth} { @media #{$compWidth},
#{$compHeight} {
@content @content
} }
} }