From b92978c7d38032816a090de12ae4e2f41deffe15 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Mon, 15 Oct 2018 15:23:56 +0200
Subject: [PATCH] fix resize + scrolling issues

---
 .../src/common/services/tinymce.service.js    |  8 +------
 src/Umbraco.Web.UI.Client/src/less/rte.less   | 21 ++++---------------
 2 files changed, 5 insertions(+), 24 deletions(-)

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 4906ed2c9c..9884d9abd7 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
@@ -44,12 +44,6 @@ function tinyMceService($log, $q, imageHelper, $locale, $http, $timeout, stylesh
         var styleFormats = [];
         var promises = [$q.when(true)]; //a collection of promises, the first one is an empty promise
 
-        //get the umbraco stylesheet loaded and use that href to inject into tinymce.
-        //strip off the query string since tiny will append our cache buster itself.
-        stylesheets.push(_.find(document.styleSheets, function (s) {
-            return s.href && s.href.indexOf("assets/css/umbraco.css") !== -1
-        }).href.split("?")[0]);
-
         //queue rules loading
         if (configuredStylesheets) {
             angular.forEach(configuredStylesheets, function (val, key) {
@@ -230,7 +224,7 @@ function tinyMceService($log, $q, imageHelper, $locale, $http, $timeout, stylesh
                     menubar: false,
                     statusbar: false,
                     relative_urls: false,
-                    autoresize_bottom_margin: 0,
+                    autoresize_bottom_margin: 10,
                     content_css: styles.stylesheets,
                     style_formats: styles.styleFormats,
                     language: getLanguage(),
diff --git a/src/Umbraco.Web.UI.Client/src/less/rte.less b/src/Umbraco.Web.UI.Client/src/less/rte.less
index d0b0ef4fae..f4545ca7db 100644
--- a/src/Umbraco.Web.UI.Client/src/less/rte.less
+++ b/src/Umbraco.Web.UI.Client/src/less/rte.less
@@ -1,36 +1,23 @@
 // Styles for the RTE, the whole stylesheet is used in Tiny and these are specific to it's content
 // -------------------------
 
-.umb-rte {
-    overflow: hidden;
+.umb-rte .mce-tinymce {
+    box-shadow: none;
 }
 
 .umb-rte .umb-rte-editor{
     border:1px solid @gray-8;
-    min-height:25px;
+    min-height: 100px;
 }
 
 .umb-rte.mce-content-body {
-    padding: 10px;
-    background-color: #fff;
-    font-size: 14px;
+    background-color: @white;
     line-height: 1.5em;
-    scrollbar-3dlight-color: #f0f0ee;
-    scrollbar-arrow-color: #676662;
-    scrollbar-base-color: #f0f0ee;
-    scrollbar-darkshadow-color: #ddd;
-    scrollbar-face-color: #e0e0dd;
-    scrollbar-highlight-color: #f0f0ee;
-    scrollbar-shadow-color: #f0f0ee;
-    scrollbar-track-color: #f5f5f5;
 }
 
 /* loader for macro loading in tinymce*/
 .umb-rte.mce-content-body .umb-macro-holder.loading {
     background: url(img/loader.gif) right no-repeat;
-    -moz-background-size: 18px;
-    -o-background-size: 18px;
-    -webkit-background-size: 18px;
     background-size: 18px;
     background-position-x: 99%;
 }