aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/styles-controller.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-08 12:59:13 -0700
committerValerio Virgillito2012-06-08 12:59:13 -0700
commita50814178be2775892ed999c28041d8e81291e22 (patch)
tree309af98cd840d3841be74c32e87c30fa8739ff1e /js/controllers/styles-controller.js
parent4070475b8da7257eca629be7288bf7a31d5e384e (diff)
parentd14249dd2d76e9eb8d14733c10393d36bd2ea8ee (diff)
downloadninja-a50814178be2775892ed999c28041d8e81291e22.tar.gz
Merge branch 'refs/heads/master' into timeline-resizer-fix
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{}');