diff options
author | Ananya Sen | 2012-06-28 15:19:28 -0700 |
---|---|---|
committer | Ananya Sen | 2012-06-28 15:19:28 -0700 |
commit | 624acffc0619d879deaa6dcd8ce3c0cfeaf2227a (patch) | |
tree | ca53a666a93f9bed8912a5c3211ba84fc603c58f /js/components/tools-properties/brush-properties.reel | |
parent | e4d3e040e521648ec9a6d0e0db2e62754f2d8882 (diff) | |
parent | 3ba9accb8e1887bfd6f1f912b6135073a3d9c70c (diff) | |
download | ninja-624acffc0619d879deaa6dcd8ce3c0cfeaf2227a.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into bugfix-master
Diffstat (limited to 'js/components/tools-properties/brush-properties.reel')
-rwxr-xr-x | js/components/tools-properties/brush-properties.reel/brush-properties.js | 2 |
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); |