diff options
author | Kruti Shah | 2012-06-26 09:46:59 -0700 |
---|---|---|
committer | Kruti Shah | 2012-06-26 09:46:59 -0700 |
commit | 4b4a95140d52e191e5e637371dfc369e50e7f9c8 (patch) | |
tree | 274b55f66527a9925032c5d6da4baa6f12be8ada /js/io | |
parent | 4bf8e4cdc179c3b388fc06f26008808aa4b77eb0 (diff) | |
parent | f0d4d89d856b99da1ca8dd3366c48bb76ba6b1f6 (diff) | |
download | ninja-4b4a95140d52e191e5e637371dfc369e50e7f9c8.tar.gz |
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'js/io')
-rw-r--r-- | js/io/system/ninjalibrary.json | 2 | ||||
-rwxr-xr-x | js/io/templates/files/html.txt | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json index 0417fa3d..579264cb 100644 --- a/js/io/system/ninjalibrary.json +++ b/js/io/system/ninjalibrary.json | |||
@@ -1,6 +1,6 @@ | |||
1 | { | 1 | { |
2 | "libraries": [ | 2 | "libraries": [ |
3 | {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.0.0"}, | 3 | {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.0.0"}, |
4 | {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.2"} | 4 | {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.3"} |
5 | ] | 5 | ] |
6 | } \ No newline at end of file | 6 | } \ No newline at end of file |
diff --git a/js/io/templates/files/html.txt b/js/io/templates/files/html.txt index 3449ae39..33d50c49 100755 --- a/js/io/templates/files/html.txt +++ b/js/io/templates/files/html.txt | |||
@@ -10,6 +10,12 @@ | |||
10 | <meta name="generator" content="Motorola Mobility Ninja"> | 10 | <meta name="generator" content="Motorola Mobility Ninja"> |
11 | 11 | ||
12 | <style type="text/css"> | 12 | <style type="text/css"> |
13 | html, body { | ||
14 | width: 100%; | ||
15 | height: 100%; | ||
16 | margin: 0; | ||
17 | padding: 0; | ||
18 | } | ||
13 | </style> | 19 | </style> |
14 | 20 | ||
15 | </head> | 21 | </head> |