From 68abc15ed59fe9b1f84e0a94d09b6e451a56e407 Mon Sep 17 00:00:00 2001
From: Charles Hacskaylo <charlesh88@gmail.com>
Date: Wed, 13 Sep 2017 09:47:18 -0700
Subject: [PATCH] [Frontend] Fix alignment and font-size issues in tool-bar

Fixes #1496
---
 .../general/res/sass/_fixed-position.scss      |  1 +
 .../general/res/sass/controls/_buttons.scss    |  1 -
 .../general/res/sass/controls/_controls.scss   |  3 +--
 .../general/res/sass/user-environ/_layout.scss |  4 +++-
 .../res/sass/user-environ/_tool-bar.scss       |  3 +--
 platform/features/fixed/bundle.js              | 18 +++++++++---------
 .../layout/src/elements/ElementFactory.js      |  2 +-
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/platform/commonUI/general/res/sass/_fixed-position.scss b/platform/commonUI/general/res/sass/_fixed-position.scss
index b2e10d7e72..e2fcaaedf1 100644
--- a/platform/commonUI/general/res/sass/_fixed-position.scss
+++ b/platform/commonUI/general/res/sass/_fixed-position.scss
@@ -52,6 +52,7 @@
 			font-size: 0.8rem;
 			$p: 1px;
 			line-height: 100%;
+            overflow: hidden;
 			&.l-static-text {
 				padding: $p;
 			}
diff --git a/platform/commonUI/general/res/sass/controls/_buttons.scss b/platform/commonUI/general/res/sass/controls/_buttons.scss
index f3f26ddc86..d568d66ae0 100644
--- a/platform/commonUI/general/res/sass/controls/_buttons.scss
+++ b/platform/commonUI/general/res/sass/controls/_buttons.scss
@@ -33,7 +33,6 @@ $pad: $interiorMargin * $baseRatio;
     height: $btnStdH;
     line-height: $btnStdH;
     padding: 0 $pad;
-    vertical-align: top;
 
     &.labeled:before {
         // Icon when it's included
diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss
index a84c26ea52..e1cf1ddf1d 100644
--- a/platform/commonUI/general/res/sass/controls/_controls.scss
+++ b/platform/commonUI/general/res/sass/controls/_controls.scss
@@ -309,9 +309,8 @@ textarea.lg { position: relative; height: 300px; }
         }
     }
     &:before {
-        //@include contextArrow();
         pointer-events: none;
-        color: rgba($colorSelectFg, percentToDecimal($contrastInvokeMenuPercent));
+        color: rgba($colorInvokeMenu, percentToDecimal($contrastInvokeMenuPercent));
         display: block;
         position: absolute;
         right: $interiorMargin; top: 0;
diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss
index 920ba0b3e5..690b30b191 100644
--- a/platform/commonUI/general/res/sass/user-environ/_layout.scss
+++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss
@@ -240,7 +240,9 @@ body.desktop .pane .mini-tab-icon.toggle-pane {
 .top-bar .buttons-main .s-button,
 .top-bar .s-menu-button,
 .tool-bar .s-button,
-.tool-bar .s-menu-button {
+.tool-bar .s-menu-button,
+.tool-bar .select,
+.tool-bar .input-labeled {
     $h: $btnToolbarH;
     height: $h;
     line-height: $h;
diff --git a/platform/commonUI/general/res/sass/user-environ/_tool-bar.scss b/platform/commonUI/general/res/sass/user-environ/_tool-bar.scss
index e8788b195d..9d9c4b0786 100644
--- a/platform/commonUI/general/res/sass/user-environ/_tool-bar.scss
+++ b/platform/commonUI/general/res/sass/user-environ/_tool-bar.scss
@@ -20,6 +20,7 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 .tool-bar {
+    font-size: 0.7rem;
     &.btn-bar {
         white-space: nowrap;
     }
@@ -30,9 +31,7 @@
     input[type="search"],
     input[type="number"] {
 		box-sizing: border-box;
-		font-size: .8em;
 		height: $btnToolbarH;
-		margin-bottom: 1px;
 		position: relative;
 		&.sm {
 			width: $btnToolbarH;
diff --git a/platform/features/fixed/bundle.js b/platform/features/fixed/bundle.js
index cf0d7e6a42..5288578373 100644
--- a/platform/features/fixed/bundle.js
+++ b/platform/features/fixed/bundle.js
@@ -153,10 +153,6 @@ define([
                                         "description": "Set text size",
                                         "control": "select",
                                         "options": [
-                                            {
-                                                "value": "8px",
-                                                "name": "8 px"
-                                            },
                                             {
                                                 "value": "9px",
                                                 "name": "9 px"
@@ -173,10 +169,18 @@ define([
                                                 "value": "12px",
                                                 "name": "12 px"
                                             },
+                                            {
+                                                "value": "13px",
+                                                "name": "13 px"
+                                            },
                                             {
                                                 "value": "14px",
                                                 "name": "14 px"
                                             },
+                                            {
+                                                "value": "15px",
+                                                "name": "15 px"
+                                            },
                                             {
                                                 "value": "16px",
                                                 "name": "16 px"
@@ -280,11 +284,7 @@ define([
                                         "control": "numberfield",
                                         "description": "Resize object width",
                                         "min": "1"
-                                    }
-                                ]
-                            },
-                            {
-                                "items": [
+                                    },
                                     {
                                         "property": "useGrid",
                                         "name": "Snap to Grid",
diff --git a/platform/features/layout/src/elements/ElementFactory.js b/platform/features/layout/src/elements/ElementFactory.js
index 573b7d0fbc..8567773576 100644
--- a/platform/features/layout/src/elements/ElementFactory.js
+++ b/platform/features/layout/src/elements/ElementFactory.js
@@ -43,7 +43,7 @@ define(
                 "fixed.text": {
                     fill: "transparent",
                     stroke: "transparent",
-                    size: "14px"
+                    size: "13px"
                 }
             },
             DIALOGS = {