diff options
author | Pushkar Joshi | 2012-06-11 14:07:13 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-06-11 14:07:13 -0700 |
commit | 71bc93ad0d53a77d70c688b2b3aacf694dd1de91 (patch) | |
tree | a432a4652bf7c96aea72a22bf27946eeee8fc4a5 /js/controllers/styles-controller.js | |
parent | 76db3eb0aa4ffe9e75812db570c793e9f852f853 (diff) | |
parent | 756cbfad2b98b300af8db3793aa21718b88dd950 (diff) | |
download | ninja-71bc93ad0d53a77d70c688b2b3aacf694dd1de91.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/controllers/styles-controller.js')
-rwxr-xr-x | js/controllers/styles-controller.js | 4 |
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{}'); |