diff options
author | Valerio Virgillito | 2012-02-13 21:43:51 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-13 21:43:51 -0800 |
commit | 081f17954c735fc8b946d72a25b0ee60d370ef9b (patch) | |
tree | de7b50f2d02365df897ef4356f953d3833c9cabd /js/panels/Timeline/Span.reel/Span.html | |
parent | 47df0aff81c25334b129047bb227ea5015357eda (diff) | |
parent | 1d82f1a041612f32bbf6c9f20d9fb14e2d11fcc7 (diff) | |
download | ninja-081f17954c735fc8b946d72a25b0ee60d370ef9b.tar.gz |
Merge branch 'refs/heads/master' into components
Conflicts:
js/components/treeview/ninja-leaf.reel/ninja-leaf.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/panels/Timeline/Span.reel/Span.html')
-rw-r--r-- | js/panels/Timeline/Span.reel/Span.html | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/js/panels/Timeline/Span.reel/Span.html b/js/panels/Timeline/Span.reel/Span.html new file mode 100644 index 00000000..e36a25d6 --- /dev/null +++ b/js/panels/Timeline/Span.reel/Span.html | |||
@@ -0,0 +1,27 @@ | |||
1 | <!DOCTYPE html> | ||
2 | <html lang="en"> | ||
3 | <head> | ||
4 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | ||
5 | <link rel="stylesheet" type="text/css" href="css/Span.css"> | ||
6 | <script type="text/montage-serialization"> | ||
7 | { | ||
8 | "owner": { | ||
9 | "module": "js/panels/Timeline/Span.reel", | ||
10 | "name": "Span", | ||
11 | "properties": { | ||
12 | "element": {"#": "spanspace"}, | ||
13 | "tweenspan": {"#": "tweenspan"} | ||
14 | } | ||
15 | } | ||
16 | |||
17 | } | ||
18 | </script> | ||
19 | </head> | ||
20 | <body> | ||
21 | |||
22 | <div id="spanspace"> | ||
23 | <div id="tweenspan" class="tween_span"></div> | ||
24 | </div> | ||
25 | |||
26 | </body> | ||
27 | </html> \ No newline at end of file | ||