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

Merge remote-tracking branch 'nasa/open1163' into open1176

Browse Source 
WTD-1176
This commit is contained in:
Victor Woeltjen
2015-05-06 10:11:01 -07:00
parent 2be2e23847 ac81968f93
commit 4c6cad3e77
13 changed files with 287 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
platform/commonUI/general/res/sass/_fixed-position.scss
View File

@@ -1,17 +1,23 @@
.t-fixed-position {
&.l-fixed-position {
// @include test(red);
// @include test(red);
position: absolute;
top: 0; right: 0; bottom: 0; left: 0;
width: auto; height: auto;
top: 0;
right: 0;
bottom: 0;
left: 0;
width: auto;
height: auto;
.l-grid-holder {
position: relative;
height: 100%; width: 100%;
height: 100%;
width: 100%;
.l-grid {
// @include test(orange);
// @include test(orange);
position: absolute;
height: 100%; width: 100%;
height: 100%;
width: 100%;
pointer-events: none;
z-index: 0;
}
@@ -35,12 +41,13 @@
.l-fixed-position-image,
.l-fixed-position-text {
@include box-sizing(border-box);
height: 100%; width: 100%;
height: 100%;
width: 100%;
}
.l-fixed-position-box {
}
.l-fixed-position-image {
background-size: cover;
background-repeat: no-repeat;
@@ -49,11 +56,11 @@
.l-fixed-position-text {
@include txtShdwSubtle();
border:1px solid transparent;
border: 1px solid transparent;
font-size: 0.8rem;
$p: $interiorMarginSm;
&.l-static-text {
// overflow: auto;
// overflow: auto;
padding: $p;
}
&.l-telemetry {
@@ -66,12 +73,12 @@
left: $p;
}
&.l-value {
// @include test(blue);
// @include test(blue);
right: $p;
left: auto;
text-align: right;
&.telem-only {
// @include test(red);
// @include test(red);
left: $p;
width: auto;
}
@@ -107,8 +114,11 @@
}
.l-fixed-position-item {
&:not(.s-selected):hover {
border: 1px dotted rgba($colorKey, 0.5);
&:not(.s-selected) {
border: 1px dotted rgba($colorKey, 0.75);
&:hover {
border: 1px dotted rgba($colorKey, 1.0);
}
}
}
}

25
platform/commonUI/general/res/sass/_hide-non-functional.scss Normal file
View File

@@ -0,0 +1,25 @@
// Styles to temporarily hide non-functional elements
/******************************** BROWSE */
.browse-mode {
.browse {
&.top-bar {
display: none;
}
}
.browse-area.holder {
// When .browse.top-bar is hidden, set the top of the browse-area holder
top: $interiorMargin;
> .contents.split-layout {
// Don't pad in from top and bottom
//top: 0; bottom: 0;
.object-browse-bar {
.t-btn.key-window {
// Hide the Open in New Window button
display: none;
}
}
}
}
}

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

@@ -41,3 +41,4 @@
@import "properties";
@import "autoflow";
@import "iframe";
@import "hide-non-functional";

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

@@ -1,7 +1,9 @@
.items-holder {
@include clearfix;
overflow-y: auto;
.contents { top: 0; }
.contents {
top: 0;
}
.item {
&.grid-item {
$d: $ueBrowseGridItemLg;
@@ -23,6 +25,9 @@
display: block;
}
}
.contents {
top: $interiorMargin; right: $interiorMargin; bottom: $interiorMargin; left: $interiorMargin;
}
.bar {
&.top-bar.abs {
bottom: auto;

5
platform/commonUI/general/res/sass/overlay/_overlay.scss
View File

@@ -51,6 +51,11 @@
}
}
.contents.l-dialog {
$myM: $interiorMargin;
top: $myM;
right: $myM;
bottom: $myM;
left: $myM;
overflow: auto;
}
}

7
platform/commonUI/general/res/sass/user-environ/_frame.scss
View File

@@ -18,6 +18,13 @@
>.object-holder.abs {
top: $ohH + $interiorMarginSm;
}
.contents {
$myM: $interiorMargin;
top: $myM;
right: $myM;
bottom: $myM;
left: $myM;
}
}
.edit-main .frame.child-frame.panel {

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

@@ -8,57 +8,26 @@
}
}
.holder-all {
$myM: $interiorMarginSm;
top: $myM;
right: $myM;
bottom: $myM;
left: $myM;
}
.browse-area,
.edit-area,
.editor {
@include border-radius($basicCr * 1.5);
position: absolute;
.contents {
// overflow-y: auto;
}
}
.user-environ {
.browse-area,
.edit-area,
.editor {
top: $bodyMargin + $ueTopBarH + ($interiorMargin);
right: $bodyMargin;
bottom: $bodyMargin + $ueFooterH + $interiorMargin;
left: $bodyMargin;
}
.edit-area {
$tbH: $ueEditToolBarH;
.tool-bar {
bottom: auto;
height: $tbH;
line-height: $ueEditToolBarButtonH;
}
.work-area {
top: $tbH + $interiorMargin * 2;
}
}
.bottom-bar {
top: auto;
right: $bodyMargin;
bottom: $bodyMargin;
left: $bodyMargin;
height: $ueFooterH;
.status-holder {
right: $ueAppLogoW + $bodyMargin;
}
.app-logo {
left: auto;
width: $ueAppLogoW;
}
}
.editor {
@include border-radius($basicCr * 1.5);
}
.contents {
$myM: $interiorMargin;
$myM: 0; //$interiorMargin;
box-sizing: border-box;
position: absolute;
top: $myM;
@@ -101,6 +70,52 @@
}
}
.user-environ {
.browse-area,
.edit-area,
.editor {
top: $bodyMargin + $ueTopBarH + ($interiorMargin);
right: $bodyMargin;
bottom: $bodyMargin + $ueFooterH + $interiorMargin;
left: $bodyMargin;
}
.browse-area,
.edit-area {
> .contents {
left: 0;
right: 0;
}
}
.edit-area {
$tbH: $ueEditToolBarH;
.tool-bar {
bottom: auto;
height: $tbH;
line-height: $ueEditToolBarButtonH;
}
.work-area {
top: $tbH + $interiorMargin * 2;
}
}
.bottom-bar {
top: auto;
right: $bodyMargin;
bottom: $bodyMargin;
left: $bodyMargin;
height: $ueFooterH;
.status-holder {
right: $ueAppLogoW + $bodyMargin;
}
.app-logo {
left: auto;
width: $ueAppLogoW;
}
}
}
.cols {
@include clearfix;
.col {

1
platform/commonUI/general/res/sass/user-environ/_top-bar.scss
View File

@@ -5,6 +5,7 @@
&.browse,
&.edit {
border-bottom: 1px solid $colorInteriorBorder;
top: $bodyMargin; right: $bodyMargin; bottom: auto; left: $bodyMargin;
height: $ueTopBarH;
}