aboutsummaryrefslogtreecommitdiff
path: root/js/document/templates
diff options
context:
space:
mode:
authorJon Reid2012-04-10 14:52:23 -0700
committerJon Reid2012-04-10 14:52:23 -0700
commitc19987997758cf47ac9b93a2a767a0e2a9072745 (patch)
treeeb68491c5d04a5cf5ab75bedf2d6bbed3c7a3603 /js/document/templates
parent03a3b32b9b0fd2dc8e4b54bfd5282fd1f8fb6ed6 (diff)
parent422b14fc60be84c116115f2e71e3499e232f3f05 (diff)
downloadninja-c19987997758cf47ac9b93a2a767a0e2a9072745.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/document/templates')
-rwxr-xr-xjs/document/templates/montage-html/default_html.css9
-rwxr-xr-xjs/document/templates/montage-html/index.html2
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