diff options
author | Ananya Sen | 2012-05-01 13:39:30 -0700 |
---|---|---|
committer | Ananya Sen | 2012-05-01 13:39:30 -0700 |
commit | c360d1a5cfe894591ae65f892ead11d0ca537b18 (patch) | |
tree | 13964f810d3516dbc02e27ab5bb576fe62366f26 /js/document/templates/montage-web | |
parent | 3137d919e6b4ccbb2fb68c5920f4376acde3f1f5 (diff) | |
parent | e3fa4c7db57b63c5ac604c9420062de5d0fe413a (diff) | |
download | ninja-c360d1a5cfe894591ae65f892ead11d0ca537b18.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements
Diffstat (limited to 'js/document/templates/montage-web')
-rwxr-xr-x | js/document/templates/montage-web/default_html.css | 11 | ||||
-rwxr-xr-x | js/document/templates/montage-web/index.html | 15 |
2 files changed, 12 insertions, 14 deletions
diff --git a/js/document/templates/montage-web/default_html.css b/js/document/templates/montage-web/default_html.css index db069d4e..e62a20a9 100755 --- a/js/document/templates/montage-web/default_html.css +++ b/js/document/templates/montage-web/default_html.css | |||
@@ -10,8 +10,17 @@ 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 | ||
13 | body { | ||
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 | } |
16 | 25 | ||
17 | .nj-preset-transition { | 26 | .nj-preset-transition { |
diff --git a/js/document/templates/montage-web/index.html b/js/document/templates/montage-web/index.html index 90b0f7fd..caebc8d0 100755 --- a/js/document/templates/montage-web/index.html +++ b/js/document/templates/montage-web/index.html | |||
@@ -24,26 +24,15 @@ | |||
24 | <script type="text/montage-serialization"> | 24 | <script type="text/montage-serialization"> |
25 | { | 25 | { |
26 | "owner": { | 26 | "owner": { |
27 | "module": "main.reel", | 27 | "prototype": "main.reel" |
28 | "name": "Main" | ||
29 | } | 28 | } |
30 | } | 29 | } |
31 | </script> | 30 | </script> |
32 | 31 | ||
33 | <style> | ||
34 | div { | ||
35 | width: 4000px; | ||
36 | height: 300px; | ||
37 | background: red; | ||
38 | } | ||
39 | </style> | ||
40 | |||
41 | </head> | 32 | </head> |
42 | 33 | ||
43 | <body> | 34 | <body> |
44 | 35 | <style></style> | |
45 | <div>IPSUM</div> | ||
46 | |||
47 | </body> | 36 | </body> |
48 | 37 | ||
49 | </html> \ No newline at end of file | 38 | </html> \ No newline at end of file |