aboutsummaryrefslogtreecommitdiff
path: root/js/io
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-25 11:11:33 -0700
committerArmen Kesablyan2012-06-25 11:11:33 -0700
commit35aebe8d72ccfa9ea010eb79c09ecf89cc1ed44d (patch)
tree337fd4e9ca5c68fd15d3f56a83ff42aa8eade670 /js/io
parent9fe9bc495af74d963fa7061d4d1a479720133a56 (diff)
parentd24243239f38704580bb3561a3959688b171809b (diff)
downloadninja-35aebe8d72ccfa9ea010eb79c09ecf89cc1ed44d.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/io')
-rw-r--r--js/io/system/ninjalibrary.json2
-rwxr-xr-xjs/io/templates/files/html.txt6
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>