diff options
| author | Jonathan Duran | 2012-05-31 08:54:48 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-05-31 08:54:48 -0700 |
| commit | f297093b5bfa62c9832829751a12f0e556bb5cc0 (patch) | |
| tree | 6e04cdf142cb1b36e2197970c9dc2141017a2be7 /js/io/templates/files | |
| parent | 9253e2ce98d748edd8c3929f113a597923960387 (diff) | |
| parent | d49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff) | |
| download | ninja-f297093b5bfa62c9832829751a12f0e556bb5cc0.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/Layer.reel/Layer.js
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/properties.reel/properties.js
Signed-off-by: Jonathan Duran <jduran@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> |