From 609ad21e56623827c5ca203cf6062f70d3067764 Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Mon, 11 Jun 2012 17:13:31 -0700 Subject: - removed extra selection change event, - displace element after adding it to the document Signed-off-by: Ananya Sen --- js/panels/css-panel/styles-view-container.reel/styles-view-container.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/panels') 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 157d99de..4a09d5f3 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 @@ -110,7 +110,7 @@ exports.StylesViewContainer = Montage.create(Component, { } }, handleSelectionChange: { - value: function() { + value: function(e) { var elements = this.application.ninja.selectedElements, elementsCopy = this._copy(elements); -- cgit v1.2.3 From 7615da5c6ba54bd082eac4b8a6d9196084e5c590 Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Wed, 20 Jun 2012 16:45:29 -0700 Subject: Adding transparent background to color chip buttons Add a transparent pattern to the background of color chips consumed in the app, this way you can preview colors in alpha. This was lost, just added back again. Not a big change, just minor CSS, so should only be quickly tested prior to merge. --- js/panels/properties.reel/properties.css | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'js/panels') 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; } -- cgit v1.2.3 From cb9fbfeba90b5b76d3f3f2b9303129ca4651e5be Mon Sep 17 00:00:00 2001 From: Kruti Shah Date: Thu, 21 Jun 2012 11:00:38 -0700 Subject: Sub Property ADding KEyframe fixed Signed-off-by: Kruti Shah --- js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/panels') 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; } }, -- cgit v1.2.3