aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-21 16:54:13 -0700
committerJose Antonio Marquez2012-06-21 16:54:13 -0700
commit8d0c07b6734d874b481bb4866466de8f863a67a7 (patch)
tree564528119093e4e3408ccf180d55ac3d5e413813 /js/panels
parentd9f2064fc7dc5284e159032e3efbab5de9b2dc14 (diff)
parent2af33f19de48bb8fe269c51ceddd1bc1f591651f (diff)
downloadninja-8d0c07b6734d874b481bb4866466de8f863a67a7.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/panels')
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js2
-rw-r--r--js/panels/css-panel/styles-view-container.reel/styles-view-container.js2
-rwxr-xr-xjs/panels/properties.reel/properties.css10
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, {
17 value:function(){ 17 value:function(){
18 this.element.addEventListener("click", this, false); 18 this.element.addEventListener("click", this, false);
19 this.trackID = this.parentComponent.parentComponent.parentComponent.trackID; 19 this.trackID = this.parentComponent.parentComponent.parentComponent.trackID;
20 this.animatedElement = this.parentComponent.parentComponent.parentComponent.parentComponent.animatedElement; 20 this.animatedElement = this.parentComponent.parentComponent.parentComponent.animatedElement;
21 this.ninjaStylesContoller = this.application.ninja.stylesController; 21 this.ninjaStylesContoller = this.application.ninja.stylesController;
22 } 22 }
23 }, 23 },
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, {
129 } 129 }
130 }, 130 },
131 handleSelectionChange: { 131 handleSelectionChange: {
132 value: function() { 132 value: function(e) {
133 var elements = this.application.ninja.selectedElements, 133 var elements = this.application.ninja.selectedElements,
134 elementsCopy = this._copy(elements); 134 elementsCopy = this._copy(elements);
135 135
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;
239} 239}
240 240
241.propertiesPanel .colortoolbar div { 241.propertiesPanel .colortoolbar div {
242 margin: 0px 10px 0px 20px; 242 margin: 0px 5px 0px 10px;
243 clear:none; 243 clear:none;
244 float: left;
244} 245}
245 246
246/* color select */ 247/* color select */
@@ -250,6 +251,13 @@ padding-right:6px;
250 clear:none; 251 clear:none;
251} 252}
252 253
254.propertiesPanel .colortoolbar .chipContainer {
255 margin-top: 2px;
256 background: url(../../../../../images/colorpanel/transparent.png) repeat;
257 width: 40px;
258 height: 20px;
259}
260
253.propertiesPanel .button:active { 261.propertiesPanel .button:active {
254 outline: none; 262 outline: none;
255} 263}