diff options
author | hwc487 | 2012-07-09 16:08:02 -0700 |
---|---|---|
committer | hwc487 | 2012-07-09 16:08:02 -0700 |
commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/document/templates/html/index.html | |
parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/document/templates/html/index.html')
-rwxr-xr-x | js/document/templates/html/index.html | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/js/document/templates/html/index.html b/js/document/templates/html/index.html index 2677ade6..98ab3506 100755 --- a/js/document/templates/html/index.html +++ b/js/document/templates/html/index.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <!DOCTYPE html> | 1 | <!doctype html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
4 | All Rights Reserved. | 4 | All Rights Reserved. |
@@ -28,37 +28,37 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |||
28 | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 28 | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
29 | POSSIBILITY OF SUCH DAMAGE. | 29 | POSSIBILITY OF SUCH DAMAGE. |
30 | </copyright> --> | 30 | </copyright> --> |
31 | 31 | ||
32 | 32 | ||
33 | <!-- | 33 | <!-- |
34 | NOTE(s): | 34 | NOTE(s): |
35 | All elements in the head of the document to be exclude from I/O | 35 | All elements in the head of the document to be exclude from I/O |
36 | must set the 'data-ninja-template' | 36 | must set the 'data-ninja-template' |
37 | data-ninja-template="true" | 37 | data-ninja-template="true" |
38 | --> | 38 | --> |
39 | 39 | ||
40 | <!-- TODO: Determine if loading Montage is always needed or if it could be done author-time or on file open --> | 40 | <!-- TODO: Determine if loading Montage is always needed or if it could be done author-time or on file open --> |
41 | 41 | ||
42 | <html> | 42 | <html> |
43 | 43 | ||
44 | <head> | 44 | <head> |
45 | 45 | ||
46 | <style type="text/css" id="nj-stage-stylesheet" data-ninja-template="true"> | 46 | <style type="text/css" id="nj-stage-stylesheet" data-ninja-template="true"> |
47 | * { | 47 | * { |
48 | -webkit-animation: none !important; | 48 | -webkit-animation: none !important; |
49 | -webkit-transition-duration: 0s !important; | 49 | -webkit-transition-duration: 0s !important; |
50 | -webkit-animation-duration: 0s !important; | 50 | -webkit-animation-duration: 0s !important; |
51 | -webkit-animation-name: none !important; | 51 | -webkit-animation-name: none !important; |
52 | -webkit-animation-fill-mode: none !important; | 52 | -webkit-animation-fill-mode: none !important; |
53 | } | 53 | } |
54 | 54 | ||
55 | body { | 55 | body { |
56 | margin: 0; | 56 | margin: 0; |
57 | padding: 0; | 57 | padding: 0; |
58 | position: absolute; | 58 | position: absolute; |
59 | -webkit-transform-style: preserve-3d; | 59 | -webkit-transform-style: preserve-3d; |
60 | -webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); | 60 | -webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); |
61 | } | 61 | } |
62 | 62 | ||
63 | html { | 63 | html { |
64 | overflow: scroll; | 64 | overflow: scroll; |
@@ -68,18 +68,18 @@ POSSIBILITY OF SUCH DAMAGE. | |||
68 | width: 100%; | 68 | width: 100%; |
69 | height: 100%; | 69 | height: 100%; |
70 | } | 70 | } |
71 | |||
72 | ninjaloadinghack { | ||
73 | display: none; | ||
74 | } | ||
75 | 71 | ||
76 | .active-element-outline { | 72 | ninjaloadinghack { |
77 | outline: #adff2f solid 2px; | 73 | display: none; |
78 | } | 74 | } |
79 | 75 | ||
80 | .nj-preset-transition { | 76 | .active-element-outline { |
81 | -webkit-transition: all 450ms linear !important; | 77 | outline: #adff2f solid 2px; |
82 | } | 78 | } |
79 | |||
80 | .nj-preset-transition { | ||
81 | -webkit-transition: all 450ms linear !important; | ||
82 | } | ||
83 | 83 | ||
84 | .nj-element-highlight { | 84 | .nj-element-highlight { |
85 | outline: 4px solid #ff0000; | 85 | outline: 4px solid #ff0000; |
@@ -108,7 +108,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
108 | ::-webkit-resizer:disabled { display: block; } | 108 | ::-webkit-resizer:disabled { display: block; } |
109 | 109 | ||
110 | </style> | 110 | </style> |
111 | 111 | ||
112 | <script type="text/javascript" data-ninja-template="true"> | 112 | <script type="text/javascript" data-ninja-template="true"> |
113 | 113 | ||
114 | function getElement(x,y) { | 114 | function getElement(x,y) { |
@@ -132,9 +132,9 @@ POSSIBILITY OF SUCH DAMAGE. | |||
132 | } | 132 | } |
133 | }); | 133 | }); |
134 | 134 | ||
135 | </script> | 135 | </script> |
136 | 136 | ||
137 | <script type="text/javascript" data-package="../app" src="../../../../node_modules/montage/montage.js" data-ninja-template="true"></script> | 137 | <script type="text/javascript" data-package="../app" src="../../../../node_modules/montage/montage.js" data-ninja-template="true"></script> |
138 | 138 | ||
139 | <script type="text/montage-serialization" data-ninja-template="true"> | 139 | <script type="text/montage-serialization" data-ninja-template="true"> |
140 | { | 140 | { |
@@ -144,8 +144,8 @@ POSSIBILITY OF SUCH DAMAGE. | |||
144 | } | 144 | } |
145 | </script> | 145 | </script> |
146 | 146 | ||
147 | </head> | 147 | </head> |
148 | 148 | ||
149 | <body></body> | 149 | <body></body> |
150 | 150 | ||
151 | </html> | 151 | </html> |