diff options
| author | Nivesh Rajbhandari | 2012-05-04 14:54:35 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-05-04 14:54:35 -0700 |
| commit | ce2d581894f9e433a7b73e4b622352a657b6ddaa (patch) | |
| tree | bbd4eb9f6d00ee9d3c0bcc53ce560cfc1e71127b /js/document/templates | |
| parent | 8f8f7f9a36fb9abadea2a9f25aef0084946bebc9 (diff) | |
| parent | 8dcbac5d4c30e9dfbc543a5f997939111e9c9f89 (diff) | |
| download | ninja-ce2d581894f9e433a7b73e4b622352a657b6ddaa.tar.gz | |
Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture
Conflicts:
js/document/templates/montage-web/default_html.css
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/document/templates')
| -rwxr-xr-x | js/document/templates/montage-web/default_html.css | 31 | ||||
| -rwxr-xr-x | js/document/templates/montage-web/index.html | 31 | ||||
| -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, 28 insertions, 34 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 7979d1e9..00000000 --- a/js/document/templates/montage-web/default_html.css +++ /dev/null | |||
| @@ -1,31 +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-transform: perspective(1400) matrix3d(1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1); | ||
| 20 | |||
| 21 | width: 1460px; | ||
| 22 | height: 880px; | ||
| 23 | } | ||
| 24 | |||
| 25 | .active-element-outline { | ||
| 26 | outline: #adff2f solid 2px; | ||
| 27 | } | ||
| 28 | |||
| 29 | .nj-preset-transition { | ||
| 30 | -webkit-transition: all 450ms linear !important; | ||
| 31 | } \ 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..1c6b6287 100755 --- a/js/document/templates/montage-web/index.html +++ b/js/document/templates/montage-web/index.html | |||
| @@ -10,8 +10,34 @@ | |||
| 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-perspective: 1400px; | ||
| 27 | } | ||
| 28 | |||
| 29 | ninjaloadinghack { | ||
| 30 | display: none; | ||
| 31 | } | ||
| 13 | 32 | ||
| 14 | <link href="default_html.css" id="nj-stage-stylesheet" rel="stylesheet" type="text/css" media="screen"/> | 33 | .active-element-outline { |
| 34 | outline: #adff2f solid 2px; | ||
| 35 | } | ||
| 36 | |||
| 37 | .nj-preset-transition { | ||
| 38 | -webkit-transition: all 450ms linear !important; | ||
| 39 | } | ||
| 40 | </style> | ||
| 15 | 41 | ||
| 16 | <script type="text/javascript" data-package="." src="../../../../node_modules/montage/montage.js"></script> | 42 | <script type="text/javascript" data-package="." src="../../../../node_modules/montage/montage.js"></script> |
| 17 | 43 | ||
| @@ -24,7 +50,7 @@ | |||
| 24 | <script type="text/montage-serialization"> | 50 | <script type="text/montage-serialization"> |
| 25 | { | 51 | { |
| 26 | "owner": { | 52 | "owner": { |
| 27 | "prototype": "main.reel" | 53 | "prototype": "main" |
| 28 | } | 54 | } |
| 29 | } | 55 | } |
| 30 | </script> | 56 | </script> |
| @@ -32,7 +58,6 @@ | |||
| 32 | </head> | 58 | </head> |
| 33 | 59 | ||
| 34 | <body> | 60 | <body> |
| 35 | <style></style> | ||
| 36 | </body> | 61 | </body> |
| 37 | 62 | ||
| 38 | </html> \ No newline at end of file | 63 | </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 | |||