Merge branch 'refs/heads/Ninja-Internal' into FileIO

3 files changed, 11 insertions, 3 deletions

diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
index c75e105d..66f39b5a 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
@@ -17,7 +17,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
         value:function(){
             this.element.addEventListener("click", this, false);
             this.trackID = this.parentComponent.parentComponent.parentComponent.trackID;
-            this.animatedElement = this.parentComponent.parentComponent.parentComponent.parentComponent.animatedElement;
+            this.animatedElement = this.parentComponent.parentComponent.parentComponent.animatedElement;
             this.ninjaStylesContoller = this.application.ninja.stylesController;
         }
     },
diff --git a/js/panels/css-panel/styles-view-container.reel/styles-view-container.js b/js/panels/css-panel/styles-view-container.reel/styles-view-container.js
index 153e74b6..975ae608 100644
--- a/js/panels/css-panel/styles-view-container.reel/styles-view-container.js
+++ b/js/panels/css-panel/styles-view-container.reel/styles-view-container.js
@@ -129,7 +129,7 @@ exports.StylesViewContainer = Montage.create(Component, {
         }
     },
     handleSelectionChange: {
-        value: function() {
+        value: function(e) {
             var elements = this.application.ninja.selectedElements,
                 elementsCopy = this._copy(elements);
 
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;
 }