ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-03-23 12:35:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Mobile] Tweaks to layout

Browse Source 
Removed the user-select option
for the context menu and bottom bar
on mobile. Also edited the folder
grid item so that its icon rep
size is not overly large.
This commit is contained in:
Shivam Dave 2015-07-29 10:39:17 -07:00
parent d262520594
commit 28a2a5b92a
6 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -390,12 +390,13 @@
height: 50px; }
/* line 61, ../sass/mobile/_item.scss */
.items-holder .item.grid-item .item-main .item-type {
line-height: 40px; }
/* line 65, ../sass/mobile/_item.scss */
line-height: 40px;
height: auto; }
/* line 66, ../sass/mobile/_item.scss */
.items-holder .item.grid-item .title {
margin-right: 10px;
line-height: 25px; }
/* line 69, ../sass/mobile/_item.scss */
/* line 70, ../sass/mobile/_item.scss */
.items-holder .item.grid-item .details {
margin-right: 10px;
line-height: 0px; } }
@ -404,15 +405,15 @@
.items-holder .item.grid-item {
width: 100%;
height: 66.66667px; }
/* line 80, ../sass/mobile/_item.scss */
/* line 81, ../sass/mobile/_item.scss */
.items-holder .item.grid-item .item-main .item-type {
font-size: 30px;
line-height: 50px; }
/* line 85, ../sass/mobile/_item.scss */
/* line 86, ../sass/mobile/_item.scss */
.items-holder .item.grid-item .title {
margin-right: 10px;
line-height: 38px; }
/* line 89, ../sass/mobile/_item.scss */
/* line 90, ../sass/mobile/_item.scss */
.items-holder .item.grid-item .details {
margin-right: 10px;
line-height: 0px; } }

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

@ -915,6 +915,14 @@ mct-container {
.tree-holder {
overflow-x: hidden !important; } }
@media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 1024px) and (max-device-height: 799px), screen and (orientation: portrait) and (min-width: 515px) and (max-width: 799px) and (min-height: 741px) and (max-height: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 1024px) and (max-device-height: 799px) {
/* line 202, ../sass/mobile/_layout.scss */
.disable-select {
-moz-user-select: -moz-none;
-ms-user-select: none;
-webkit-user-select: none;
user-select: none; } }
/*****************************************************************************
* Open MCT Web, Copyright (c) 2014-2015, United States Government
* as represented by the Administrator of the National Aeronautics and Space

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

@ -60,6 +60,7 @@
.item-main {
.item-type {
line-height: $phone-itemHeight * .8;
height: auto;
}
}
.title {

5
platform/commonUI/general/res/sass/mobile/_layout.scss
View File

@ -199,3 +199,8 @@
overflow-x: hidden !important;
}
}
.disable-select {
@include phoneandtablet {
@include user-select(none);
}
}

2
platform/commonUI/general/res/templates/bottombar.html
View File

@ -19,7 +19,7 @@
this source code distribution or the Licensing information page available
at runtime from the About dialog for additional information.
-->
<div class='abs bottom-bar ue-bottom-bar' ng-controller="BottomBarController as bar">
<div class='abs bottom-bar ue-bottom-bar disable-select' ng-controller="BottomBarController as bar">
<div id='status' class='status-holder'>
<mct-include ng-repeat="indicator in bar.getIndicators()"
ng-model="indicator.ngModel"

2
platform/commonUI/general/res/templates/menu/context-menu.html
View File

@ -19,7 +19,7 @@
this source code distribution or the Licensing information page available
at runtime from the About dialog for additional information.
-->
<div class="menu-element context-menu-wrapper" ng-controller="ContextMenuController">
<div class="menu-element context-menu-wrapper disable-select" ng-controller="ContextMenuController">
<div class="menu context-menu dropdown">
<ul>