diff options
author | hwc487 | 2012-05-01 11:03:56 -0700 |
---|---|---|
committer | hwc487 | 2012-05-01 11:03:56 -0700 |
commit | f6983a69649b1c274ce6fe2d278a325994d092b6 (patch) | |
tree | a360297930c35f3097af16e9f6714ec501bd5894 /js/document/templates | |
parent | 80715f4f0c45d29926184fa02e0a01b4e7642a79 (diff) | |
parent | fb47c04b0a4d65f53d975311754aa0dd8a8a3f69 (diff) | |
download | ninja-f6983a69649b1c274ce6fe2d278a325994d092b6.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/document/templates')
-rwxr-xr-x | js/document/templates/montage-web/default_html.css | 9 | ||||
-rwxr-xr-x | js/document/templates/montage-web/index.html | 12 |
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 | ||
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 | } |
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 |