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

Merge branch 'mobile_3' into mobile

Browse Source
This commit is contained in:
Shivam Dave 2015-08-06 14:13:13 -07:00
commit 63a99f26f6
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/commonUI/browse/res/templates/items/grid-item.html
View File

@ -26,7 +26,7 @@
<div class='left abs'> <div class='left abs'>
<mct-include key="_checkbox"></mct-include> <mct-include key="_checkbox"></mct-include>
</div> </div>
<div class='right abs'> <div class='right abs mobile-right'>
<div class='ui-symbol icon alert hidden' onclick="alert('Not yet functional. When this is visible, it means that this object needs to be updated. Clicking will allow that action via a dialog.');">!</div> <div class='ui-symbol icon alert hidden' onclick="alert('Not yet functional. When this is visible, it means that this object needs to be updated. Clicking will allow that action via a dialog.');">!</div>
<div class='ui-symbol icon profile' title="Shared">P</div> <div class='ui-symbol icon profile' title="Shared">P</div>
</div> </div>
@ -44,7 +44,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="contents abs mobile-info"> <div class="contents abs mobile-info desktop-hide">
<mct-representation class="contents abs btn s-very-subtle desktop-hide" key="'info-button'" mct-object="domainObject"></mct-representation> <mct-representation class="contents abs btn s-very-subtle desktop-hide" key="'info-button'" mct-object="domainObject"></mct-representation>
</div> </div>
</div> </div>

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

@ -402,16 +402,19 @@
width: 100%; width: 100%;
height: 50px; } height: 50px; }
/* line 74, ../sass/mobile/_item.scss */ /* line 74, ../sass/mobile/_item.scss */
.items-holder .item.grid-item .mobile-right {
top: 100%; }
/* line 77, ../sass/mobile/_item.scss */
.items-holder .item.grid-item .mobile-info { .items-holder .item.grid-item .mobile-info {
line-height: 25px; } line-height: 25px; }
/* line 78, ../sass/mobile/_item.scss */ /* line 81, ../sass/mobile/_item.scss */
.items-holder .item.grid-item .item-main .item-type { .items-holder .item.grid-item .item-main .item-type {
line-height: 40px; } line-height: 40px; }
/* line 82, ../sass/mobile/_item.scss */ /* line 85, ../sass/mobile/_item.scss */
.items-holder .item.grid-item .title { .items-holder .item.grid-item .title {
margin-right: 10px; margin-right: 10px;
line-height: 25px; } line-height: 25px; }
/* line 86, ../sass/mobile/_item.scss */ /* line 89, ../sass/mobile/_item.scss */
.items-holder .item.grid-item .details { .items-holder .item.grid-item .details {
margin-right: 10px; margin-right: 10px;
line-height: 0px; } } line-height: 0px; } }
@ -420,18 +423,21 @@
.items-holder .item.grid-item { .items-holder .item.grid-item {
width: 100%; width: 100%;
height: 66.66667px; } height: 66.66667px; }
/* line 96, ../sass/mobile/_item.scss */ /* line 99, ../sass/mobile/_item.scss */
.items-holder .item.grid-item .mobile-right {
top: 100%; }
/* line 103, ../sass/mobile/_item.scss */
.items-holder .item.grid-item .mobile-info { .items-holder .item.grid-item .mobile-info {
line-height: 38px; } line-height: 38px; }
/* line 100, ../sass/mobile/_item.scss */ /* line 107, ../sass/mobile/_item.scss */
.items-holder .item.grid-item .item-main .item-type { .items-holder .item.grid-item .item-main .item-type {
font-size: 30px; font-size: 30px;
line-height: 50px; } line-height: 50px; }
/* line 105, ../sass/mobile/_item.scss */ /* line 112, ../sass/mobile/_item.scss */
.items-holder .item.grid-item .title { .items-holder .item.grid-item .title {
margin-right: 10px; margin-right: 10px;
line-height: 38px; } line-height: 38px; }
/* line 109, ../sass/mobile/_item.scss */ /* line 116, ../sass/mobile/_item.scss */
.items-holder .item.grid-item .details { .items-holder .item.grid-item .details {
margin-right: 10px; margin-right: 10px;
line-height: 0px; } } line-height: 0px; } }

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

@ -71,6 +71,9 @@
$dHei: $phone-itemHeight; $dHei: $phone-itemHeight;
width: $dWid; width: $dWid;
height: $dHei; height: $dHei;
.mobile-right {
top: 100%;
}
.mobile-info { .mobile-info {
line-height: $phone-itemHeight * .5; line-height: $phone-itemHeight * .5;
} }
@ -93,6 +96,10 @@
$dHei: $tablet-itemHeight; $dHei: $tablet-itemHeight;
width: $dWid; width: $dWid;
height: $dHei; height: $dHei;
.mobile-right {
top: 100%;
}
.mobile-info { .mobile-info {
line-height: $tablet-itemHeight * .57; line-height: $tablet-itemHeight * .57;
} }