diff options
author | Armen Kesablyan | 2012-05-17 14:01:38 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-05-17 14:01:38 -0700 |
commit | 6c8f3525b839e82cf43df43700a0160ee2c5458f (patch) | |
tree | 3fb801fa54b759c5568d75bb467e02652ce77c3e /js/io/templates | |
parent | e8ae5db7ce7023b638375cbc27a3f7b7a2f77b23 (diff) | |
parent | 342c97ac9b727b22a7b0bfefca4d2a168bc3055b (diff) | |
download | ninja-6c8f3525b839e82cf43df43700a0160ee2c5458f.tar.gz |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
css/ninja.css
scss/imports/scss/_toolbar.scss
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/io/templates')
-rwxr-xr-x | js/io/templates/files/animation.txt | 6 | ||||
-rwxr-xr-x | js/io/templates/files/banner.txt | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/js/io/templates/files/animation.txt b/js/io/templates/files/animation.txt index 8a3dbd41..a850f186 100755 --- a/js/io/templates/files/animation.txt +++ b/js/io/templates/files/animation.txt | |||
@@ -8,6 +8,12 @@ | |||
8 | <!-- Ninja-Banner Dimensions@@@ --> | 8 | <!-- Ninja-Banner Dimensions@@@ --> |
9 | 9 | ||
10 | <style type="text/css"> | 10 | <style type="text/css"> |
11 | html, body { | ||
12 | width: 100%; | ||
13 | height: 100%; | ||
14 | margin: 0; | ||
15 | padding: 0; | ||
16 | } | ||
11 | .ninja-content-wrapper {} | 17 | .ninja-content-wrapper {} |
12 | .ninja-banner {} | 18 | .ninja-banner {} |
13 | </style> | 19 | </style> |
diff --git a/js/io/templates/files/banner.txt b/js/io/templates/files/banner.txt index f26accf6..fcfac14c 100755 --- a/js/io/templates/files/banner.txt +++ b/js/io/templates/files/banner.txt | |||
@@ -8,6 +8,12 @@ | |||
8 | <!-- Ninja-Banner Dimensions@@@ --> | 8 | <!-- Ninja-Banner Dimensions@@@ --> |
9 | 9 | ||
10 | <style type="text/css"> | 10 | <style type="text/css"> |
11 | html, body { | ||
12 | width: 100%; | ||
13 | height: 100%; | ||
14 | margin: 0; | ||
15 | padding: 0; | ||
16 | } | ||
11 | .ninja-content-wrapper {} | 17 | .ninja-content-wrapper {} |
12 | .ninja-banner {} | 18 | .ninja-banner {} |
13 | </style> | 19 | </style> |