Merge branch 'refs/heads/master' into dom-architecture

Conflicts:
	js/document/templates/montage-html/package.json
	js/io/system/ninjalibrary.json
	node_modules/descriptor.json

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 16 insertions, 12 deletions

diff --git a/js/components/tools-properties/text-properties.reel/text-properties.css b/js/components/tools-properties/text-properties.reel/text-properties.css
index f7bb8295..218105a7 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.css
+++ b/js/components/tools-properties/text-properties.reel/text-properties.css
@@ -5,7 +5,10 @@
  </copyright> */
 
 .optionsTextTool {
-    padding: 6px;
+}
+
+.optionsTextTool .overrideMargin{
+    margin-left: 0px;
 }
 
 .optionsTextTool .btnGroup {
@@ -16,26 +19,27 @@
     margin: 2px;
 }
 
-.optionsTextTool > *, .optionsTextTool .btnGroup > * {
-    float:left;
+.optionsTextTool .btnGroup .textButton {
+    width: auto;
+    padding: 4px 8px;
+    margin-left: 0px;
 }
 
-.optionsTextTool button {
-    width: auto;
-    padding: 4px 8px !important;
-    margin-left:4px;
+.optionsTextTool .btnGroup .imageButton {
+    padding-top: 2px;
+    height: 22px;
 }
 
 .optionsTextTool .label, .optionsTextTool .hottextunit {
     font-size:11px;
+    margin-top: 1px;
 }
 
 .optionsTextTool .fontSelection {
-    width:100px;
+    width: 160px;
 }
 
-.optionsTextTool .fontColor {
-    width: 20px;
-    height: 18px;
-    margin: 2px 6px;
+.optionsTextTool .toolColorChipCtrl {
+    margin-left: 6px;
+    margin-right: 0px;
 }
\ No newline at end of file