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

revert back to

Browse Source 
4d9dc3624b
This commit is contained in:
Shivam Dave 2015-07-10 12:47:00 -07:00
parent 67890a7298
commit eec955317a
4 changed files with 44 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -347,26 +347,26 @@
* 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-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 */ /* 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-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 */ /* line 24, ../sass/mobile/_item.scss */
.items-holder .item.grid-item { .items-holder .item.grid-item {
width: 100%; width: 100%;
height: 100px; } } 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 */ /* line 24, ../sass/mobile/_item.scss */
.items-holder .item.grid-item { .items-holder .item.grid-item {
width: 200px; width: 200px;
height: 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 */ /* 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-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 */ /* line 49, ../sass/mobile/_item.scss */
.items-holder .item.grid-item .icon { .items-holder .item.grid-item .icon {
display: none; } } display: none; } }

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

@ -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-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 */ /* line 26, ../sass/mobile/_layout.scss */
.holder-hide { .holder-hide {
-moz-transition-duration: 0.2s; -moz-transition-duration: 0.2s;
@ -739,16 +739,16 @@ 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-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 */ /* line 26, ../sass/mobile/_layout.scss */
.holder-hide { .holder-hide {
-moz-transition-duration: 0.2s; -moz-transition-duration: 0.2s;
-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;
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 */ /* 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-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 */ /* 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-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 */ /* line 48, ../sass/mobile/_layout.scss */
.button-show { .button-show {
-moz-transition-duration: 0.2s; -moz-transition-duration: 0.2s;
@ -776,14 +776,14 @@ 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-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 */ /* line 48, ../sass/mobile/_layout.scss */
.button-show { .button-show {
-moz-transition-duration: 0.2s; -moz-transition-duration: 0.2s;
-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;
left: 512px; } } left: 400px; } }
/* line 60, ../sass/mobile/_layout.scss */ /* line 60, ../sass/mobile/_layout.scss */
.button-hide { .button-hide {
@ -792,44 +792,44 @@ 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-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 */ /* line 60, ../sass/mobile/_layout.scss */
.button-hide { .button-hide {
left: 257px; } } 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 */ /* line 60, ../sass/mobile/_layout.scss */
.button-hide { .button-hide {
left: 512px; } } left: 400px; } }
/* 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-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 */ /* line 71, ../sass/mobile/_layout.scss */
.object-header-mobile { .object-header-mobile {
left: 25.7px; } } 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 */ /* line 71, ../sass/mobile/_layout.scss */
.object-header-mobile { .object-header-mobile {
left: 51.2px; } } left: 40px; } }
/* 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: 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 */ /* line 81, ../sass/mobile/_layout.scss */
.mobile-menu-icon { .mobile-menu-icon {
display: none; } } 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 */ /* line 88, ../sass/mobile/_layout.scss */
.browse-manage { .browse-manage {
width: 257px; } } 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 */ /* line 88, ../sass/mobile/_layout.scss */
.browse-manage { .browse-manage {
width: 512px; } } width: 400px; } }
@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 88, ../sass/mobile/_layout.scss */ /* line 88, ../sass/mobile/_layout.scss */
.browse-manage { .browse-manage {
min-width: 150px; min-width: 150px;

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

@ -22,48 +22,38 @@
/************************** WINDOW DIMENSIONS FOR RWD */ /************************** WINDOW DIMENSIONS FOR RWD */
$phoMaxW: 514px; $phoMaxW: 514px;
$phoWidPorCheck: "(max-device-width: #{$phoMaxW})"; $phoWidPorCheck: "(max-width: #{$phoMaxW})";
$phoWidLanCheck: "(max-device-height: #{$phoMaxW})"; $phoWidLanCheck: "(max-height: #{$phoMaxW})";
$phoMaxH: 740px; $phoMaxH: 740px;
$phoHeiPorCheck: "(max-device-height: #{$phoMaxH})"; $phoHeiPorCheck: "(max-height: #{$phoMaxH})";
$phoHeiLanCheck: "(max-device-width: #{$phoMaxH})"; $phoHeiLanCheck: "(max-width: #{$phoMaxH})";
$tabMinW: 515px; $tabMinW: 515px;
$tabMaxW: 799px; $tabMaxW: 800px;
$tabWidPorCheck: "(min-device-width: #{$tabMinW}) and (max-device-width: #{$tabMaxW})"; $tabWidPorCheck: "(min-width: #{$tabMinW}) and (max-width: #{$tabMaxW})";
$tabWidLanCheck: "(min-device-height: #{$tabMinW}) and (max-device-height: #{$tabMaxW}) and (min-width: #{$tabMinW}) and (max-width: #{$tabMaxW})"; $tabWidLanCheck: "(min-height: #{$tabMinW}) and (max-height: #{$tabMaxW})";
$tabMinH: 741px; $tabMinH: 741px;
$tabMaxH: 1024px; $tabMaxH: 1024px;
$tabHeiPorCheck: "(min-device-height: #{$tabMinH}) and (max-device-height: #{$tabMaxH})"; $tabHeiPorCheck: "(min-height: #{$tabMinH}) and (max-height: #{$tabMaxH})";
$tabHeiLanCheck: "(min-device-width: #{$tabMinH}) and (max-device-width: #{$tabMaxH}) and (min-width: #{$tabMinH}) and (max-width: #{$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)"; $phoneHeight: "screen and #{$phoWidLanCheck} and #{$phoHeiLanCheck} and (orientation: landscape)";
//$phoneBoth: "screen and #{$phoWidPorCheck} and #{$phoHeiPorCheck}"; $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)";
//$tabletBoth: "screen and #{$tabWidPorCheck} and #{$tabHeiPorCheck} and (orientation: portrait)"; $compMinW: 801px;
$compMinW: 800px;
$compWidPorCheck: "(min-device-width: #{$compMinW})";
$compWidLanCheck: "(min-device-height: #{$compMinW}) and (min-height: #{$compMinW})";
$compMinH: 1025px; $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)"; $deskTopDevice: "(min-device-width: #{$compMinW}) and (min-device-height: #{$compMinH})";
$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: $tabMaxH/2; $leftTab: $tabMaxW/2;
$hideRatioPhone: 1; $hideRatioPhone: 1;
$hideRatioTab: 1; $hideRatioTab: 1;

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

@ -43,8 +43,10 @@
//} //}
@mixin desktop { @mixin desktop {
@media #{$compWidth}, @media screen and (min-width: $compMinW) and (orientation: portrait),
#{$compHeight} { 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 @content
} }
} }