diff options
author | Armen Kesablyan | 2012-07-02 13:20:43 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-07-02 13:20:43 -0700 |
commit | 5a6b1fcf207817a7aa0ba7d0c1bea90f0ee5e8cb (patch) | |
tree | af71b72b828d942ebf11f565b7c9ccff0798343d /js/components/tools-properties/ink-bottle-properties.reel | |
parent | 8966fc4903f0eec61816d9b9bdbcac9b7d99c320 (diff) | |
parent | 526b9d76686323f488f1b26175440172b715d808 (diff) | |
download | ninja-5a6b1fcf207817a7aa0ba7d0c1bea90f0ee5e8cb.tar.gz |
Merge branch 'refs/heads/master' into GIO-TextTool
Diffstat (limited to 'js/components/tools-properties/ink-bottle-properties.reel')
-rwxr-xr-x | js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js | 2 |
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); |