aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/brush-properties.reel
diff options
context:
space:
mode:
authorKruti Shah2012-07-03 10:08:44 -0700
committerKruti Shah2012-07-03 10:08:44 -0700
commitbf5e6d6febf0c15a00e7694d7fa2c85b0cf567fe (patch)
tree006f6243962aa2e2b59f688cf37b16162376dc39 /js/components/tools-properties/brush-properties.reel
parent3aa1242147264351b7d827fa25ecb5dc42bc2fb0 (diff)
parent12de4e49a309e210c13eb40b2ffa158ef2eb54a7 (diff)
downloadninja-bf5e6d6febf0c15a00e7694d7fa2c85b0cf567fe.tar.gz
Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/components/tools-properties/brush-properties.reel')
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.js b/js/components/tools-properties/brush-properties.reel/brush-properties.js
index 1af128af..d1f97260 100755
--- a/js/components/tools-properties/brush-properties.reel/brush-properties.js
+++ b/js/components/tools-properties/brush-properties.reel/brush-properties.js
@@ -74,7 +74,7 @@ var BrushProperties = exports.BrushProperties = Montage.create(ToolProperties, {
74 Object.getPrototypeOf(BrushProperties).draw.call(this); 74 Object.getPrototypeOf(BrushProperties).draw.call(this);
75 75
76 if (this.addedColorChips === false && this.application.ninja.colorController.colorPanelDrawn) { 76 if (this.addedColorChips === false && this.application.ninja.colorController.colorPanelDrawn) {
77 this._fillColorCtrl.props = { side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: true, offset: -80 }; 77 this._fillColorCtrl.props = {side: 'top', align: 'left', wheel: true, palette: true, gradient: true, image: false, nocolor: true, offset: 8};
78 this.application.ninja.colorController.addButton("chip", this._fillColorCtrl); 78 this.application.ninja.colorController.addButton("chip", this._fillColorCtrl);
79 79
80 this._fillColorCtrl.addEventListener("change", this.handleFillColorChange.bind(this), false); 80 this._fillColorCtrl.addEventListener("change", this.handleFillColorChange.bind(this), false);