ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-30 08:04:03 +00:00
Code Issues Actions 5 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
platform/commonUI/general/res/sass/_inspector.scss
View File

@ -137,14 +137,8 @@
.tree-item { .tree-item {
.t-object-label { .t-object-label {
// Elements pool is a flat list, so don't indent items. // Elements pool is a flat list, so don't indent items.
font-size: 0.75rem;
left: 0; left: 0;
.t-item-icon {
font-size: 1em;
width: 1em;
}
.t-title-label {
left: 20px + $interiorMargin;
}
} }
} }
} }

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

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

95
platform/commonUI/general/res/templates/object-inspector.html
View File

@ -20,44 +20,61 @@
at runtime from the About dialog for additional information. at runtime from the About dialog for additional information.
--> -->
<span class="l-inspect" ng-controller="ObjectInspectorController as controller"> <span class="l-inspect" ng-controller="ObjectInspectorController as controller">
<div class="abs holder holder-inspector-elements l-flex-col"> <div ng-controller="PaneController as modelPaneEdit">
<div class="pane-header flex-elem">Inspection</div> <mct-split-pane class='abs contents split-layout' anchor='bottom'>
<ul class="flex-elem grows vscroll"> <div class="split-pane-component pane top">
<li> <div class="abs holder holder-inspector l-flex-col">
<em>Properties</em> <div class="pane-header flex-elem">Inspection</div>
<div class="inspector-properties" <ul class="flex-elem grows vscroll">
ng-repeat="data in metadata" <li>
ng-class="{ first:$index === 0 }"> <em>Properties</em>
<div class="label">{{ data.name }}</div> <div class="inspector-properties"
<div class="value">{{ data.value }}</div> ng-repeat="data in metadata"
ng-class="{ first:$index === 0 }">
<div class="label">{{ data.name }}</div>
<div class="value">{{ data.value }}</div>
</div>
</li>
<li ng-if="contextutalParents.length > 0">
<em title="The location of this linked object.">Location</em>
<span class="inspector-location"
ng-repeat="parent in contextutalParents"
ng-class="{ last:($index + 1) === contextualParents.length }">
<mct-representation key="'label'"
mct-object="parent"
ng-model="ngModel"
ng-click="ngModel.selectedObject = parent"
class="location-item">
</mct-representation>
</span>
</li>
<li ng-if="primaryParents.length > 0">
<em title="The location of the original object that this was linked from.">Original Location</em>
<span class="inspector-location"
ng-repeat="parent in primaryParents"
ng-class="{ last:($index + 1) === primaryParents.length }">
<mct-representation key="'label'"
mct-object="parent"
ng-model="ngModel"
ng-click="ngModel.selectedObject = parent"
class="location-item">
</mct-representation>
</span>
</li>
</ul>
</div><!--/ holder-inspector -->
</div><!--/ split-pane-component -->
<mct-splitter class="splitter-inspect-panel mobile-hide"></mct-splitter>
<div class="split-pane-component pane bottom">
<div class="abs holder holder-elements l-flex-col">
<em class="flex-elem">Elements</em>
<mct-representation
key="'edit-elements'"
mct-object="domainObject"
class="flex-elem holder grows vscroll current-elements">
</mct-representation>
</div>
</div> </div>
</li> </mct-split-pane>
<li ng-if="contextutalParents.length > 0"> </div><!--/ PaneController -->
<em title="The location of this linked object.">Location</em>
<span class="inspector-location"
ng-repeat="parent in contextutalParents"
ng-class="{ last:($index + 1) === contextualParents.length }">
<mct-representation key="'label'"
mct-object="parent"
ng-model="ngModel"
ng-click="ngModel.selectedObject = parent"
class="location-item rep-object-label">
</mct-representation>
</span>
</li>
<li ng-if="primaryParents.length > 0">
<em title="The location of the original object that this was linked from.">Original Location</em>
<span class="inspector-location"
ng-repeat="parent in primaryParents"
ng-class="{ last:($index + 1) === primaryParents.length }">
<mct-representation key="'label'"
mct-object="parent"
ng-model="ngModel"
ng-click="ngModel.selectedObject = parent"
class="location-item rep-object-label">
</mct-representation>
</span>
</li>
</ul>
</div>
</span> </span>

996
platform/commonUI/themes/espresso/res/css/theme-espresso.css
View File

File diff suppressed because it is too large Load Diff

951
platform/commonUI/themes/snow/res/css/theme-snow.css
View File

File diff suppressed because it is too large Load Diff