Merge master into nem468a - picking up missed files

platform/commonUI/general/res/sass/_inspector.scss

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

platform/commonUI/general/res/sass/tree/_tree.scss

@@ -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,

platform/commonUI/general/res/templates/object-inspector.html

@@ -20,7 +20,10 @@
  at runtime from the About dialog for additional information.
 -->
 <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">
+        <mct-split-pane class='abs contents split-layout' anchor='bottom'>
+            <div class="split-pane-component pane top">
+                <div class="abs holder holder-inspector l-flex-col">
                     <div class="pane-header flex-elem">Inspection</div>
                     <ul class="flex-elem grows vscroll">
                         <li>
@@ -41,7 +44,7 @@
                                                     mct-object="parent"
                                                     ng-model="ngModel"
                                                     ng-click="ngModel.selectedObject = parent"
-                                    class="location-item rep-object-label">
+                                                    class="location-item">
                                 </mct-representation>
                             </span>
                         </li>
@@ -54,10 +57,24 @@
                                                     mct-object="parent"
                                                     ng-model="ngModel"
                                                     ng-click="ngModel.selectedObject = parent"
-                                    class="location-item rep-object-label">
+                                                    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>
+        </mct-split-pane>
+    </div><!--/ PaneController -->
 </span>