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

Merge remote-tracking branch 'nasa/open980' into open1342

Browse Source
This commit is contained in:
Victor Woeltjen
2015-06-25 09:07:27 -07:00
parent 889ca79c5e 6a96f1d395
commit 9ac6abe78f
31 changed files with 14909 additions and 583 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,7 +75,7 @@ $ltGamma: 20%;
$btnFontSizeToH: 0.45;
// User Environment
$ueTopBarH: 30px; // Change to 45px when breadcrumb is enabled
$ueTopBarH: 24px; // Change to when breadcrumb is enabled
$ueTopBarEditH: 30px;
$ueTopBarBtnH: 35px;
$ueFooterH: 20px;
@@ -96,7 +96,7 @@ $ovrFooterH: 40px;
//Items
$ueBrowseGridItemLg: 200px;
$ueBrowseGridItemTopBarH: 20px;
$ueBrowseGridItemBottomBarH: 40px;
$ueBrowseGridItemBottomBarH: 30px;
$colorItemBase: lighten($colorBodyBg, 5%);
$colorItemFg: lighten($colorItemBase, 20%);
$colorItemSelected: $colorKey;
@@ -157,4 +157,9 @@ $bubbleMaxW: 300px;
// Timing
$controlFadeMs: 100ms;
$controlFadeMs: 100ms;
// Forms
$reqSymbolW: 15px;
$reqSymbolM: $interiorMargin * 2;
$reqSymbolFontSize: 0.7em;

17
platform/commonUI/general/res/sass/_icons.scss
View File

@@ -53,8 +53,8 @@
//@include invokeMenu(); // $colorKey
text-shadow: none;
display: inline-block;
font-size: 0.8rem;
vertical-align: middle;
//font-size: 0.8rem;// Normalizing for new icomoon symbols font
//vertical-align: middle;// Normalizing for new icomoon symbols font
}
.btn-menu .invoke-menu,
@@ -72,13 +72,16 @@
.menu .type-icon,
.tree-item .type-icon,
.super-menu.menu .type-icon {
font-size: $menuLineH * 0.8; //.93
line-height: $menuLineH * 1.13;
//font-size: $menuLineH * 0.8; //.93 // Normalizing for new icomoon symbols font
//line-height: $menuLineH * 1.13; // Normalizing for new icomoon symbols font
position: absolute;
}
.super-menu.menu.dropdown .icon {
font-size: $menuLineH * 0.95
.tree-item .type-icon {
font-size: 16px; // 16px is crisp size
}
.super-menu.menu.dropdown .icon {
//font-size: $menuLineH * 0.95 // Normalizing for new icomoon symbols font
}

18
platform/commonUI/general/res/sass/controls/_buttons.scss
View File

@@ -25,22 +25,28 @@ $pad: $interiorMargin * $baseRatio;
/******* LAYOUT AND SIZING */
.btn,
.l-btn {
line-height: 1.25em;
line-height: 1.5em; // Was 1.25em
padding: 0 $pad;
text-decoration: none;
&.lg,
&.create-btn {
$h: $ueTopBarH - $interiorMargin;
$h: $ueTopBarH; // - $interiorMargin;
height: $h;
line-height: $h;
line-height: $h - 2;
//padding: 0 $pad * 6 0 $pad;
padding: 0 $pad * 3;
}
&.create-btn {
&:before {
content:"+";
font-family: symbolsfont;
font-size: 0.8em;
}
.menu {
margin-left: $pad * -1;
}
>.ui-symbol {
font-size: 1.1em;
//font-size: 1.1em; // Normalizing for new icomoon symbols font
}
}
&.sm {
@@ -59,7 +65,7 @@ $pad: $interiorMargin * $baseRatio;
@include box-sizing(border-box);
@include text-shadow(rgba(black, 0.3) 0 1px 1px);
cursor: pointer;
line-height: 1.2em;
//line-height: 1.2em;
text-decoration: none;
&.major {
$bg: $colorKey;
@@ -115,7 +121,7 @@ $pad: $interiorMargin * $baseRatio;
&.labeled {
padding: 0 $pad/2;
.icon {
font-size: 1.5em;
//font-size: 1.5em;
}
.title-label {
margin-left: $interiorMargin;

6
platform/commonUI/general/res/sass/controls/_controls.scss
View File

@@ -186,8 +186,8 @@
.icon:not(.invoke-menu) {
// position: relative;
// top: -0.04em;
font-size: 150%;
vertical-align: middle;
//font-size: 150%;
//vertical-align: middle;
}
}
@@ -361,7 +361,7 @@ label.checkbox.custom {
color: lighten($colorBodyFg, 40%);
}
.type-icon {
font-size: 1.5em;
font-size: 120%;
margin-right: $interiorMargin;
vertical-align: middle;
}

80
platform/commonUI/general/res/sass/controls/_menus.scss
View File

@@ -68,8 +68,17 @@
.super-menu {
$w: 450px;
$h: $w - 20;
$plw: $w * 0.5;
$prw: $w - $plw;
$plw: 50%; //$w * 0.5;
$prw: 50%; //$w - $plw;
$bg: $colorKey;
$fg: $colorKeyFg;
$colorMid: lighten($bg, 25%);
$bgHover: $bg;
@include containerSubtle(darken($bg, 15%), $fg);
display: block;
.icon {
color: $colorMid;
}
width: $w;
height: $h;
.contents {
@@ -78,12 +87,12 @@
.pane {
@include box-sizing(border-box);
&.left {
// @include test();
//@include test();
border-right: 1px solid rgba(white, 0.2);
left: 0;
padding-right: $interiorMargin;
right: auto;
width: $plw !important;
width: $plw;
overflow-x: hidden;
overflow-y: auto;
ul {
@@ -91,10 +100,14 @@
@include border-radius($controlCr);
// @include test(red);
border-top: none;
color: $fg;
// font-size: 0.85em;
// line-height: 20px;
&:hover {
background: $bgHover;
.icon {
color: lighten($bg, 50%);
}
}
.icon {
@include txtShdwSubtle(0.4);
@@ -104,39 +117,40 @@
}
}
&.right {
left: $plw;
//@include test(red);
left: auto;
right: 0;
padding: $interiorMargin * 5;
width: $prw !important;
}
}
}
.menu-item-description {
.desc-area {
// @include test(green);
&.icon {
// @include test(red);
$h: 150px;
position: relative;
color: lighten($bg, 30%);
font-size: 8em;
left: 0;
height: $h;
line-height: $h;
// top: 0; right: 0; bottom: 5em; left: 0;
// height: 5em;
text-align: center;
}
&.description {
color: lighten($bg, 30%);
font-size: 0.8em;
}
&.title {
color: lighten($bg, 60%);
font-size: 1.2em;
margin-bottom: 1rem;
width: $prw;
}
}
.menu-item-description {
.desc-area {
// @include test(green);
&.icon {
//@include test(red);
$h: 150px;
position: relative;
font-size: 8em;
left: 0;
height: $h;
line-height: $h;
margin-bottom: $interiorMargin * 5;
text-align: center;
}
&.title {
color: $fg;
font-size: 1.2em;
margin-bottom: 0.5em;
}
&.description {
//color: lighten($bg, 30%);
color: $fg;
font-size: 0.8em;
line-height: 1.5em;
}
}
}
}
.context-menu {
$bg: lighten($colorBodyBg, 25%);

14
platform/commonUI/general/res/sass/forms/_validation.scss
View File

@@ -20,23 +20,21 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/
.validates {
$symbolW: 15px;
$symbolM: $interiorMargin * 2;
> .label {
// @include test(green, 0.1);
padding-right: $symbolW + $symbolM; // Keep room for validation element
padding-right: $reqSymbolW + $reqSymbolM; // Keep room for validation element
&::after {
// @include test(yellow, 0.3);
display: block;
position: absolute;
top: 0;
right: $symbolM;
right: $reqSymbolM;
bottom: 0;
left: auto;
height: auto;
width: $symbolW;
width: $reqSymbolW;
font-family: symbolsfont;
font-size: 1.1em;
font-size: $reqSymbolFontSize;
text-align: right;
vertical-align: middle;
}
@@ -62,7 +60,9 @@
}
}
}
.req {
font-size: $reqSymbolFontSize;
}
span.req {
color: $colorFormRequired;
}

2
platform/commonUI/general/res/sass/helpers/_splitter.scss
View File

@@ -84,7 +84,7 @@
}
.browse-area .splitter {
top: $ueTopBarH + $interiorMargin;
top: $ueTopBarH + $interiorMarginLg;
}
.edit-area .splitter {

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

@@ -27,23 +27,28 @@
}
.item {
&.grid-item {
//div { @include test() }
$d: $ueBrowseGridItemLg;
$transTime: 200ms;
@include btnSubtle($colorItemBase);
box-sizing: border-box;
cursor: pointer;
float: left;
height: $d;
// padding-bottom: 32%;
width: $d;
margin-bottom: $interiorMarginSm;
margin-right: $interiorMarginSm;
position: relative;
.item-main .item-type {
@include trans-prop-nice("color", $transTime);
}
&:hover .item-main {
.item-type {
color: $colorKey !important;
}
.item-open {
display: block;
//display: block;
opacity: 1;
}
}
.contents {
@@ -70,24 +75,26 @@
}
.item-main {
$h: $ueBrowseGridItemLg;
$lh: $h * 0.9;
// @include test();
div {
// background: rgba(deeppink, 0.2);
}
$lh: $h * 0.8;
//top: $ueBrowseGridItemTopBarH; bottom: $ueBrowseGridItemBottomBarH;
line-height: $lh;
z-index: 1;
.item-type {
color: $colorItemFg;
text-align: center;
font-size: 7em;
line-height: $lh;
font-size: 6em;
//line-height: $lh;
}
.item-open {
// color: lighten($colorItemBase, 15%);
display: none;
font-size: 5em;
line-height: $lh;
left: auto; width: 30px;
//@include test();
@include trans-prop-nice("opacity", $transTime);
opacity: 0;
//display: none;
font-size: 3em;
//line-height: $lh;
left: auto; width: 50px;
pointer-events: none;
text-align: right;
}
}
.title {

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

@@ -50,6 +50,7 @@
.title {
@include ellipsize();
font-size: 1.3em;
margin-bottom: $interiorMargin;
}
.top-bar {

4
platform/commonUI/general/res/sass/tree/_tree.scss
View File

@@ -29,7 +29,7 @@ ul.tree {
@include border-radius($basicCr);
@include single-transition(background-color, 0.25s);
display: block;
font-size: 0.80rem;
font-size: 0.80em;
height: $menuLineH;
line-height: $menuLineH;
margin-bottom: $interiorMarginSm;
@@ -38,7 +38,7 @@ ul.tree {
.view-control {
display: inline-block;
margin-left: $interiorMargin;
// vertical-align: middle;
font-size: 0.75em;
width: $treeVCW;
$runningItemW: $interiorMargin + $treeVCW;
&:hover {

8
platform/commonUI/general/res/sass/user-environ/_bottom-bar.scss
View File

@@ -21,7 +21,7 @@
*****************************************************************************/
.ue-bottom-bar {
color: lighten($colorBodyBg, 30%);
font-size: 0.7em;
font-size: 0.65rem;
line-height: $ueFooterH - 4px;
.status-holder {
@include border-radius($basicCr * 1.75);
@@ -52,9 +52,9 @@
@include box-shadow(inset rgba(black, 0.5) 0 0 3px);
@include text-shadow(rgba(black, 0.3) 0 0 2px);
display: inline-block;
font-size: 1.25em;
vertical-align: middle;
margin-right: $interiorMargin;
//font-size: 1.25em; // Normalized for new wtdsymbols font v2
//vertical-align: middle; // Normalized for new wtdsymbols font v2
margin-right: $interiorMarginSm;
&.ok {
color: #009900;
}

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

@@ -119,10 +119,8 @@
}
.bottom-bar {
@include absPosDefault($bodyMargin);
top: auto;
right: $bodyMargin;
bottom: $bodyMargin;
left: $bodyMargin;
height: $ueFooterH;
.status-holder {
right: $ueAppLogoW + $bodyMargin;
@@ -208,22 +206,18 @@
}
.tree-holder {
overflow: auto;
top: $ueTopBarH + $interiorMargin;
top: $ueTopBarH + $interiorMarginLg;
}
}
&.items {
.object-browse-bar {
// bottom: auto;
.left.abs,
.right.abs {
top: auto;
}
.right.abs {
bottom: $interiorMargin;
}
}
.object-holder {
top: $ueTopBarH + $interiorMargin;
top: $ueTopBarH + $interiorMarginLg;
}
}
&.edit-main {

2
platform/commonUI/general/res/sass/user-environ/_object-browse.scss
View File

@@ -21,7 +21,7 @@
*****************************************************************************/
.object-browse-bar {
height: $ueTopBarH;
//line-height: $ueTopBarBtnH;
line-height: $ueTopBarH;
.items-select {
.btn-menu {
margin-right: $interiorMargin * 3;