aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/styles-controller.js
diff options
context:
space:
mode:
authorJonathan Duran2012-06-11 10:12:08 -0700
committerJonathan Duran2012-06-11 10:12:08 -0700
commit6a3b09433b8d5894a0f2a6c00748825727c2d991 (patch)
tree377cd68e0580172bc234059dbd4482c964d49bd4 /js/controllers/styles-controller.js
parent79cbc26904a7fbd7a846f48da6c026a91221ba93 (diff)
parentbad5a44824ba35cbc7f4f4d245e32b90208f00c1 (diff)
downloadninja-6a3b09433b8d5894a0f2a6c00748825727c2d991.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/controllers/styles-controller.js')
-rwxr-xr-xjs/controllers/styles-controller.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index 83722184..a25a05df 100755
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -154,6 +154,10 @@ var stylesController = exports.StylesController = Montage.create(Component, {
154 styles['-webkit-transform-style'] = 'preserve-3d'; 154 styles['-webkit-transform-style'] = 'preserve-3d';
155 needsRule = true; 155 needsRule = true;
156 } 156 }
157 if(this.getElementStyle(this.currentDocument.model.documentRoot, "background-color", false, false) == null) {
158 styles['background-color'] = "transparent";
159 needsRule = true;
160 }
157 161
158 if(needsRule) { 162 if(needsRule) {
159 rule = this.addRule('.ninja-body{}'); 163 rule = this.addRule('.ninja-body{}');