diff options
author | Nivesh Rajbhandari | 2012-07-02 09:23:13 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-07-02 09:23:13 -0700 |
commit | 2bae1b3148233288ec0bc50876935bdfea1f288c (patch) | |
tree | 686fa3b5b9615941bb7013f35c91e8f326b049db /js/components/tools-properties/fill-properties.reel/fill-properties.js | |
parent | 2da05a4c71bfe9b136384d9e94fbfbef19f24550 (diff) | |
parent | 12de4e49a309e210c13eb40b2ffa158ef2eb54a7 (diff) | |
download | ninja-2bae1b3148233288ec0bc50876935bdfea1f288c.tar.gz |
Merge branch 'refs/heads/ninja-internal' into MaterialsUI
Diffstat (limited to 'js/components/tools-properties/fill-properties.reel/fill-properties.js')
-rwxr-xr-x | js/components/tools-properties/fill-properties.reel/fill-properties.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.js b/js/components/tools-properties/fill-properties.reel/fill-properties.js index ef1699af..11dec294 100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.js +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.js | |||
@@ -60,7 +60,7 @@ var FillProperties = exports.FillProperties = Montage.create(ToolProperties, { | |||
60 | Object.getPrototypeOf(FillProperties).draw.call(this); | 60 | Object.getPrototypeOf(FillProperties).draw.call(this); |
61 | 61 | ||
62 | if (this.addedColorChips === false && this.application.ninja.colorController.colorPanelDrawn) { | 62 | if (this.addedColorChips === false && this.application.ninja.colorController.colorPanelDrawn) { |
63 | this._fillColorCtrl.props = { side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: true, offset: -80 }; | 63 | this._fillColorCtrl.props = {side: 'top', align: 'left', wheel: true, palette: true, gradient: true, image: false, nocolor: true, offset: 8}; |
64 | this.application.ninja.colorController.addButton("chip", this._fillColorCtrl); | 64 | this.application.ninja.colorController.addButton("chip", this._fillColorCtrl); |
65 | 65 | ||
66 | this._fillColorCtrl.addEventListener("change", this.handleFillColorChange.bind(this), false); | 66 | this._fillColorCtrl.addEventListener("change", this.handleFillColorChange.bind(this), false); |