From d9b9c4e8e11bb356f97b7917d48bed3eaf988af2 Mon Sep 17 00:00:00 2001 From: qsm-odoo Date: Wed, 1 Aug 2018 11:00:44 +0200 Subject: [FIX] *: BS4, restore some popover design Completes commit https://github.com/odoo/odoo/commit/2d5595fcbad73ed0ce03f048fdd870d9659bcd5e --- addons/web_editor/static/src/js/editor/rte.summernote.js | 8 ++++---- addons/web_editor/static/src/scss/web_editor.ui.scss | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'addons/web_editor/static/src') diff --git a/addons/web_editor/static/src/js/editor/rte.summernote.js b/addons/web_editor/static/src/js/editor/rte.summernote.js index b641839286c..6d464c475b7 100644 --- a/addons/web_editor/static/src/js/editor/rte.summernote.js +++ b/addons/web_editor/static/src/js/editor/rte.summernote.js @@ -143,7 +143,7 @@ renderer.tplPopovers = function (lang, options) { // show dialog box and delete var $imageprop = $('
'); - $imageprop.appendTo($imagePopover.find('.popover-content')); + $imageprop.appendTo($imagePopover.find('.popover-body')); $(tplIconButton('fa fa-file-image-o', { title: _t('Edit'), event: 'showImageDialog' @@ -158,17 +158,17 @@ renderer.tplPopovers = function (lang, options) { event: 'cropImage', })).insertAfter($imagePopover.find('[data-event="imageShape"][data-value="img-thumbnail"]')); - $imagePopover.find('.popover-content').append($airPopover.find(".note-history").clone()); + $imagePopover.find('.popover-body').append($airPopover.find(".note-history").clone()); $imagePopover.find('[data-event="showImageDialog"]').before($airPopover.find('[data-event="showLinkDialog"]').clone()); var $alt = $('
'); - $alt.appendTo($imagePopover.find('.popover-content')); + $alt.appendTo($imagePopover.find('.popover-body')); $alt.append(''); //////////////// link popover - $linkPopover.find('.popover-content').append($airPopover.find(".note-history").clone()); + $linkPopover.find('.popover-body').append($airPopover.find(".note-history").clone()); $linkPopover.find('button[data-event="showLinkDialog"] i').attr("class", "fa fa-link"); $linkPopover.find('button[data-event="unlink"]').before($airPopover.find('button[data-event="showImageDialog"]').clone()); diff --git a/addons/web_editor/static/src/scss/web_editor.ui.scss b/addons/web_editor/static/src/scss/web_editor.ui.scss index eee93913dc2..dcc8235dea8 100644 --- a/addons/web_editor/static/src/scss/web_editor.ui.scss +++ b/addons/web_editor/static/src/scss/web_editor.ui.scss @@ -696,7 +696,7 @@ html[lang] > body.editor_enable [data-oe-translation-state] { text-align: center; box-shadow: none; - .popover-content { + .popover-body { height: $o-navbar-height; white-space: nowrap; font-family: $o-we-font-family; -- cgit v1.2.3