diff options
author | Kruti Shah | 2012-05-31 10:44:45 -0700 |
---|---|---|
committer | Kruti Shah | 2012-05-31 10:44:45 -0700 |
commit | c350cc1c060fdf17357ddadce024267943784593 (patch) | |
tree | 453f86e88f1ee1dfda6fb4b7cc7b17e306e39536 /js/io/templates/files | |
parent | fdc4f5c7f81ae3b9adeca2232e60268b4be594a2 (diff) | |
parent | 121d0e616f48aa7cd048763554089c20a1883d7a (diff) | |
download | ninja-c350cc1c060fdf17357ddadce024267943784593.tar.gz |
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts:
js/panels/Timeline/Layer.reel/Layer.js
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/io/templates/files')
-rwxr-xr-x | js/io/templates/files/animation.txt | 23 | ||||
-rwxr-xr-x | js/io/templates/files/banner.txt | 23 | ||||
-rwxr-xr-x | js/io/templates/files/html.txt | 1 |
3 files changed, 47 insertions, 0 deletions
diff --git a/js/io/templates/files/animation.txt b/js/io/templates/files/animation.txt new file mode 100755 index 00000000..a850f186 --- /dev/null +++ b/js/io/templates/files/animation.txt | |||
@@ -0,0 +1,23 @@ | |||
1 | <!DOCTYPE html> | ||
2 | |||
3 | <div class="ninja-content-wrapper"> | ||
4 | |||
5 | <div class="ninja-banner"> | ||
6 | |||
7 | <!-- Created with Motorola Mobility Ninja --> | ||
8 | <!-- Ninja-Banner Dimensions@@@ --> | ||
9 | |||
10 | <style type="text/css"> | ||
11 | html, body { | ||
12 | width: 100%; | ||
13 | height: 100%; | ||
14 | margin: 0; | ||
15 | padding: 0; | ||
16 | } | ||
17 | .ninja-content-wrapper {} | ||
18 | .ninja-banner {} | ||
19 | </style> | ||
20 | |||
21 | </div> | ||
22 | |||
23 | </div> \ No newline at end of file | ||
diff --git a/js/io/templates/files/banner.txt b/js/io/templates/files/banner.txt new file mode 100755 index 00000000..fcfac14c --- /dev/null +++ b/js/io/templates/files/banner.txt | |||
@@ -0,0 +1,23 @@ | |||
1 | <!DOCTYPE html> | ||
2 | |||
3 | <div class="ninja-content-wrapper"> | ||
4 | |||
5 | <div class="ninja-banner"> | ||
6 | |||
7 | <!-- Created with Motorola Mobility Ninja --> | ||
8 | <!-- Ninja-Banner Dimensions@@@ --> | ||
9 | |||
10 | <style type="text/css"> | ||
11 | html, body { | ||
12 | width: 100%; | ||
13 | height: 100%; | ||
14 | margin: 0; | ||
15 | padding: 0; | ||
16 | } | ||
17 | .ninja-content-wrapper {} | ||
18 | .ninja-banner {} | ||
19 | </style> | ||
20 | |||
21 | </div> | ||
22 | |||
23 | </div> \ No newline at end of file | ||
diff --git a/js/io/templates/files/html.txt b/js/io/templates/files/html.txt index 15641348..3449ae39 100755 --- a/js/io/templates/files/html.txt +++ b/js/io/templates/files/html.txt | |||
@@ -1,3 +1,4 @@ | |||
1 | <!DOCTYPE html> | ||
1 | <html> | 2 | <html> |
2 | 3 | ||
3 | <head> | 4 | <head> |