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

Merge master into nem468a - picking up missed files

Browse Source
This commit is contained in:
Charles Hacskaylo
2016-01-11 13:30:56 -08:00
parent 4f7ca98b60
commit acb2a2da12
5 changed files with 1314 additions and 744 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -149,12 +149,6 @@ mct-representation {
border-color: rgba($colorItemTreeSelectedFg, 0.25);
border-top-color: rgba($colorItemTreeSelectedFg, 1.0);
}
.tree .tree-item,
.search-results .s-status-editing .search-result-item {
.t-object-label {
left: $interiorMargin + $treeVCW;
}
}
.tree .s-status-editing,
.search-results .s-status-editing {
@@ -169,7 +163,7 @@ mct-representation {
@include pulse($dur: 1s, $opacity0: 0.25);
color: $colorItemTreeEditingFg;
content: '\70';
margin-left: $interiorMarginSm;
margin-right: $interiorMarginSm;
}
.t-object-label {
.t-item-icon,