Merge pull request #360 from nasa/open283

Review and integrate open283

platform/commonUI/general/res/sass/user-environ/_layout.scss

@@ -257,12 +257,14 @@
     line-height: $ueEditToolBarH;
     height: 0px;
     opacity: 0;
-    overflow: hidden;
     &.active {
         height: $ueEditToolBarH + $interiorMargin;
         margin-bottom: $interiorMargin;
         opacity: 1;
     }
+    .tool-bar {
+        right: $interiorMargin;
+    }
 }
 
 .object-browse-bar .s-btn,

platform/commonUI/general/res/sass/user-environ/_tool-bar.scss

@@ -20,6 +20,9 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 .tool-bar {
+    &.btn-bar {
+        white-space: nowrap;
+    }
 	.l-control-group {
 		height: $btnToolbarH;
 	}