diff --git a/src/code_manager/model/CssGenerator.js b/src/code_manager/model/CssGenerator.js index 52be6c1af..b84a3387a 100644 --- a/src/code_manager/model/CssGenerator.js +++ b/src/code_manager/model/CssGenerator.js @@ -11,10 +11,11 @@ module.exports = Backbone.Model.extend({ * @param {Model} model * @return {String} */ - buildFromModel(model) { + buildFromModel(model, opts = {}) { var code = ''; var style = model.get('style'); var classes = model.get('classes'); + const wrappesIsBody = opts.wrappesIsBody; // Let's know what classes I've found if(classes) { @@ -24,7 +25,10 @@ module.exports = Backbone.Model.extend({ } if(style && Object.keys(style).length !== 0) { - code += '#' + model.getId() + '{'; + let selector = `#${model.getId()}`; + selector = wrappesIsBody && model.get('wrapper') ? + 'body' : selector; + code += `${selector} {`; for(var prop in style){ if(style.hasOwnProperty(prop)) code += prop + ':' + style[prop] + ';'; @@ -61,7 +65,7 @@ module.exports = Backbone.Model.extend({ build(model, opts = {}) { const cssc = opts.cssc; this.compCls = []; - var code = this.buildFromModel(model); + var code = this.buildFromModel(model, opts); code += this.buildFromComp(model); var compCls = this.compCls; diff --git a/src/editor/model/Editor.js b/src/editor/model/Editor.js index ad840c44d..146a57993 100644 --- a/src/editor/model/Editor.js +++ b/src/editor/model/Editor.js @@ -424,12 +424,14 @@ module.exports = Backbone.Model.extend({ * @private */ getCss() { + const config = this.config; + const wrappesIsBody = config.wrappesIsBody; var cssc = this.get('CssComposer'); var wrp = this.get('DomComponents').getComponent(); - var protCss = this.config.protectedCss; + var protCss = config.protectedCss; return protCss + this.get('CodeManager').getCode(wrp, 'css', { - cssc + cssc, wrappesIsBody }); },