From c8af3e1fa89353fa16c19d24b541d2e431b771f1 Mon Sep 17 00:00:00 2001 From: Anton Date: Wed, 7 Sep 2022 11:24:54 +0200 Subject: [PATCH] Update tinymce image toolbar plugin [SCI-7152] --- app/assets/stylesheets/tiny_mce.scss | 48 +++++++++++-------- app/javascript/packs/tiny_mce.js | 7 +-- .../packs/tinymce/image_toolbar/plugin.js | 47 ++++++++++++++++++ 3 files changed, 78 insertions(+), 24 deletions(-) create mode 100644 app/javascript/packs/tinymce/image_toolbar/plugin.js diff --git a/app/assets/stylesheets/tiny_mce.scss b/app/assets/stylesheets/tiny_mce.scss index 44a4c40de..2b4127e51 100644 --- a/app/assets/stylesheets/tiny_mce.scss +++ b/app/assets/stylesheets/tiny_mce.scss @@ -1,4 +1,4 @@ -// scss-lint:disable ImportantRule +// scss-lint:disable ImportantRule SelectorDepth @import "constants"; @font-face { @@ -156,25 +156,6 @@ &::after { display: none; } - - .mce-container-body.mce-abs-layout { - background: $brand-primary; - position: relative; - top: -10px; - - .mce-container, - .mce-widget { - background: transparent !important; - } - - .mce-btn:hover { - border-color: transparent; - } - - .mce-ico { - color: $color-white; - } - } } .mce-window { @@ -202,4 +183,29 @@ display: flex !important; } -// scss-lint:enable ImportantRule + + +.tox .tox-pop { + margin-top: -12px; + + &::after, + &::before { + display: none !important; + } + + .tox-pop__dialog { + border: 0; + border-radius: 0 0 3px 3px; + box-shadow: none; + } + + .tox-toolbar { + background: $brand-primary !important; + top: -10px; + + .tox-icon svg { + fill: $color-white; + } + } +} +// scss-lint:enable ImportantRule SelectorDepth diff --git a/app/javascript/packs/tiny_mce.js b/app/javascript/packs/tiny_mce.js index 53aca9cd5..7b375a319 100644 --- a/app/javascript/packs/tiny_mce.js +++ b/app/javascript/packs/tiny_mce.js @@ -22,6 +22,7 @@ import 'tinymce/plugins/nonbreaking'; import 'tinymce/plugins/save'; import 'tinymce/plugins/directionality'; import './tinymce/marvinjs/plugin'; +import './tinymce/image_toolbar/plugin'; window.TinyMCE = (function() { 'use strict'; @@ -87,13 +88,13 @@ window.TinyMCE = (function() { } function initImageToolBar(editor) { - var editorIframe = $('#' + editor.id).prev().find('.mce-edit-area iframe'); + var editorIframe = $('#' + editor.id).next().find('.tox-edit-area iframe'); var primaryColor = '#104da9'; editorIframe.contents().find('head').append(`