Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal

2 files changed, 10 insertions, 1 deletions

diff --git a/js/panels/properties.reel/properties.css b/js/panels/properties.reel/properties.css
index 84f52ed4..d1aa750a 100755
--- a/js/panels/properties.reel/properties.css
+++ b/js/panels/properties.reel/properties.css
@@ -239,8 +239,9 @@ padding-right:6px;
 }
 
 .propertiesPanel .colortoolbar div {
-    margin: 0px 10px 0px 20px;
+    margin: 0px 5px 0px 10px;
     clear:none;
+    float: left;
 }
 
 /* color select */
@@ -250,6 +251,13 @@ padding-right:6px;
     clear:none;
 }
 
+.propertiesPanel .colortoolbar .chipContainer {
+        margin-top: 2px;
+        background: url(../../../../../images/colorpanel/transparent.png) repeat;
+        width: 40px;
+        height: 20px;
+}
+
 .propertiesPanel .button:active {
     outline: none;
 }
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index fcd0ab01..5719a63d 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -136,6 +136,7 @@ exports.Properties = Montage.create(Component, {
                     ElementsMediator.setAttribute(this.application.ninja.currentDocument.model.documentRoot, "class", this.elementClass.value, "Change", "pi", this.application.ninja.currentDocument.model.documentRoot.elementModel.elementClass);
                 }
             }
+            NJevent("updatedID",this.application.ninja.selectedElements[0]);
         }
     },