diff options
| author | Pushkar Joshi | 2012-05-22 13:22:26 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-05-22 13:22:26 -0700 |
| commit | 01dbc1f329a95bc7e3b93224543d88ad5bdbd315 (patch) | |
| tree | ceb527713554f506c537168e36a10452cd09ad10 /js/document/templates | |
| parent | b9262c831952e77135b79c2de7c455d5e7ff0589 (diff) | |
| parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
| download | ninja-01dbc1f329a95bc7e3b93224543d88ad5bdbd315.tar.gz | |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/document/templates')
| -rwxr-xr-x | js/document/templates/montage-html/package.json | 3 | ||||
| -rwxr-xr-x | js/document/templates/montage-web/default_html.css | 9 | ||||
| -rwxr-xr-x | js/document/templates/montage-web/index.html | 12 |
3 files changed, 12 insertions, 12 deletions
diff --git a/js/document/templates/montage-html/package.json b/js/document/templates/montage-html/package.json index c8bc02fb..d1e839dc 100755 --- a/js/document/templates/montage-html/package.json +++ b/js/document/templates/montage-html/package.json | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | "lib": "" | 3 | "lib": "" |
| 4 | }, | 4 | }, |
| 5 | "mappings": { | 5 | "mappings": { |
| 6 | "montage": "../../../../node_modules/montage/" | 6 | "montage": "../../../../node_modules/montage/", |
| 7 | "montage-google": "../../../../node_modules/montage-google/" | ||
| 7 | } | 8 | } |
| 8 | } \ No newline at end of file | 9 | } \ No newline at end of file |
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 |