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/document/templates/montage-html | |
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/document/templates/montage-html')
-rwxr-xr-x | js/document/templates/montage-html/default_html.css | 9 | ||||
-rwxr-xr-x | js/document/templates/montage-html/index.html | 2 |
2 files changed, 3 insertions, 8 deletions
diff --git a/js/document/templates/montage-html/default_html.css b/js/document/templates/montage-html/default_html.css index 6c2b415f..04b21c6f 100755 --- a/js/document/templates/montage-html/default_html.css +++ b/js/document/templates/montage-html/default_html.css | |||
@@ -65,13 +65,8 @@ body | |||
65 | display: none; | 65 | display: none; |
66 | } | 66 | } |
67 | 67 | ||
68 | .global3DSettings { | 68 | .active-element-outline { |
69 | -webkit-transform-style: preserve-3d; | 69 | outline: #adff2f solid 2px; |
70 | -webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); | ||
71 | } | ||
72 | |||
73 | .elem-red-outline { | ||
74 | outline: red solid thin; | ||
75 | } | 70 | } |
76 | 71 | ||
77 | .nj-preset-transition { | 72 | .nj-preset-transition { |
diff --git a/js/document/templates/montage-html/index.html b/js/document/templates/montage-html/index.html index edfab2b0..b3f68030 100755 --- a/js/document/templates/montage-html/index.html +++ b/js/document/templates/montage-html/index.html | |||
@@ -40,7 +40,7 @@ | |||
40 | 40 | ||
41 | <ninja-div id="Viewport" class="stageDimension"> | 41 | <ninja-div id="Viewport" class="stageDimension"> |
42 | 42 | ||
43 | <ninja-div id="UserContent" class="stageView stageDimension global3DSettings"></ninja-div> | 43 | <ninja-div id="UserContent" class="stageView stageDimension"></ninja-div> |
44 | 44 | ||
45 | </ninja-div> | 45 | </ninja-div> |
46 | 46 | ||