diff --git a/bundles.json b/bundles.json
index 6ebe71b189..c89b84289c 100644
--- a/bundles.json
+++ b/bundles.json
@@ -16,6 +16,7 @@
"platform/execution",
"platform/telemetry",
"platform/features/clock",
+ "platform/features/conductor",
"platform/features/imagery",
"platform/features/layout",
"platform/features/pages",
diff --git a/platform/commonUI/general/res/sass/_inspector.scss b/platform/commonUI/general/res/sass/_inspector.scss
index 62917017a4..e34177dda5 100644
--- a/platform/commonUI/general/res/sass/_inspector.scss
+++ b/platform/commonUI/general/res/sass/_inspector.scss
@@ -43,6 +43,16 @@
vertical-align: bottom;
}
}
+
+ .split-layout {
+ .split-pane-component.pane {
+ &.bottom {
+ height: 30%;
+ min-height: 20%;
+ max-height: 80%;
+ }
+ }
+ }
ul {
@include box-sizing(border-box);
@@ -109,4 +119,10 @@
width: 4px;
}
}
-}
\ No newline at end of file
+ .holder-elements {
+ .current-elements {
+ position: relative;
+ }
+ }
+}
+
diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss
index 69cabb0ce6..dd4c293304 100644
--- a/platform/commonUI/general/res/sass/user-environ/_layout.scss
+++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss
@@ -67,7 +67,6 @@
right: $bodyMargin;
bottom: $bodyMargin + $ueFooterH;
.tool-bar {
- border-bottom: 1px solid $colorInteriorBorder;
bottom: auto;
height: $tbH;
line-height: $btnToolbarH;
@@ -193,7 +192,7 @@
.split-layout {
// Specific elements margins
- .holder.holder-treeview-elements {
+ .holder.holder-create-and-search {
top: $bodyMargin;
right: 0;
bottom: $bodyMargin;
@@ -209,12 +208,18 @@
top: $bodyMargin;
bottom: $bodyMargin;
}
- .holder-inspector-elements {
+ .holder-inspector {
top: $bodyMargin;
bottom: $bodyMargin;
left: $bodyMargin;
right: $bodyMargin;
}
+ .holder-elements {
+ top: 0;
+ bottom: $bodyMargin;
+ left: $bodyMargin;
+ right: $bodyMargin;
+ }
}
}
@@ -281,7 +286,6 @@
/***************************************************** OBJECT BROWSE BAR */
.object-browse-bar {
// Converting to use flexbox layout
- //@include absPosDefault(0, visible); // Must use visible to avoid hiding view switcher menu
@include box-sizing(border-box);
height: $ueTopBarH;
line-height: $ueTopBarH;
@@ -302,7 +306,7 @@
// Sets the left tree menu when the tree is hidden.
.tree-holder,
.splitter-treeview,
- .holder-treeview-elements {
+ .holder-create-and-search {
opacity: 0;
}
}
@@ -315,7 +319,7 @@
opacity: 1;
}
- .holder-treeview-elements {
+ .holder-create-and-search {
@include trans-prop-nice(opacity, $dur: 250ms, $delay: 200ms);
}
}
@@ -332,9 +336,6 @@
.pane-inspect-hidden {
.l-object-and-inspector {
- .t-inspect {
- z-index: 1 !important; // Move down so that primary pane elements are clickable
- }
.l-inspect,
.splitter-inspect {
opacity: 0;
diff --git a/platform/commonUI/general/res/templates/object-inspector.html b/platform/commonUI/general/res/templates/object-inspector.html
index cf111a3695..20025a690b 100644
--- a/platform/commonUI/general/res/templates/object-inspector.html
+++ b/platform/commonUI/general/res/templates/object-inspector.html
@@ -19,45 +19,64 @@
this source code distribution or the Licensing information page available
at runtime from the About dialog for additional information.
-->
+
-