yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'v8/8.2' into v8/dev

Browse Source
This commit is contained in:
Bjarke Berg
2019-09-26 15:30:51 +02:00
parent 5831cd9159 e90a10ba95
commit 6a7b9fa6f7
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
View File

@@ -1172,7 +1172,6 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
var tinyMceRect = editor.editorContainer.getBoundingClientRect();
var tinyMceTop = tinyMceRect.top;
var tinyMceBottom = tinyMceRect.bottom;
var tinyMceWidth = tinyMceRect.width;
var tinyMceEditArea = tinyMce.find(".mce-edit-area");
@@ -1184,15 +1183,13 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
.css("visibility", "visible")
.css("position", "fixed")
.css("top", "177px")
.css("margin-top", "0")
.css("width", tinyMceWidth);
.css("margin-top", "0");
} else {
toolbar
.css("visibility", "visible")
.css("position", "absolute")
.css("top", "auto")
.css("margin-top", "0")
.css("width", tinyMceWidth);
.css("margin-top", "0");
}
},

2
src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
View File

@@ -657,6 +657,8 @@
// had to overwrite defaults from TinyMCE, needed for buttons panel to float to new line in narrow space.
.umb-grid .mce-container > div {
white-space: normal;
left:0;
right:0;
}