Merge pull request #2385 from nasa/misc-fixes-2

Misc Fixes 2

src/plugins/displayLayout/components/SubobjectView.vue

@@ -22,6 +22,7 @@
 <template>
     <layout-frame :item="item"
                   :grid-size="gridSize"
+                  :title="domainObject && domainObject.name"
                   @move="(gridDelta) => $emit('move', gridDelta)"
                   @endMove="() => $emit('endMove')">
         <object-frame v-if="domainObject"

src/plugins/flexibleLayout/components/flexibleLayout.vue

@@ -113,7 +113,8 @@
 
         &__container-holder {
             display: flex;
-            flex: 1 1 100%; // Must needs to be 100% to work
+            flex: 1 1 100%; // Must be 100% to work
+            overflow: auto;
 
             // Columns by default
             flex-direction: row;

src/ui/components/ObjectFrame.vue

@@ -26,8 +26,8 @@
             'has-complex-content': complexContent
         }">
         <div class="c-so-view__header">
-            <div class="c-so-view__header__name"
-                 :class="cssClass">
+            <div class="c-so-view__header__icon" :class="cssClass"></div>
+            <div class="c-so-view__header__name">
                 {{ domainObject && domainObject.name }}
             </div>
             <context-menu-drop-down
@@ -63,12 +63,16 @@
             align-items: center;
             margin-bottom: $interiorMargin;
 
+            &__icon {
+                flex: 0 0 auto;
+                margin-right: $interiorMarginSm;
+                opacity: 0.5;
+            }
+
             &__name {
                 @include headerFont(1em);
-                display: flex;
-                &:before {
-                    margin-right: $interiorMarginSm;
-                }
+                @include ellipsize();
+                flex: 0 1 auto;
             }
         }
 
@@ -88,19 +92,6 @@
             }
         }
 
-        &__name {
-            @include ellipsize();
-            @include headerFont(1.2em);
-            flex: 0 1 auto;
-
-            &:before {
-                // Object type icon
-                flex: 0 0 auto;
-                margin-right: $interiorMarginSm;
-                opacity: 0.5;
-            }
-        }
-
         &__local-controls {
             position: absolute;
             top: $interiorMargin; right: $interiorMargin;

src/ui/layout/BrowseBar.vue

@@ -289,10 +289,14 @@ const PLACEHOLDER_OBJECT = {};
 
         &__nav-to-parent-button {
             // This is an icon-button
-            $p: $interiorMarginLg;
+            $p: $interiorMargin;
             margin-right: $interiorMargin;
             padding-left: $p;
             padding-right: $p;
+
+            .is-editing & {
+                display: none;
+            }
         }
 
         &__object-name--w {

src/ui/layout/Layout.vue

@@ -64,7 +64,6 @@
         &__status {
             background: $colorStatusBarBg;
             color: $colorStatusBarFg;
-            height: 24px;
             padding: $interiorMarginSm;
         }
 

src/ui/layout/pane.vue

@@ -194,8 +194,8 @@
                 /********************************* STYLES FOR DESKTOP COLLAPSED PANES, ALL ORIENTATIONS */
                 $d: nth($splitterBtnD, 1);
                 flex-basis: $d;
-                min-width: $d !important;
-                min-height: $d !important;
+                min-width: $d;
+                min-height: $d;
 
                 > .l-pane__handle {
                     display: none;