mirror of
https://github.com/nasa/openmct.git
synced 2025-01-21 03:55:31 +00:00
[Frontend] Merge work in open279 into open199
open #199 open #279 Last commit didn't fully take... Integrated inspector changes from open279 into new edit mode work from open199; _layout.scss had a bit of difficult conflict resolution but seems good at this point...
This commit is contained in:
parent
5dd15e3b20
commit
9b5d894949
@ -16,7 +16,6 @@
|
||||
"platform/execution",
|
||||
"platform/telemetry",
|
||||
"platform/features/clock",
|
||||
"platform/features/conductor",
|
||||
"platform/features/imagery",
|
||||
"platform/features/layout",
|
||||
"platform/features/pages",
|
||||
|
@ -51,7 +51,7 @@
|
||||
<mct-toolbar name="mctToolbar"
|
||||
structure="toolbar.structure"
|
||||
ng-model="toolbar.state"
|
||||
class="flex-elem grow">
|
||||
class="flex-elem grows">
|
||||
</mct-toolbar>
|
||||
<mct-representation key="'edit-action-buttons'"
|
||||
mct-object="domainObject"
|
||||
|
@ -77,7 +77,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
// from _bottom-bar.scss
|
||||
.ue-bottom-bar {
|
||||
@include absPosDefault(0);// New status bar design
|
||||
top: auto;
|
||||
@ -192,7 +191,7 @@
|
||||
|
||||
.split-layout {
|
||||
// Specific elements margins
|
||||
.holder.holder-create-and-search {
|
||||
.holder.holder-treeview-elements {
|
||||
top: $bodyMargin;
|
||||
right: 0;
|
||||
bottom: $bodyMargin;
|
||||
@ -230,7 +229,6 @@
|
||||
|
||||
.l-object-wrapper {
|
||||
@extend .abs;
|
||||
//top: $ueTopBarH + $interiorMarginLg;
|
||||
|
||||
.object-holder-main {
|
||||
@extend .abs;
|
||||
@ -299,14 +297,12 @@
|
||||
}
|
||||
}
|
||||
|
||||
// When the tree is hidden, these are the
|
||||
// classes used for the left menu and the
|
||||
// right representation.
|
||||
// When the tree is hidden, these are the classes used for the left menu and the right representation.
|
||||
.pane-tree-hidden {
|
||||
// Sets the left tree menu when the tree is hidden.
|
||||
.tree-holder,
|
||||
.splitter-treeview,
|
||||
.holder-create-and-search {
|
||||
.holder-treeview-elements {
|
||||
opacity: 0;
|
||||
}
|
||||
}
|
||||
@ -319,7 +315,7 @@
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
.holder-create-and-search {
|
||||
.holder-treeview-elements {
|
||||
@include trans-prop-nice(opacity, $dur: 250ms, $delay: 200ms);
|
||||
}
|
||||
}
|
||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user