diff options
author | Valerio Virgillito | 2012-04-12 18:07:54 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-04-12 18:07:54 -0700 |
commit | 5b4826eced782fe7b4691d4bbbe0e3605d3164c1 (patch) | |
tree | a1fe692c814d75f05da466eead26579e4686175d /js/tools/TagTool.js | |
parent | 6885e66a1f668f34699145f0da231c5d4ecbe666 (diff) | |
parent | 4b900ea5cd6bb77eb30cec8c03b9ec9fa662c1e9 (diff) | |
download | ninja-5b4826eced782fe7b4691d4bbbe0e3605d3164c1.tar.gz |
Merge branch 'refs/heads/master' into undo-manager
Conflicts:
js/controllers/elements/element-controller.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/tools/TagTool.js')
-rwxr-xr-x | js/tools/TagTool.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tools/TagTool.js b/js/tools/TagTool.js index 752500e0..d946db72 100755 --- a/js/tools/TagTool.js +++ b/js/tools/TagTool.js | |||
@@ -256,7 +256,7 @@ exports.TagTool = Montage.create(DrawingTool, { | |||
256 | value: function(tag) { | 256 | value: function(tag) { |
257 | var styles = { | 257 | var styles = { |
258 | "-webkit-transform-style": "preserve-3d", | 258 | "-webkit-transform-style": "preserve-3d", |
259 | "-webkit-transform": "perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1)" | 259 | "-webkit-transform": "matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1)" |
260 | }; | 260 | }; |
261 | tag.innerHTML = "content"; | 261 | tag.innerHTML = "content"; |
262 | 262 | ||