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

[Frontend] Sanding and polishing on common front-end elements

Browse Source 
WTD-1048
Originally did a lot of this work in warp1048 by mistake
This commit pulls in all /platform-only changes from that branch
Mods are mostly related to WTD-1046 specifically, but also touch toolbar and buttons
This commit is contained in:
Charles Hacskaylo
2015-03-20 16:37:42 -07:00
parent 988f539ee1
commit 8018c8f42e
14 changed files with 399 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,102 +1,127 @@
ul.tree {
@include menuUlReset();
li {
.tree-item {
// @include test();
@include border-radius($basicCr);
@include single-transition(background-color, 0.25s);
display: block;
font-size: 0.80rem;
height: $menuLineH;
line-height: $menuLineH;
margin-bottom: $interiorMarginSm;
// overflow: hidden;
// padding: 2px 4px 2px 7px;
position: relative;
// white-space: nowrap;
&.loading {
color: darken($colorBodyFg, 20%);
font-style: italic;
.wait-spinner {
margin-left: 14px;
}
}
&:not(.loading) {
cursor: pointer;
&:hover {
background: lighten($colorBodyBg, 5%);
color: lighten($colorBodyFg, 20%);
.context-trigger {
display: block;
}
.icon {
color: $colorItemTreeIconHover;
}
}
}
.selected {
color: #fff;
}
.view-control {
// @include test();
display: inline-block;
// margin-right: $interiorMargin;
// vertical-align: middle;
width: $treeVCW;
&:hover {
color: $colorItemTreeVCHover;
}
}
.context-trigger {
$h: 0.9rem;
display: none;
top: -1px;
position: absolute;
right: $interiorMarginSm;
.btn-invoke-menu {
font-size: 0.75em;
height: $h;
line-height: $h;
}
}
.icon {
// @include test();
@include txtShdwSubtle(0.6);
color: $colorItemTreeIcon;
left: $treeVCW + $interiorMargin;
.alert {
@include txtShdwSubtle(0.3);
background: $colorBodyBg;
color: $colorAlert;
font-size: 0.7em;
margin-top: -3px;
top: 0;
right: auto;
bottom: auto;
left: 9px;
height: auto;
width: auto;
position: absolute;
z-index: 2;
}
}
.title-label {
// @include test();
display: block;
position: absolute;
top: 0;
left: $treeVCW + $treeTypeIconW + ($interiorMargin * 2); //38px;
// right: $treeContextTriggerW + $interiorMargin; //Disabling as context trigger not being used
right: 0;
overflow: hidden;
text-overflow: ellipsis;
height: $menuLineH;
bottom: auto;
white-space: nowrap;
}
}
}
ul.tree {
margin-left: $treeVCW + $interiorMargin;
}
@include menuUlReset();
li {
display: block;
position: relative;
span.tree-item {
$runningItemW: 0;
@include border-radius($basicCr);
@include single-transition(background-color, 0.25s);
display: block;
font-size: 0.80rem;
height: $menuLineH;
line-height: $menuLineH;
margin-bottom: $interiorMarginSm;
position: relative;
.view-control {
display: inline-block;
margin-left: $interiorMargin;
// vertical-align: middle;
width: $treeVCW;
$runningItemW: $interiorMargin + $treeVCW;
&:hover {
color: $colorItemTreeVCHover;
}
}
.label {
display: block;
// border: 1px solid rgba(blue, 0.5);
@include absPosDefault();
left: $runningItemW + $interiorMargin;
.type-icon {
@include absPosDefault();
@include txtShdwSubtle(0.6);
color: $colorItemTreeIcon;
.alert {
@include txtShdwSubtle(0.3);
background: $colorBodyBg;
color: $colorAlert;
font-size: 0.7em;
margin-top: -3px;
top: 0;
right: auto;
bottom: auto;
left: 9px;
height: auto;
width: auto;
position: absolute;
z-index: 2;
}
}
.title-label {
@include absPosDefault();
display: block;
left: $runningItemW + ($interiorMargin * 2);
// right: $treeContextTriggerW + $interiorMargin; //Disabling as context trigger not being used
overflow: hidden;
text-overflow: ellipsis;
// height: $menuLineH;
white-space: nowrap;
}
}
&.loading {
pointer-events: none;
.label {
opacity: 0.5;
.title-label {
font-style: italic;
}
}
.wait-spinner {
margin-left: 14px;
}
}
&.selected {
$c: #fff;
background: #005177;
color: $c;
.view-control {
color: $colorItemTreeIcon;
}
.label .type-icon {
color: #fff; //$colorItemTreeIconHover;
}
}
&:not(.selected) {
&:hover {
background: lighten($colorBodyBg, 5%);
color: lighten($colorBodyFg, 20%);
.context-trigger {
display: block;
}
.icon {
color: $colorItemTreeIconHover;
}
}
}
&:not(.loading) {
cursor: pointer;
// @include tree-item-hover();
}
.context-trigger {
$h: 0.9rem;
display: none;
top: -1px;
position: absolute;
right: $interiorMarginSm;
.btn-invoke-menu {
font-size: 0.75em;
height: $h;
line-height: $h;
}
}
}
}
ul.tree {
margin-left: $treeVCW + $interiorMargin;
}
}