diff options
author | Pushkar Joshi | 2012-04-17 14:49:18 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-04-17 14:49:18 -0700 |
commit | df903a01e14134cadf109b733d09c6eadfa3966b (patch) | |
tree | 2351f1c05b2f852053fa0be533072088a9ad4e7c /js/panels/components-panel.reel/components-panel.js | |
parent | 036cf034e124dbc1f4893e90f7c6d240904a3faf (diff) | |
parent | cacb4a21825818af392c2949967b0f3c1df509c5 (diff) | |
download | ninja-df903a01e14134cadf109b733d09c6eadfa3966b.tar.gz |
Merge branch 'master' into pentool
Conflicts:
js/tools/PenTool.js
Diffstat (limited to 'js/panels/components-panel.reel/components-panel.js')
-rwxr-xr-x | js/panels/components-panel.reel/components-panel.js | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/js/panels/components-panel.reel/components-panel.js b/js/panels/components-panel.reel/components-panel.js index acbf702f..cfacd461 100755 --- a/js/panels/components-panel.reel/components-panel.js +++ b/js/panels/components-panel.reel/components-panel.js | |||
@@ -286,9 +286,7 @@ exports.ComponentsPanel = Montage.create(Component, { | |||
286 | var styles = { | 286 | var styles = { |
287 | 'position': 'absolute', | 287 | 'position': 'absolute', |
288 | 'left' : that.dragPosition[0] + 'px', | 288 | 'left' : that.dragPosition[0] + 'px', |
289 | 'top' : that.dragPosition[1] + 'px', | 289 | 'top' : that.dragPosition[1] + 'px' |
290 | '-webkit-transform-style' : 'preserve-3d', | ||
291 | '-webkit-transform' : 'perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1)' | ||
292 | }; | 290 | }; |
293 | 291 | ||
294 | var defaultStyles = component.defaultStyles; | 292 | var defaultStyles = component.defaultStyles; |