diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/october.css index 9ec2327d4..bb39eeaeb 100644 --- a/modules/backend/assets/css/october.css +++ b/modules/backend/assets/css/october.css @@ -13044,7 +13044,7 @@ div.popover-overlay { } .fancy-layout .field-richeditor { border: none; - border-left: 1px solid #e0e0e0; + border-left: 1px solid #e0e0e0 !important; } .fancy-layout .field-richeditor, .fancy-layout .field-richeditor .redactor_box, diff --git a/modules/backend/assets/less/controls/fancylayout.less b/modules/backend/assets/less/controls/fancylayout.less index 386b851b8..0eedda6c0 100644 --- a/modules/backend/assets/less/controls/fancylayout.less +++ b/modules/backend/assets/less/controls/fancylayout.less @@ -448,7 +448,7 @@ .field-richeditor { border: none; - border-left: 1px solid @color-form-field-border; + border-left: 1px solid @color-form-field-border!important; &, .redactor_box, .redactor_toolbar { .border-radius(0); diff --git a/modules/backend/formwidgets/richeditor/assets/css/richeditor.css b/modules/backend/formwidgets/richeditor/assets/css/richeditor.css index 5084f0368..aa866aa2d 100644 --- a/modules/backend/formwidgets/richeditor/assets/css/richeditor.css +++ b/modules/backend/formwidgets/richeditor/assets/css/richeditor.css @@ -56,6 +56,7 @@ } .redactor_box_fullscreen { z-index: 1060 !important; + width: 100%!important; } #redactor_modal_overlay, #redactor_modal, @@ -1226,8 +1227,8 @@ body .redactor_air .redactor_toolbar { .field-richeditor.stretch .redactor_box { display: block; position: relative; - height: 100%; - width: 100%; + height: 100%!important; + width: 100%!important; overflow: hidden; } .field-richeditor.stretch .redactor_box .redactor_toolbar { @@ -1239,6 +1240,10 @@ body .redactor_air .redactor_toolbar { } .field-richeditor.stretch .redactor_box .redactor_editor { height: 100% !important; + width: 100%!important; + left: 0; + top: 0; + position: absolute; } .field-richeditor.stretch .redactor_box iframe, .field-richeditor.stretch .redactor_box textarea { diff --git a/modules/backend/formwidgets/richeditor/assets/js/richeditor.js b/modules/backend/formwidgets/richeditor/assets/js/richeditor.js index df3a8289e..9e83ed9df 100644 --- a/modules/backend/formwidgets/richeditor/assets/js/richeditor.js +++ b/modules/backend/formwidgets/richeditor/assets/js/richeditor.js @@ -80,14 +80,14 @@ } RichEditor.prototype.build = function() { - var $editors = $('textarea', this.$el), + var $editors = $('.redactor_editor', this.$el), $toolbar = $('.redactor_toolbar', this.$el) if (!$editors.length) return if (this.$el.hasClass('stretch')) { - $editors.css('padding-top', $toolbar.height()) + $editors.css('top', $toolbar.height()+1) } } diff --git a/modules/backend/formwidgets/richeditor/assets/less/redactor.less b/modules/backend/formwidgets/richeditor/assets/less/redactor.less index 0bd5a6728..4d68da715 100644 --- a/modules/backend/formwidgets/richeditor/assets/less/redactor.less +++ b/modules/backend/formwidgets/richeditor/assets/less/redactor.less @@ -77,6 +77,7 @@ .redactor_box_fullscreen { z-index: @richeditor-zindex !important; + width: 100%!important; } #redactor_modal_overlay, diff --git a/modules/backend/formwidgets/richeditor/assets/less/richeditor.less b/modules/backend/formwidgets/richeditor/assets/less/richeditor.less index b58af1fa2..20f2943b0 100644 --- a/modules/backend/formwidgets/richeditor/assets/less/richeditor.less +++ b/modules/backend/formwidgets/richeditor/assets/less/richeditor.less @@ -41,8 +41,8 @@ .redactor_box { display: block; position: relative; - height: 100%; - width: 100%; + height: 100%!important; + width: 100%!important; overflow: hidden; .redactor_toolbar { @@ -55,6 +55,10 @@ .redactor_editor { height: 100% !important; + width: 100%!important; + left: 0; + top: 0; + position: absolute; } iframe, textarea {