diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js index 246d5c297a..b6448231fc 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js @@ -189,7 +189,7 @@ function tinyMceService($log, $q, imageHelper, $locale, $http, $timeout, stylesh //fixed_toolbar_container: "#blah", selector: "#" + args.htmlId, theme: args.theme ? args.theme : "modern", - //inline: true, + inline: true, plugins: plugins, valid_elements: tinyMceConfig.validElements, invalid_elements: tinyMceConfig.inValidElements, @@ -288,9 +288,6 @@ function tinyMceService($log, $q, imageHelper, $locale, $http, $timeout, stylesh var cfg = {}; cfg.toolbar = ["code", "bold", "italic", "styleselect", "alignleft", "aligncenter", "alignright", "bullist", "numlist", "outdent", "indent", "link", "image", "umbmediapicker", "umbembeddialog", "umbmacro"]; cfg.stylesheets = []; - cfg.dimensions = { - height: 500 - }; cfg.maxImageSize = 500; return cfg; }, diff --git a/src/Umbraco.Web.UI.Client/src/less/rte.less b/src/Umbraco.Web.UI.Client/src/less/rte.less index 4fdc8e9629..0dd8a0573e 100644 --- a/src/Umbraco.Web.UI.Client/src/less/rte.less +++ b/src/Umbraco.Web.UI.Client/src/less/rte.less @@ -11,7 +11,7 @@ } .umb-rte .mce-content-body { - padding:10px; + padding: 10px; background-color: #fff; font-size: 14px; line-height: 1.5em; diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js index c10fd989e8..355e765f5c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js @@ -85,8 +85,6 @@ angular.module("umbraco") //create a baseline Config to exten upon var baseLineConfigObj = { - height: editorConfig.dimensions.height, - width: editorConfig.dimensions.width, maxImageSize: editorConfig.maxImageSize };