diff options
| author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
| commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
| tree | 867f8bdd588c8f9076979233ca46a688ff70523e /js/document/templates/montage-web | |
| parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
| parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
| download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/document/templates/montage-web')
| -rwxr-xr-x | js/document/templates/montage-web/default_html.css | 28 | ||||
| -rwxr-xr-x | js/document/templates/montage-web/index.html | 36 | ||||
| -rw-r--r-- | js/document/templates/montage-web/main.js (renamed from js/document/templates/montage-web/main.reel/main.js) | 0 |
3 files changed, 33 insertions, 31 deletions
diff --git a/js/document/templates/montage-web/default_html.css b/js/document/templates/montage-web/default_html.css deleted file mode 100755 index e62a20a9..00000000 --- a/js/document/templates/montage-web/default_html.css +++ /dev/null | |||
| @@ -1,28 +0,0 @@ | |||
| 1 | /* <copyright> | ||
| 2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
| 3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
| 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
| 5 | </copyright> */ | ||
| 6 | |||
| 7 | * { | ||
| 8 | -webkit-transition-duration: 0s !important; | ||
| 9 | -webkit-animation-duration: 0s !important; | ||
| 10 | -webkit-animation-name: none !important; | ||
| 11 | } | ||
| 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 | |||
| 22 | .active-element-outline { | ||
| 23 | outline: #adff2f solid 2px; | ||
| 24 | } | ||
| 25 | |||
| 26 | .nj-preset-transition { | ||
| 27 | -webkit-transition: all 450ms linear !important; | ||
| 28 | } \ No newline at end of file | ||
diff --git a/js/document/templates/montage-web/index.html b/js/document/templates/montage-web/index.html index caebc8d0..47964ae4 100755 --- a/js/document/templates/montage-web/index.html +++ b/js/document/templates/montage-web/index.html | |||
| @@ -10,8 +10,39 @@ | |||
| 10 | <head> | 10 | <head> |
| 11 | 11 | ||
| 12 | <title>Ninja Prototype</title> | 12 | <title>Ninja Prototype</title> |
| 13 | |||
| 14 | <style type="text/css" id="nj-stage-stylesheet"> | ||
| 15 | * { | ||
| 16 | -webkit-transition-duration: 0s !important; | ||
| 17 | -webkit-animation-duration: 0s !important; | ||
| 18 | -webkit-animation-name: none !important; | ||
| 19 | } | ||
| 20 | |||
| 21 | body { | ||
| 22 | margin: 0; | ||
| 23 | padding: 0; | ||
| 24 | position: absolute; | ||
| 25 | -webkit-transform-style: preserve-3d; | ||
| 26 | -webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); | ||
| 27 | } | ||
| 13 | 28 | ||
| 14 | <link href="default_html.css" id="nj-stage-stylesheet" rel="stylesheet" type="text/css" media="screen"/> | 29 | html, body { |
| 30 | width: 100%; | ||
| 31 | height: 100%; | ||
| 32 | } | ||
| 33 | |||
| 34 | ninjaloadinghack { | ||
| 35 | display: none; | ||
| 36 | } | ||
| 37 | |||
| 38 | .active-element-outline { | ||
| 39 | outline: #adff2f solid 2px; | ||
| 40 | } | ||
| 41 | |||
| 42 | .nj-preset-transition { | ||
| 43 | -webkit-transition: all 450ms linear !important; | ||
| 44 | } | ||
| 45 | </style> | ||
| 15 | 46 | ||
| 16 | <script type="text/javascript" data-package="." src="../../../../node_modules/montage/montage.js"></script> | 47 | <script type="text/javascript" data-package="." src="../../../../node_modules/montage/montage.js"></script> |
| 17 | 48 | ||
| @@ -24,7 +55,7 @@ | |||
| 24 | <script type="text/montage-serialization"> | 55 | <script type="text/montage-serialization"> |
| 25 | { | 56 | { |
| 26 | "owner": { | 57 | "owner": { |
| 27 | "prototype": "main.reel" | 58 | "prototype": "main" |
| 28 | } | 59 | } |
| 29 | } | 60 | } |
| 30 | </script> | 61 | </script> |
| @@ -32,7 +63,6 @@ | |||
| 32 | </head> | 63 | </head> |
| 33 | 64 | ||
| 34 | <body> | 65 | <body> |
| 35 | <style></style> | ||
| 36 | </body> | 66 | </body> |
| 37 | 67 | ||
| 38 | </html> \ No newline at end of file | 68 | </html> \ No newline at end of file |
diff --git a/js/document/templates/montage-web/main.reel/main.js b/js/document/templates/montage-web/main.js index d5ac88d5..d5ac88d5 100644 --- a/js/document/templates/montage-web/main.reel/main.js +++ b/js/document/templates/montage-web/main.js | |||