aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-15 15:14:49 -0700
committerValerio Virgillito2012-05-15 15:14:49 -0700
commit1c91748d8517656c0982c6fc194cd0010d02fb63 (patch)
tree884164493a367aa5d0e4afd9a7c5dc280772d56b /js
parentcdf00ba3e82c5064dd02ffa27f3069b4dd2e04c2 (diff)
parent1ab2c2925fbf6186c8d9872392831f69c61d063d (diff)
downloadninja-1c91748d8517656c0982c6fc194cd0010d02fb63.tar.gz
Merge pull request #234 from joseeight/Document
Fixing overflow bug
Diffstat (limited to 'js')
-rwxr-xr-xjs/document/views/design.js2
-rwxr-xr-xjs/io/templates/files/animation.txt7
-rwxr-xr-xjs/io/templates/files/banner.txt9
3 files changed, 8 insertions, 10 deletions
diff --git a/js/document/views/design.js b/js/document/views/design.js
index 48c91aad..c7aab1d7 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -177,7 +177,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
177 } 177 }
178 } 178 }
179 //Adjusting margin per size of document 179 //Adjusting margin per size of document
180 this.document.head.getElementsByTagName('style')[0].innerHTML += '\n ninja-content {overflow: visible !important;} ninja-content, ninja-viewport {width: ' + this._template.size.width + 'px; height: ' + this._template.size.height + 'px;}'; 180 this.document.head.getElementsByTagName('style')[0].innerHTML += '\n ninja-viewport {overflow: visible !important;} ninja-content, ninja-viewport {width: ' + this._template.size.width + 'px; height: ' + this._template.size.height + 'px;}';
181 //Setting content in template 181 //Setting content in template
182 ninjaBanner.innerHTML = banner.innerHTML; 182 ninjaBanner.innerHTML = banner.innerHTML;
183 //Garbage collection 183 //Garbage collection
diff --git a/js/io/templates/files/animation.txt b/js/io/templates/files/animation.txt
index 33b45e53..8a3dbd41 100755
--- a/js/io/templates/files/animation.txt
+++ b/js/io/templates/files/animation.txt
@@ -2,12 +2,11 @@
2 2
3<div class="ninja-content-wrapper"> 3<div class="ninja-content-wrapper">
4 4
5 <!-- Created with Motorola Mobility Ninja -->
6
7 <!-- Ninja-Banner Dimensions@@@ -->
8
9 <div class="ninja-banner"> 5 <div class="ninja-banner">
10 6
7 <!-- Created with Motorola Mobility Ninja -->
8 <!-- Ninja-Banner Dimensions@@@ -->
9
11 <style type="text/css"> 10 <style type="text/css">
12 .ninja-content-wrapper {} 11 .ninja-content-wrapper {}
13 .ninja-banner {} 12 .ninja-banner {}
diff --git a/js/io/templates/files/banner.txt b/js/io/templates/files/banner.txt
index 33b45e53..f26accf6 100755
--- a/js/io/templates/files/banner.txt
+++ b/js/io/templates/files/banner.txt
@@ -2,12 +2,11 @@
2 2
3<div class="ninja-content-wrapper"> 3<div class="ninja-content-wrapper">
4 4
5 <!-- Created with Motorola Mobility Ninja -->
6
7 <!-- Ninja-Banner Dimensions@@@ -->
8
9 <div class="ninja-banner"> 5 <div class="ninja-banner">
10 6
7 <!-- Created with Motorola Mobility Ninja -->
8 <!-- Ninja-Banner Dimensions@@@ -->
9
11 <style type="text/css"> 10 <style type="text/css">
12 .ninja-content-wrapper {} 11 .ninja-content-wrapper {}
13 .ninja-banner {} 12 .ninja-banner {}