aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js
diff options
context:
space:
mode:
authorJonathan Duran2012-06-29 15:16:11 -0700
committerJonathan Duran2012-06-29 15:16:11 -0700
commit5496f0060c5f43e7951a110241a18b9e631761bb (patch)
treebd1c8f20eb5b6ae0e24fcae28f16eb13cb969747 /js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js
parent3aa1242147264351b7d827fa25ecb5dc42bc2fb0 (diff)
parentec69c8761f798eaf39c4a154997f8bc54b7e47f4 (diff)
downloadninja-5496f0060c5f43e7951a110241a18b9e631761bb.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js')
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js
index 25823d11..9ae7c5bc 100755
--- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js
+++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js
@@ -100,7 +100,7 @@ var InkBottleProperties = exports.InkBottleProperties = Montage.create(ToolPrope
100 100
101 if (this.addedColorChips === false && this.application.ninja.colorController.colorPanelDrawn) { 101 if (this.addedColorChips === false && this.application.ninja.colorController.colorPanelDrawn) {
102 // setup stroke color 102 // setup stroke color
103 this._strokeColorCtrl.props = { side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: true, offset: -80 }; 103 this._strokeColorCtrl.props = {side: 'top', align: 'left', wheel: true, palette: true, gradient: true, image: false, nocolor: true, offset: 8};
104 this.application.ninja.colorController.addButton("chip", this._strokeColorCtrl); 104 this.application.ninja.colorController.addButton("chip", this._strokeColorCtrl);
105 105
106 this._strokeColorCtrl.addEventListener("change", this.handleStrokeColorChange.bind(this), false); 106 this._strokeColorCtrl.addEventListener("change", this.handleStrokeColorChange.bind(this), false);