ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-18 10:46:42 +00:00
Code Issues Actions 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
commit 4c6cad3e77
13 changed files with 287 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/commonUI/browse/res/templates/browse.html
View File

@ -1,6 +1,6 @@
<div content="jquery-wrapper" class="abs holder-all browse-mode"> <div content="jquery-wrapper" class="abs holder-all browse-mode">
<mct-include key="'topbar-browse'"></mct-include> <mct-include key="'topbar-browse'"></mct-include>
<div class="holder browse-area outline abs" ng-controller="BrowseController"> <div class="holder browse-area s-browse-area abs" ng-controller="BrowseController">
<div class='split-layout vertical contents abs' <div class='split-layout vertical contents abs'
ng-controller="SplitPaneController as splitter"> ng-controller="SplitPaneController as splitter">
<div class='split-pane-component treeview pane' <div class='split-pane-component treeview pane'

2
platform/commonUI/edit/res/templates/edit-object.html
View File

@ -2,7 +2,7 @@
mct-object="domainObject" mct-object="domainObject"
ng-model="representation"> ng-model="representation">
</mct-representation> </mct-representation>
<div class="holder edit-area outline abs" <div class="holder edit-area abs"
ng-controller="SplitPaneController as vSplitter"> ng-controller="SplitPaneController as vSplitter">
<mct-toolbar name="mctToolbar" <mct-toolbar name="mctToolbar"
structure="toolbar.structure" structure="toolbar.structure"

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

@ -6,7 +6,7 @@
/* line 4, ../sass/items/_item.scss */ /* line 4, ../sass/items/_item.scss */
.items-holder .contents { .items-holder .contents {
top: 0; } top: 0; }
/* line 6, ../sass/items/_item.scss */ /* line 8, ../sass/items/_item.scss */
.items-holder .item.grid-item { .items-holder .item.grid-item {
background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #595959), color-stop(100%, #4d4d4d)); background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #595959), color-stop(100%, #4d4d4d));
background-image: -webkit-linear-gradient(#595959, #4d4d4d); background-image: -webkit-linear-gradient(#595959, #4d4d4d);
@ -43,56 +43,62 @@
background-image: -moz-linear-gradient(#737373, #595959); background-image: -moz-linear-gradient(#737373, #595959);
background-image: -o-linear-gradient(#737373, #595959); background-image: -o-linear-gradient(#737373, #595959);
background-image: linear-gradient(#737373, #595959); } background-image: linear-gradient(#737373, #595959); }
/* line 19, ../sass/items/_item.scss */ /* line 21, ../sass/items/_item.scss */
.items-holder .item.grid-item:hover .item-main .item-type { .items-holder .item.grid-item:hover .item-main .item-type {
color: #0099cc !important; } color: #0099cc !important; }
/* line 22, ../sass/items/_item.scss */ /* line 24, ../sass/items/_item.scss */
.items-holder .item.grid-item:hover .item-main .item-open { .items-holder .item.grid-item:hover .item-main .item-open {
display: block; } display: block; }
/* line 27, ../sass/items/_item.scss */ /* line 28, ../sass/items/_item.scss */
.items-holder .item.grid-item .contents {
top: 5px;
right: 5px;
bottom: 5px;
left: 5px; }
/* line 32, ../sass/items/_item.scss */
.items-holder .item.grid-item .bar.top-bar.abs { .items-holder .item.grid-item .bar.top-bar.abs {
bottom: auto; bottom: auto;
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;
z-index: 5; } z-index: 5; }
/* line 32, ../sass/items/_item.scss */ /* line 37, ../sass/items/_item.scss */
.items-holder .item.grid-item .bar.top-bar.abs .left, .items-holder .item.grid-item .bar.top-bar.abs .right { .items-holder .item.grid-item .bar.top-bar.abs .left, .items-holder .item.grid-item .bar.top-bar.abs .right {
width: auto; } width: auto; }
/* line 34, ../sass/items/_item.scss */ /* line 39, ../sass/items/_item.scss */
.items-holder .item.grid-item .bar.top-bar.abs .left .icon, .items-holder .item.grid-item .bar.top-bar.abs .right .icon { .items-holder .item.grid-item .bar.top-bar.abs .left .icon, .items-holder .item.grid-item .bar.top-bar.abs .right .icon {
margin-left: 5px; } margin-left: 5px; }
/* line 39, ../sass/items/_item.scss */ /* line 44, ../sass/items/_item.scss */
.items-holder .item.grid-item .bar.bottom-bar.abs { .items-holder .item.grid-item .bar.bottom-bar.abs {
top: auto; top: auto;
height: 40px; height: 40px;
padding: 5px; } padding: 5px; }
/* line 45, ../sass/items/_item.scss */ /* line 50, ../sass/items/_item.scss */
.items-holder .item.grid-item .item-main { .items-holder .item.grid-item .item-main {
z-index: 1; } z-index: 1; }
/* line 53, ../sass/items/_item.scss */ /* line 58, ../sass/items/_item.scss */
.items-holder .item.grid-item .item-main .item-type { .items-holder .item.grid-item .item-main .item-type {
color: #737373; color: #737373;
text-align: center; text-align: center;
font-size: 7em; font-size: 7em;
line-height: 180px; } line-height: 180px; }
/* line 59, ../sass/items/_item.scss */ /* line 64, ../sass/items/_item.scss */
.items-holder .item.grid-item .item-main .item-open { .items-holder .item.grid-item .item-main .item-open {
display: none; display: none;
font-size: 5em; font-size: 5em;
line-height: 180px; line-height: 180px;
left: auto; left: auto;
width: 30px; } width: 30px; }
/* line 67, ../sass/items/_item.scss */ /* line 72, ../sass/items/_item.scss */
.items-holder .item.grid-item .title { .items-holder .item.grid-item .title {
text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px;
color: #cccccc; color: #cccccc;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; } text-overflow: ellipsis; }
/* line 75, ../sass/items/_item.scss */ /* line 80, ../sass/items/_item.scss */
.items-holder .item.grid-item .details { .items-holder .item.grid-item .details {
font-size: 0.8em; } font-size: 0.8em; }
/* line 78, ../sass/items/_item.scss */ /* line 83, ../sass/items/_item.scss */
.items-holder .item.grid-item.selected { .items-holder .item.grid-item.selected {
background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #00bfff), color-stop(100%, #00ace6)); background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #00bfff), color-stop(100%, #00ace6));
background-image: -webkit-linear-gradient(#00bfff, #00ace6); background-image: -webkit-linear-gradient(#00bfff, #00ace6);
@ -127,15 +133,15 @@
background-image: -moz-linear-gradient(#66d9ff, #00bfff); background-image: -moz-linear-gradient(#66d9ff, #00bfff);
background-image: -o-linear-gradient(#66d9ff, #00bfff); background-image: -o-linear-gradient(#66d9ff, #00bfff);
background-image: linear-gradient(#66d9ff, #00bfff); } background-image: linear-gradient(#66d9ff, #00bfff); }
/* line 83, ../sass/items/_item.scss */ /* line 88, ../sass/items/_item.scss */
.items-holder .item.grid-item.selected .item-type, .items-holder .item.grid-item.selected .top-bar .icon:not(.alert) { .items-holder .item.grid-item.selected .item-type, .items-holder .item.grid-item.selected .top-bar .icon:not(.alert) {
color: #80dfff; } color: #80dfff; }
/* line 84, ../sass/items/_item.scss */ /* line 89, ../sass/items/_item.scss */
.items-holder .item.grid-item.selected .item-main .item-open { .items-holder .item.grid-item.selected .item-main .item-open {
color: #80dfff; } color: #80dfff; }
/* line 85, ../sass/items/_item.scss */ /* line 90, ../sass/items/_item.scss */
.items-holder .item.grid-item.selected .title { .items-holder .item.grid-item.selected .title {
color: white; } color: white; }
/* line 87, ../sass/items/_item.scss */ /* line 92, ../sass/items/_item.scss */
.items-holder .item.grid-item.selected:hover .item-main .item-type { .items-holder .item.grid-item.selected:hover .item-main .item-type {
color: white !important; } color: white !important; }

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

@ -203,76 +203,55 @@ span {
.ui-symbol { .ui-symbol {
font-family: 'symbolsfont'; } font-family: 'symbolsfont'; }
/* line 13, ../sass/user-environ/_layout.scss */ /* line 11, ../sass/user-environ/_layout.scss */
.holder-all {
top: 3px;
right: 3px;
bottom: 3px;
left: 3px; }
/* line 21, ../sass/user-environ/_layout.scss */
.browse-area, .browse-area,
.edit-area, .edit-area,
.editor {
position: absolute; }
/* line 25, ../sass/user-environ/_layout.scss */
.editor { .editor {
-webkit-border-radius: 4.5px; -webkit-border-radius: 4.5px;
-moz-border-radius: 4.5px; -moz-border-radius: 4.5px;
-ms-border-radius: 4.5px; -ms-border-radius: 4.5px;
-o-border-radius: 4.5px; -o-border-radius: 4.5px;
border-radius: 4.5px; border-radius: 4.5px; }
position: absolute; }
/* line 24, ../sass/user-environ/_layout.scss */ /* line 29, ../sass/user-environ/_layout.scss */
.user-environ .browse-area,
.user-environ .edit-area,
.user-environ .editor {
top: 45px;
right: 5px;
bottom: 30px;
left: 5px; }
/* line 33, ../sass/user-environ/_layout.scss */
.user-environ .edit-area .tool-bar {
bottom: auto;
height: 35px;
line-height: 28px; }
/* line 38, ../sass/user-environ/_layout.scss */
.user-environ .edit-area .work-area {
top: 45px; }
/* line 43, ../sass/user-environ/_layout.scss */
.user-environ .bottom-bar {
top: auto;
right: 5px;
bottom: 5px;
left: 5px;
height: 20px; }
/* line 49, ../sass/user-environ/_layout.scss */
.user-environ .bottom-bar .status-holder {
right: 110px; }
/* line 52, ../sass/user-environ/_layout.scss */
.user-environ .bottom-bar .app-logo {
left: auto;
width: 105px; }
/* line 60, ../sass/user-environ/_layout.scss */
.contents { .contents {
box-sizing: border-box; box-sizing: border-box;
position: absolute; position: absolute;
top: 5px; top: 0;
right: 5px; right: 0;
bottom: 5px; bottom: 0;
left: 5px; } left: 0; }
/* line 68, ../sass/user-environ/_layout.scss */ /* line 37, ../sass/user-environ/_layout.scss */
.contents.nomargin { .contents.nomargin {
right: 0px; right: 0px;
bottom: 0px; bottom: 0px;
left: 0px; } left: 0px; }
/* line 77, ../sass/user-environ/_layout.scss */ /* line 46, ../sass/user-environ/_layout.scss */
.bar .icon.major { .bar .icon.major {
margin-right: 5px; } margin-right: 5px; }
/* line 80, ../sass/user-environ/_layout.scss */ /* line 49, ../sass/user-environ/_layout.scss */
.bar.abs, .btn-menu span.bar.l-click-area { .bar.abs, .btn-menu span.bar.l-click-area {
text-wrap: none; text-wrap: none;
white-space: nowrap; } white-space: nowrap; }
/* line 84, ../sass/user-environ/_layout.scss */ /* line 53, ../sass/user-environ/_layout.scss */
.bar.abs.left, .btn-menu span.bar.left.l-click-area, .bar.abs.left, .btn-menu span.bar.left.l-click-area,
.bar.abs .left, .bar.abs .left,
.btn-menu span.bar.l-click-area .left { .btn-menu span.bar.l-click-area .left {
width: 45%; width: 45%;
right: auto; } right: auto; }
/* line 89, ../sass/user-environ/_layout.scss */ /* line 58, ../sass/user-environ/_layout.scss */
.bar.abs.right, .btn-menu span.bar.right.l-click-area, .bar.abs.right, .btn-menu span.bar.right.l-click-area,
.bar.abs .right, .bar.abs .right,
.btn-menu span.bar.l-click-area .right { .btn-menu span.bar.l-click-area .right {
@ -280,17 +259,53 @@ span {
left: auto; left: auto;
right: 0; right: 0;
text-align: right; } text-align: right; }
/* line 94, ../sass/user-environ/_layout.scss */ /* line 63, ../sass/user-environ/_layout.scss */
.bar.abs.right .icon.major, .btn-menu span.bar.right.l-click-area .icon.major, .bar.abs.right .icon.major, .btn-menu span.bar.right.l-click-area .icon.major,
.bar.abs .right .icon.major, .bar.abs .right .icon.major,
.btn-menu span.bar.l-click-area .right .icon.major { .btn-menu span.bar.l-click-area .right .icon.major {
margin-left: 15px; } margin-left: 15px; }
/* line 104, ../sass/user-environ/_layout.scss */ /* line 76, ../sass/user-environ/_layout.scss */
.user-environ .browse-area,
.user-environ .edit-area,
.user-environ .editor {
top: 45px;
right: 5px;
bottom: 30px;
left: 5px; }
/* line 85, ../sass/user-environ/_layout.scss */
.user-environ .browse-area > .contents,
.user-environ .edit-area > .contents {
left: 0;
right: 0; }
/* line 93, ../sass/user-environ/_layout.scss */
.user-environ .edit-area .tool-bar {
bottom: auto;
height: 35px;
line-height: 28px; }
/* line 98, ../sass/user-environ/_layout.scss */
.user-environ .edit-area .work-area {
top: 45px; }
/* line 103, ../sass/user-environ/_layout.scss */
.user-environ .bottom-bar {
top: auto;
right: 5px;
bottom: 5px;
left: 5px;
height: 20px; }
/* line 109, ../sass/user-environ/_layout.scss */
.user-environ .bottom-bar .status-holder {
right: 110px; }
/* line 112, ../sass/user-environ/_layout.scss */
.user-environ .bottom-bar .app-logo {
left: auto;
width: 105px; }
/* line 119, ../sass/user-environ/_layout.scss */
.cols { .cols {
overflow: hidden; overflow: hidden;
*zoom: 1; } *zoom: 1; }
/* line 106, ../sass/user-environ/_layout.scss */ /* line 121, ../sass/user-environ/_layout.scss */
.cols .col { .cols .col {
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
@ -301,89 +316,89 @@ span {
margin-left: 1.5%; margin-left: 1.5%;
padding-left: 5px; padding-left: 5px;
position: relative; } position: relative; }
/* line 114, ../sass/user-environ/_layout.scss */ /* line 129, ../sass/user-environ/_layout.scss */
.cols .col:first-child { .cols .col:first-child {
margin-left: 0; margin-left: 0;
padding-left: 0; } padding-left: 0; }
/* line 121, ../sass/user-environ/_layout.scss */ /* line 136, ../sass/user-environ/_layout.scss */
.cols.cols-2 .col-1 { .cols.cols-2 .col-1 {
min-width: 250px; min-width: 250px;
width: 48.5%; } width: 48.5%; }
/* line 127, ../sass/user-environ/_layout.scss */ /* line 142, ../sass/user-environ/_layout.scss */
.cols.cols-2-ff .col-100px { .cols.cols-2-ff .col-100px {
width: 100px; } width: 100px; }
/* line 134, ../sass/user-environ/_layout.scss */ /* line 149, ../sass/user-environ/_layout.scss */
.cols.cols-6 .col-1 { .cols.cols-6 .col-1 {
min-width: 83.33333px; min-width: 83.33333px;
width: 15.16667%; } width: 15.16667%; }
/* line 140, ../sass/user-environ/_layout.scss */ /* line 155, ../sass/user-environ/_layout.scss */
.cols.cols-16 .col-1 { .cols.cols-16 .col-1 {
min-width: 31.25px; min-width: 31.25px;
width: 4.75%; } width: 4.75%; }
/* line 143, ../sass/user-environ/_layout.scss */ /* line 158, ../sass/user-environ/_layout.scss */
.cols.cols-16 .col-2 { .cols.cols-16 .col-2 {
min-width: 62.5px; min-width: 62.5px;
width: 11%; } width: 11%; }
/* line 146, ../sass/user-environ/_layout.scss */ /* line 161, ../sass/user-environ/_layout.scss */
.cols.cols-16 .col-7 { .cols.cols-16 .col-7 {
min-width: 218.75px; min-width: 218.75px;
width: 42.25%; } width: 42.25%; }
/* line 152, ../sass/user-environ/_layout.scss */ /* line 167, ../sass/user-environ/_layout.scss */
.cols.cols-32 .col-2 { .cols.cols-32 .col-2 {
min-width: 31.25px; min-width: 31.25px;
width: 4.75%; } width: 4.75%; }
/* line 155, ../sass/user-environ/_layout.scss */ /* line 170, ../sass/user-environ/_layout.scss */
.cols.cols-32 .col-15 { .cols.cols-32 .col-15 {
min-width: 234.375px; min-width: 234.375px;
width: 45.375%; } width: 45.375%; }
/* line 159, ../sass/user-environ/_layout.scss */ /* line 174, ../sass/user-environ/_layout.scss */
.cols .l-row { .cols .l-row {
overflow: hidden; overflow: hidden;
*zoom: 1; *zoom: 1;
padding: 5px 0; } padding: 5px 0; }
/* line 165, ../sass/user-environ/_layout.scss */ /* line 180, ../sass/user-environ/_layout.scss */
.pane { .pane {
position: absolute; } position: absolute; }
/* line 168, ../sass/user-environ/_layout.scss */ /* line 183, ../sass/user-environ/_layout.scss */
.pane.treeview .create-btn-holder { .pane.treeview .create-btn-holder {
bottom: auto; bottom: auto;
height: 35px; } height: 35px; }
/* line 171, ../sass/user-environ/_layout.scss */ /* line 186, ../sass/user-environ/_layout.scss */
.pane.treeview .tree-holder { .pane.treeview .tree-holder {
overflow: auto; overflow: auto;
top: 40px; } top: 40px; }
/* line 180, ../sass/user-environ/_layout.scss */ /* line 195, ../sass/user-environ/_layout.scss */
.pane.items .object-holder { .pane.items .object-holder {
top: 40px; } top: 40px; }
/* line 185, ../sass/user-environ/_layout.scss */ /* line 200, ../sass/user-environ/_layout.scss */
.pane.edit-main .object-holder { .pane.edit-main .object-holder {
top: 0; } top: 0; }
/* line 191, ../sass/user-environ/_layout.scss */ /* line 206, ../sass/user-environ/_layout.scss */
.pane .object-holder { .pane .object-holder {
overflow: auto; } overflow: auto; }
/* line 199, ../sass/user-environ/_layout.scss */ /* line 214, ../sass/user-environ/_layout.scss */
.split-layout.horizontal > .pane { .split-layout.horizontal > .pane {
margin-top: 5px; } margin-top: 5px; }
/* line 202, ../sass/user-environ/_layout.scss */ /* line 217, ../sass/user-environ/_layout.scss */
.split-layout.horizontal > .pane:first-child { .split-layout.horizontal > .pane:first-child {
margin-top: 0; } margin-top: 0; }
/* line 209, ../sass/user-environ/_layout.scss */ /* line 224, ../sass/user-environ/_layout.scss */
.split-layout.vertical > .pane { .split-layout.vertical > .pane {
margin-left: 5px; } margin-left: 5px; }
/* line 211, ../sass/user-environ/_layout.scss */ /* line 226, ../sass/user-environ/_layout.scss */
.split-layout.vertical > .pane > .holder { .split-layout.vertical > .pane > .holder {
left: 0; left: 0;
right: 0; } right: 0; }
/* line 215, ../sass/user-environ/_layout.scss */ /* line 230, ../sass/user-environ/_layout.scss */
.split-layout.vertical > .pane:first-child { .split-layout.vertical > .pane:first-child {
margin-left: 0; } margin-left: 0; }
/* line 217, ../sass/user-environ/_layout.scss */ /* line 232, ../sass/user-environ/_layout.scss */
.split-layout.vertical > .pane:first-child .holder { .split-layout.vertical > .pane:first-child .holder {
right: 5px; } right: 5px; }
/* line 226, ../sass/user-environ/_layout.scss */ /* line 241, ../sass/user-environ/_layout.scss */
.vscroll { .vscroll {
overflow-y: auto; } overflow-y: auto; }
@ -396,33 +411,33 @@ span {
left: 0; left: 0;
width: auto; width: auto;
height: auto; } height: auto; }
/* line 8, ../sass/_fixed-position.scss */ /* line 12, ../sass/_fixed-position.scss */
.t-fixed-position.l-fixed-position .l-grid-holder { .t-fixed-position.l-fixed-position .l-grid-holder {
position: relative; position: relative;
height: 100%; height: 100%;
width: 100%; } width: 100%; }
/* line 11, ../sass/_fixed-position.scss */ /* line 16, ../sass/_fixed-position.scss */
.t-fixed-position.l-fixed-position .l-grid-holder .l-grid { .t-fixed-position.l-fixed-position .l-grid-holder .l-grid {
position: absolute; position: absolute;
height: 100%; height: 100%;
width: 100%; width: 100%;
pointer-events: none; pointer-events: none;
z-index: 0; } z-index: 0; }
/* line 21, ../sass/_fixed-position.scss */ /* line 27, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-item { .t-fixed-position .l-fixed-position-item {
position: absolute; position: absolute;
border: 1px solid transparent; } border: 1px solid transparent; }
/* line 25, ../sass/_fixed-position.scss */ /* line 31, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-item.s-selected { .t-fixed-position .l-fixed-position-item.s-selected {
-webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; -webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px;
-moz-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; -moz-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px;
box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px;
border-color: #0099cc; border-color: #0099cc;
cursor: move; } cursor: move; }
/* line 30, ../sass/_fixed-position.scss */ /* line 36, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-item.s-not-selected { .t-fixed-position .l-fixed-position-item.s-not-selected {
opacity: 0.8; } opacity: 0.8; }
/* line 36, ../sass/_fixed-position.scss */ /* line 42, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-item .l-fixed-position-box, .t-fixed-position .l-fixed-position-item .l-fixed-position-box,
.t-fixed-position .l-fixed-position-item .l-fixed-position-image, .t-fixed-position .l-fixed-position-item .l-fixed-position-image,
.t-fixed-position .l-fixed-position-item .l-fixed-position-text { .t-fixed-position .l-fixed-position-item .l-fixed-position-text {
@ -431,20 +446,20 @@ span {
box-sizing: border-box; box-sizing: border-box;
height: 100%; height: 100%;
width: 100%; } width: 100%; }
/* line 44, ../sass/_fixed-position.scss */ /* line 51, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-item .l-fixed-position-image { .t-fixed-position .l-fixed-position-item .l-fixed-position-image {
background-size: cover; background-size: cover;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; } background-position: center; }
/* line 50, ../sass/_fixed-position.scss */ /* line 57, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-item .l-fixed-position-text { .t-fixed-position .l-fixed-position-item .l-fixed-position-text {
text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px;
border: 1px solid transparent; border: 1px solid transparent;
font-size: 0.8rem; } font-size: 0.8rem; }
/* line 55, ../sass/_fixed-position.scss */ /* line 62, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-static-text { .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-static-text {
padding: 3px; } padding: 3px; }
/* line 60, ../sass/_fixed-position.scss */ /* line 67, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem { .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem {
overflow: hidden; overflow: hidden;
position: absolute; position: absolute;
@ -458,43 +473,46 @@ span {
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
width: 50%; } width: 50%; }
/* line 64, ../sass/_fixed-position.scss */ /* line 71, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-title { .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-title {
right: auto; right: auto;
left: 3px; } left: 3px; }
/* line 68, ../sass/_fixed-position.scss */ /* line 75, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-value { .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-value {
right: 3px; right: 3px;
left: auto; left: auto;
text-align: right; } text-align: right; }
/* line 73, ../sass/_fixed-position.scss */ /* line 80, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-value.telem-only { .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-value.telem-only {
left: 3px; left: 3px;
width: auto; } width: auto; }
/* line 84, ../sass/_fixed-position.scss */ /* line 91, ../sass/_fixed-position.scss */
.t-fixed-position .l-fixed-position-item-handle { .t-fixed-position .l-fixed-position-item-handle {
background: rgba(0, 153, 204, 0.5); background: rgba(0, 153, 204, 0.5);
cursor: crosshair; cursor: crosshair;
border: 1px solid #0099cc; border: 1px solid #0099cc;
position: absolute; } position: absolute; }
/* line 98, ../sass/_fixed-position.scss */ /* line 105, ../sass/_fixed-position.scss */
.edit-mode .t-fixed-position.l-fixed-position .l-grid-holder .l-grid.l-grid-x { .edit-mode .t-fixed-position.l-fixed-position .l-grid-holder .l-grid.l-grid-x {
background-image: -webkit-linear-gradient(90deg, rgba(255, 255, 255, 0.05) 1px, transparent 1px, transparent 100%); background-image: -webkit-linear-gradient(90deg, rgba(255, 255, 255, 0.05) 1px, transparent 1px, transparent 100%);
background-image: -moz-linear-gradient(90deg, rgba(255, 255, 255, 0.05) 1px, transparent 1px, transparent 100%); background-image: -moz-linear-gradient(90deg, rgba(255, 255, 255, 0.05) 1px, transparent 1px, transparent 100%);
background-image: -o-linear-gradient(90deg, rgba(255, 255, 255, 0.05) 1px, transparent 1px, transparent 100%); background-image: -o-linear-gradient(90deg, rgba(255, 255, 255, 0.05) 1px, transparent 1px, transparent 100%);
background-image: linear-gradient(90deg, rgba(255, 255, 255, 0.05) 1px, transparent 1px, transparent 100%); background-image: linear-gradient(90deg, rgba(255, 255, 255, 0.05) 1px, transparent 1px, transparent 100%);
background-repeat: repeat-x; } background-repeat: repeat-x; }
/* line 102, ../sass/_fixed-position.scss */ /* line 109, ../sass/_fixed-position.scss */
.edit-mode .t-fixed-position.l-fixed-position .l-grid-holder .l-grid.l-grid-y { .edit-mode .t-fixed-position.l-fixed-position .l-grid-holder .l-grid.l-grid-y {
background-image: -webkit-linear-gradient(0deg, rgba(255, 255, 255, 0.05) 1px, transparent 1px, transparent 100%); background-image: -webkit-linear-gradient(0deg, rgba(255, 255, 255, 0.05) 1px, transparent 1px, transparent 100%);
background-image: -moz-linear-gradient(0deg, rgba(255, 255, 255, 0.05) 1px, transparent 1px, transparent 100%); background-image: -moz-linear-gradient(0deg, rgba(255, 255, 255, 0.05) 1px, transparent 1px, transparent 100%);
background-image: -o-linear-gradient(0deg, rgba(255, 255, 255, 0.05) 1px, transparent 1px, transparent 100%); background-image: -o-linear-gradient(0deg, rgba(255, 255, 255, 0.05) 1px, transparent 1px, transparent 100%);
background-image: linear-gradient(0deg, rgba(255, 255, 255, 0.05) 1px, transparent 1px, transparent 100%); background-image: linear-gradient(0deg, rgba(255, 255, 255, 0.05) 1px, transparent 1px, transparent 100%);
background-repeat: repeat-y; } background-repeat: repeat-y; }
/* line 110, ../sass/_fixed-position.scss */ /* line 117, ../sass/_fixed-position.scss */
.edit-mode .t-fixed-position .l-fixed-position-item:not(.s-selected):hover { .edit-mode .t-fixed-position .l-fixed-position-item:not(.s-selected) {
border: 1px dotted rgba(0, 153, 204, 0.5); } border: 1px dotted rgba(0, 153, 204, 0.75); }
/* line 119, ../sass/_fixed-position.scss */
.edit-mode .t-fixed-position .l-fixed-position-item:not(.s-selected):hover {
border: 1px dotted #0099cc; }
/* line 5, ../sass/_about.scss */ /* line 5, ../sass/_about.scss */
.l-about.abs, .btn-menu span.l-about.l-click-area { .l-about.abs, .btn-menu span.l-about.l-click-area {
@ -2573,6 +2591,10 @@ input[type="text"] {
margin-left: 10px; } margin-left: 10px; }
/* line 53, ../sass/overlay/_overlay.scss */ /* line 53, ../sass/overlay/_overlay.scss */
.overlay .contents.l-dialog { .overlay .contents.l-dialog {
top: 5px;
right: 5px;
bottom: 5px;
left: 5px;
overflow: auto; } overflow: auto; }
/* line 4, ../sass/user-environ/_frame.scss */ /* line 4, ../sass/user-environ/_frame.scss */
@ -2589,8 +2611,14 @@ input[type="text"] {
/* line 18, ../sass/user-environ/_frame.scss */ /* line 18, ../sass/user-environ/_frame.scss */
.frame > .object-holder.abs, .btn-menu .frame > span.object-holder.l-click-area { .frame > .object-holder.abs, .btn-menu .frame > span.object-holder.l-click-area {
top: 23px; } top: 23px; }
/* line 21, ../sass/user-environ/_frame.scss */
.frame .contents {
top: 5px;
right: 5px;
bottom: 5px;
left: 5px; }
/* line 24, ../sass/user-environ/_frame.scss */ /* line 31, ../sass/user-environ/_frame.scss */
.edit-main .frame.child-frame.panel:hover { .edit-main .frame.child-frame.panel:hover {
border-color: #0099cc; border-color: #0099cc;
-webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; -webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px;
@ -2602,27 +2630,28 @@ input[type="text"] {
line-height: 35px; } line-height: 35px; }
/* line 7, ../sass/user-environ/_top-bar.scss */ /* line 7, ../sass/user-environ/_top-bar.scss */
.top-bar.browse, .top-bar.edit { .top-bar.browse, .top-bar.edit {
border-bottom: 1px solid #4d4d4d;
top: 5px; top: 5px;
right: 5px; right: 5px;
bottom: auto; bottom: auto;
left: 5px; left: 5px;
height: 35px; } height: 35px; }
/* line 15, ../sass/user-environ/_top-bar.scss */ /* line 16, ../sass/user-environ/_top-bar.scss */
.top-bar .title { .top-bar .title {
color: #fff; } color: #fff; }
/* line 20, ../sass/user-environ/_top-bar.scss */ /* line 21, ../sass/user-environ/_top-bar.scss */
.top-bar .buttons-main { .top-bar .buttons-main {
font-size: 0.8em; font-size: 0.8em;
left: auto; left: auto;
text-align: right; } text-align: right; }
/* line 25, ../sass/user-environ/_top-bar.scss */ /* line 26, ../sass/user-environ/_top-bar.scss */
.top-bar .buttons-main .btn { .top-bar .buttons-main .btn {
margin-left: 5px; } margin-left: 5px; }
/* line 33, ../sass/user-environ/_top-bar.scss */ /* line 34, ../sass/user-environ/_top-bar.scss */
.edit-mode .top-bar .buttons-main { .edit-mode .top-bar .buttons-main {
white-space: nowrap; } white-space: nowrap; }
/* line 37, ../sass/user-environ/_top-bar.scss */ /* line 38, ../sass/user-environ/_top-bar.scss */
.edit-mode .top-bar .buttons-main.abs, .edit-mode .top-bar .btn-menu span.buttons-main.l-click-area, .btn-menu .edit-mode .top-bar span.buttons-main.l-click-area { .edit-mode .top-bar .buttons-main.abs, .edit-mode .top-bar .btn-menu span.buttons-main.l-click-area, .btn-menu .edit-mode .top-bar span.buttons-main.l-click-area {
bottom: auto; bottom: auto;
left: auto; } left: auto; }
@ -3104,3 +3133,14 @@ input[type="text"] {
display: block; display: block;
height: 100%; height: 100%;
width: 100%; } width: 100%; }
/******************************** BROWSE */
/* line 6, ../sass/_hide-non-functional.scss */
.browse-mode .browse.top-bar {
display: none; }
/* line 11, ../sass/_hide-non-functional.scss */
.browse-mode .browse-area.holder {
top: 5px; }
/* line 18, ../sass/_hide-non-functional.scss */
.browse-mode .browse-area.holder > .contents.split-layout .object-browse-bar .t-btn.key-window {
display: none; }

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

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

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

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

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

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

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

@ -18,6 +18,13 @@
>.object-holder.abs { >.object-holder.abs {
top: $ohH + $interiorMarginSm; top: $ohH + $interiorMarginSm;
} }
.contents {
$myM: $interiorMargin;
top: $myM;
right: $myM;
bottom: $myM;
left: $myM;
}
} }
.edit-main .frame.child-frame.panel { .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, .browse-area,
.edit-area, .edit-area,
.editor { .editor {
@include border-radius($basicCr * 1.5);
position: absolute; position: absolute;
.contents {
// overflow-y: auto;
}
} }
.user-environ { .editor {
.browse-area, @include border-radius($basicCr * 1.5);
.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;
}
}
} }
.contents { .contents {
$myM: $interiorMargin; $myM: 0; //$interiorMargin;
box-sizing: border-box; box-sizing: border-box;
position: absolute; position: absolute;
top: $myM; 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 { .cols {
@include clearfix; @include clearfix;
.col { .col {

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

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

2
platform/commonUI/general/res/templates/controls/action-button.html
View File

@ -1,4 +1,4 @@
<a class="t-btn l-btn s-btn s-icon-btn s-very-subtle" <a class="t-btn l-btn s-btn s-icon-btn s-very-subtle key-{{parameters.action.getMetadata().key}}"
ng-class="{ labeled: parameters.labeled }" ng-class="{ labeled: parameters.labeled }"
title="{{parameters.action.getMetadata().description}}" title="{{parameters.action.getMetadata().description}}"
ng-click="parameters.action.perform()"> ng-click="parameters.action.perform()">