aboutsummaryrefslogtreecommitdiff
path: root/js/document/templates
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-05-01 10:13:35 -0700
committerJose Antonio Marquez2012-05-01 10:13:35 -0700
commit7812925f6864a6f3a01e4a76924dc5c71706ff37 (patch)
treecc4be068b5de74fb8b1ff28fd6b556fe2c115e97 /js/document/templates
parent7bdcab084d1991361ba8d37a7435efd229648630 (diff)
parentfb47c04b0a4d65f53d975311754aa0dd8a8a3f69 (diff)
downloadninja-7812925f6864a6f3a01e4a76924dc5c71706ff37.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/document/templates')
-rwxr-xr-xjs/document/templates/montage-web/default_html.css9
-rwxr-xr-xjs/document/templates/montage-web/index.html12
2 files changed, 10 insertions, 11 deletions
diff --git a/js/document/templates/montage-web/default_html.css b/js/document/templates/montage-web/default_html.css
index 08e39f22..e62a20a9 100755
--- a/js/document/templates/montage-web/default_html.css
+++ b/js/document/templates/montage-web/default_html.css
@@ -10,6 +10,15 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
10 -webkit-animation-name: none !important; 10 -webkit-animation-name: none !important;
11} 11}
12 12
13body {
14 margin: 0;
15 padding: 0;
16
17 position: absolute;
18 -webkit-transform-style: preserve-3d;
19 -webkit-perspective: 1400px;
20}
21
13.active-element-outline { 22.active-element-outline {
14 outline: #adff2f solid 2px; 23 outline: #adff2f solid 2px;
15} 24}
diff --git a/js/document/templates/montage-web/index.html b/js/document/templates/montage-web/index.html
index 630794a4..caebc8d0 100755
--- a/js/document/templates/montage-web/index.html
+++ b/js/document/templates/montage-web/index.html
@@ -29,20 +29,10 @@
29 } 29 }
30 </script> 30 </script>
31 31
32 <style>
33 div {
34 width: 4000px;
35 height: 300px;
36 background: red;
37 }
38 </style>
39
40 </head> 32 </head>
41 33
42 <body> 34 <body>
43 35 <style></style>
44 <!--<div>IPSUM</div>-->
45
46 </body> 36 </body>
47 37
48</html> \ No newline at end of file 38</html> \ No newline at end of file