diff options
author | Jonathan Duran | 2012-07-17 09:30:22 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-07-17 09:30:22 -0700 |
commit | 53051672a62208fbc96957719d8285fac6431ed6 (patch) | |
tree | 79d542ee811044e8af2ef84aa0d6662c6eb895c4 /js/document/templates/banner/index.html | |
parent | 7e2c2dbd040ed79a3f0678f91bd4b6db9cf69231 (diff) | |
parent | 5146f224258929415adf4a8022e492454b4e2476 (diff) | |
download | ninja-53051672a62208fbc96957719d8285fac6431ed6.tar.gz |
Merge branch 'refs/heads/NINJA-master' into TimelineUber
Conflicts:
js/panels/Timeline/DragDrop.js
js/panels/Timeline/Keyframe.reel/Keyframe.js
js/panels/Timeline/Layer.reel/Layer.js
js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
js/panels/Timeline/Span.reel/Span.js
js/panels/Timeline/Style.reel/Style.js
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
js/panels/Timeline/Track.reel/Track.html
js/panels/Timeline/Track.reel/Track.js
js/panels/Timeline/Track.reel/css/Track.css
js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js
js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css
js/panels/Timeline/Tween.reel/Tween.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/document/templates/banner/index.html')
-rwxr-xr-x | js/document/templates/banner/index.html | 157 |
1 files changed, 79 insertions, 78 deletions
diff --git a/js/document/templates/banner/index.html b/js/document/templates/banner/index.html index 8b602867..a0f4d229 100755 --- a/js/document/templates/banner/index.html +++ b/js/document/templates/banner/index.html | |||
@@ -1,25 +1,26 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility LLC. |
4 | All Rights Reserved. | 4 | All Rights Reserved. |
5 | BSD License. | ||
6 | 5 | ||
7 | Redistribution and use in source and binary forms, with or without | 6 | Redistribution and use in source and binary forms, with or without |
8 | modification, are permitted provided that the following conditions are met: | 7 | modification, are permitted provided that the following conditions are met: |
9 | 8 | ||
10 | - Redistributions of source code must retain the above copyright notice, | 9 | * Redistributions of source code must retain the above copyright notice, |
11 | this list of conditions and the following disclaimer. | 10 | this list of conditions and the following disclaimer. |
12 | - Redistributions in binary form must reproduce the above copyright | 11 | |
13 | notice, this list of conditions and the following disclaimer in the | 12 | * Redistributions in binary form must reproduce the above copyright notice, |
14 | documentation and/or other materials provided with the distribution. | 13 | this list of conditions and the following disclaimer in the documentation |
15 | - Neither the name of Motorola Mobility nor the names of its contributors | 14 | and/or other materials provided with the distribution. |
16 | may be used to endorse or promote products derived from this software | 15 | |
17 | without specific prior written permission. | 16 | * Neither the name of Motorola Mobility LLC nor the names of its |
17 | contributors may be used to endorse or promote products derived from this | ||
18 | software without specific prior written permission. | ||
18 | 19 | ||
19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 20 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 21 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 22 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 23 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 24 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 25 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 26 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
@@ -28,32 +29,32 @@ 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 | 29 | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
29 | POSSIBILITY OF SUCH DAMAGE. | 30 | POSSIBILITY OF SUCH DAMAGE. |
30 | </copyright> --> | 31 | </copyright> --> |
31 | 32 | ||
32 | 33 | ||
33 | <!-- | 34 | <!-- |
34 | NOTE(s): | 35 | NOTE(s): |
35 | All elements in the head of the document to be exclude from I/O | 36 | All elements in the head of the document to be exclude from I/O |
36 | must set the 'data-ninja-template' | 37 | must set the 'data-ninja-template' |
37 | data-ninja-template="true" | 38 | data-ninja-template="true" |
38 | --> | 39 | --> |
39 | <html> | 40 | <html> |
40 | 41 | ||
41 | <head> | 42 | <head> |
42 | 43 | ||
43 | <style type="text/css" id="nj-stage-stylesheet" data-ninja-template="true"> | 44 | <style type="text/css" id="nj-stage-stylesheet" data-ninja-template="true"> |
44 | * { | 45 | * { |
45 | -webkit-animation: none !important; | 46 | -webkit-animation: none !important; |
46 | -webkit-transition-duration: 0s !important; | 47 | -webkit-transition-duration: 0s !important; |
47 | -webkit-animation-duration: 0s !important; | 48 | -webkit-animation-duration: 0s !important; |
48 | -webkit-animation-name: none !important; | 49 | -webkit-animation-name: none !important; |
49 | -webkit-animation-fill-mode: none !important; | 50 | -webkit-animation-fill-mode: none !important; |
50 | } | 51 | } |
51 | 52 | ||
52 | body { | 53 | body { |
53 | margin: 0; | 54 | margin: 0; |
54 | padding: 0; | 55 | padding: 0; |
55 | position: absolute; | 56 | position: absolute; |
56 | } | 57 | } |
57 | 58 | ||
58 | html { | 59 | html { |
59 | overflow: scroll; | 60 | overflow: scroll; |
@@ -65,38 +66,38 @@ POSSIBILITY OF SUCH DAMAGE. | |||
65 | background: #666; | 66 | background: #666; |
66 | } | 67 | } |
67 | 68 | ||
68 | .active-element-outline { | 69 | .active-element-outline { |
69 | outline: #adff2f solid 2px; | 70 | outline: #adff2f solid 2px; |
70 | } | 71 | } |
71 | 72 | ||
72 | .nj-preset-transition { | 73 | .nj-preset-transition { |
73 | -webkit-transition: all 450ms linear !important; | 74 | -webkit-transition: all 450ms linear !important; |
74 | } | 75 | } |
75 | 76 | ||
76 | ninjaloadinghack { | 77 | ninjaloadinghack { |
77 | display: none; | 78 | display: none; |
78 | } | 79 | } |
79 | 80 | ||
80 | ninja-viewport, ninja-content { | 81 | ninja-viewport, ninja-content { |
81 | display: block; | 82 | display: block; |
82 | margin: 0; | 83 | margin: 0; |
83 | padding: 0; | 84 | padding: 0; |
84 | border: 0; | 85 | border: 0; |
85 | position: absolute; | 86 | position: absolute; |
86 | overflow: visible; | 87 | overflow: visible; |
87 | top: 0; | 88 | top: 0; |
88 | left: 0; | 89 | left: 0; |
89 | background: transparent; | 90 | background: transparent; |
90 | } | 91 | } |
91 | 92 | ||
92 | ninja-viewport { | 93 | ninja-viewport { |
93 | background: #FFF; | 94 | background: #FFF; |
94 | } | 95 | } |
95 | 96 | ||
96 | ninja-content { | 97 | ninja-content { |
97 | -webkit-transform-style: preserve-3d; | 98 | -webkit-transform-style: preserve-3d; |
98 | -webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); | 99 | -webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); |
99 | } | 100 | } |
100 | 101 | ||
101 | ::-webkit-scrollbar { width: 11px; height: 11px; } | 102 | ::-webkit-scrollbar { width: 11px; height: 11px; } |
102 | ::-webkit-scrollbar-button:start:decrement, ::-webkit-scrollbar-button:end:increment { display: none; } | 103 | ::-webkit-scrollbar-button:start:decrement, ::-webkit-scrollbar-button:end:increment { display: none; } |
@@ -121,7 +122,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
121 | ::-webkit-resizer:disabled { display: block; } | 122 | ::-webkit-resizer:disabled { display: block; } |
122 | 123 | ||
123 | </style> | 124 | </style> |
124 | 125 | ||
125 | <script type="text/javascript" data-ninja-template="true"> | 126 | <script type="text/javascript" data-ninja-template="true"> |
126 | 127 | ||
127 | function getElement(x,y) { | 128 | function getElement(x,y) { |
@@ -144,11 +145,11 @@ POSSIBILITY OF SUCH DAMAGE. | |||
144 | set: function() { | 145 | set: function() { |
145 | } | 146 | } |
146 | }); | 147 | }); |
147 | </script> | 148 | </script> |
148 | 149 | ||
149 | <!-- TODO: Determine if loading Montage is always needed or if it could be done author-time or on file open --> | 150 | <!-- TODO: Determine if loading Montage is always needed or if it could be done author-time or on file open --> |
150 | 151 | ||
151 | <script type="text/javascript" data-package="../app" src="../../../../node_modules/montage/montage.js" data-ninja-template="true"></script> | 152 | <script type="text/javascript" data-package="../app" src="../../../../node_modules/montage/montage.js" data-ninja-template="true"></script> |
152 | 153 | ||
153 | <script type="text/montage-serialization" data-ninja-template="true"> | 154 | <script type="text/montage-serialization" data-ninja-template="true"> |
154 | { | 155 | { |
@@ -158,18 +159,18 @@ POSSIBILITY OF SUCH DAMAGE. | |||
158 | } | 159 | } |
159 | </script> | 160 | </script> |
160 | 161 | ||
161 | </head> | 162 | </head> |
163 | |||
164 | <body> | ||
165 | |||
166 | <ninjaloadinghack></ninjaloadinghack> | ||
162 | 167 | ||
163 | <body> | ||
164 | |||
165 | <ninjaloadinghack></ninjaloadinghack> | ||
166 | |||
167 | <ninja-viewport> | 168 | <ninja-viewport> |
168 | 169 | ||
169 | <ninja-content></ninja-content> | 170 | <ninja-content></ninja-content> |
170 | 171 | ||
171 | </ninja-viewport> | 172 | </ninja-viewport> |
172 | 173 | ||
173 | </body> | 174 | </body> |
174 | 175 | ||
175 | </html> | 176 | </html> |