alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Mobile] Reorganize

Browse Source 
Reorganized the sass files. To incorporate, new
mobile directory, which holds all the mobile
sass code.
This commit is contained in:
Dave
2015-07-08 12:11:48 -07:00
parent 3704d64560
commit 2b4162c0be
15 changed files with 454 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
platform/commonUI/general/res/sass/_constants.scss
View File

@@ -33,13 +33,6 @@ $controlCr: 2px;
$smallCr: 2px;
$badgeW: 35px;
/************************** WINDOW DIMENSIONS FOR RWD */
$phoMaxW: 514px;
$tabMinW: 515px;
$tabMaxW: 800px;
$compMinW: 801px;
$compMinH: 1281px;
/************************** COLORS AND SHADING */
$colorBodyBg: #333;
$colorBodyFg: #999;

4
platform/commonUI/general/res/sass/_main.scss
View File

@@ -27,10 +27,14 @@
@import "compass/utilities";
@import "mixins";
@import "mobile/mixins";
@import "effects";
@import "global";
@import "fonts";
@import "user-environ/layout";
@import "mobile/layout";
@import "fixed-position";
@import "about";
@import "text";

27
platform/commonUI/general/res/sass/_mixins.scss
View File

@@ -20,33 +20,6 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/
// Mixins for devices
@mixin phone {
@media screen and (max-width: $phoMaxW) {
@content
}
}
@mixin tablet {
@media screen and (min-width: $tabMinW) and (max-width: $tabMaxW) {
@content
}
}
@mixin phoneandtablet {
@media screen and (max-width: $tabMaxW) {
@content
}
}
@mixin desktop {
@media screen and (min-width: $compMinW) {
@content
}
}
@mixin absPosDefault($offset: 0px, $overflowHidden: hidden) {
overflow: $overflowHidden;
position: absolute;

5
platform/commonUI/general/res/sass/items.scss
View File

@@ -26,5 +26,8 @@
@import "compass/utilities";
@import "constants";
@import "mobile/constants";
@import "mixins";
@import "items/item";
@import "mobile/mixins";
@import "items/item";
@import "mobile/item";

1
platform/commonUI/general/res/sass/items/_item.scss
View File

@@ -96,6 +96,7 @@
padding: $interiorMargin;
}
}
// NOTE: make icon disappear
.item-main {
@include phone {
display: none;

28
platform/commonUI/general/res/sass/mobile/_constants.scss Normal file
View File

@@ -0,0 +1,28 @@
/*****************************************************************************
* Open MCT Web, Copyright (c) 2014-2015, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
* Open MCT Web is licensed under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0.
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
* Open MCT Web includes source code licensed under additional open source
* licenses. See the Open Source Licenses file (LICENSES.md) included with
* this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information.
*****************************************************************************/
/************************** WINDOW DIMENSIONS FOR RWD */
$phoMaxW: 514px;
$tabMinW: 515px;
$tabMaxW: 800px;
$compMinW: 801px;
$compMinH: 1281px;

62
platform/commonUI/general/res/sass/mobile/_item.scss Normal file
View File

@@ -0,0 +1,62 @@
/*****************************************************************************
* Open MCT Web, Copyright (c) 2014-2015, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
* Open MCT Web is licensed under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0.
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
* Open MCT Web includes source code licensed under additional open source
* licenses. See the Open Source Licenses file (LICENSES.md) included with
* this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information.
*****************************************************************************/
.items-holder {
.item {
&.grid-item {
// NOTE: Sets grid item width
$dWid: $ueBrowseGridItemLg;
$dHei: $ueBrowseGridItemLg;
@include phone {
$dWid: 100%;
$dHei: $ueBrowseGridItemLg/4;
width: $dWid;
height: $dHei;
}
@include tablet {
$dWid: 100%;
$dHei: $ueBrowseGridItemLg/2;
width: $dWid;
height: $dHei;
}
@include desktop {
$dWid: $ueBrowseGridItemLg;
$dHei: $ueBrowseGridItemLg;
width: $dWid;
height: $dHei;
}
.bar {
// NOTE: make icon disappear
.item-main {
@include phone {
display: none;
}
@include tablet {
display: none;
}
}
}
}
}
}

43
platform/commonUI/general/res/sass/mobile/_layout.scss Normal file
View File

@@ -0,0 +1,43 @@
/*****************************************************************************
* Open MCT Web, Copyright (c) 2014-2015, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
* Open MCT Web is licensed under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0.
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
* Open MCT Web includes source code licensed under additional open source
* licenses. See the Open Source Licenses file (LICENSES.md) included with
* this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information.
*****************************************************************************/
// style="min-width: 150px; max-width: 800px; width: 25%;"
// NOTE: Added to adjust the browse folder tree list view
//.hider-check {
// @include phoneandtablet {
//
// }
//}
.browse-manage {
@include phone {
width: 100px;
}
@include tablet {
width: 150px;
}
@include desktop {
min-width: 150px;
max-width: 800px;
width: 25%;
}
}

46
platform/commonUI/general/res/sass/mobile/_mixins.scss Normal file
View File

@@ -0,0 +1,46 @@
/*****************************************************************************
* Open MCT Web, Copyright (c) 2014-2015, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
* Open MCT Web is licensed under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0.
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
* Open MCT Web includes source code licensed under additional open source
* licenses. See the Open Source Licenses file (LICENSES.md) included with
* this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information.
*****************************************************************************/
// NOTE: Mixins for devices
@mixin phone {
@media screen and (max-width: $phoMaxW) {
@content
}
}
@mixin tablet {
@media screen and (min-width: $tabMinW) and (max-width: $tabMaxW) {
@content
}
}
@mixin phoneandtablet {
@media screen and (max-width: $tabMaxW) {
@content
}
}
@mixin desktop {
@media screen and (min-width: $compMinW) {
@content
}
}

1
platform/commonUI/general/res/sass/theme-espresso.scss
View File

@@ -20,5 +20,6 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/
@import "constants";
@import "mobile/constants";
@import "themes/theme-espresso";
@import "main";

22
platform/commonUI/general/res/sass/user-environ/_layout.scss
View File

@@ -48,28 +48,6 @@
@include border-radius($basicCr * 1.5);
}
// style="min-width: 150px; max-width: 800px; width: 25%;"
// NOTE: Added to adjust the browse folder tree list view
//.hider-check {
// @include phoneandtablet {
//
// }
//}
.browse-manage {
@include phone {
width: 100px;
}
@include tablet {
width: 150px;
}
@include desktop {
min-width: 150px;
max-width: 800px;
width: 25%;
}
}
.contents {
$myM: 0; //$interiorMargin;
box-sizing: border-box;