diff options
| author | qsm-odoo <qsm@odoo.com> | 2018-08-01 11:00:44 +0200 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2018-08-02 09:55:20 +0200 |
| commit | d9b9c4e8e11bb356f97b7917d48bed3eaf988af2 (patch) | |
| tree | c56bfd3a08cc01fc38b288409fb27f28e23c146d /addons | |
| parent | c120eb3a29ec4da1be65b21b49576090cff6b771 (diff) | |
[FIX] *: BS4, restore some popover design
Completes commit https://github.com/odoo/odoo/commit/2d5595fcbad73ed0ce03f048fdd870d9659bcd5e
Diffstat (limited to 'addons')
7 files changed, 46 insertions, 46 deletions
diff --git a/addons/web_editor/static/lib/summernote/src/css/summernote.css b/addons/web_editor/static/lib/summernote/src/css/summernote.css index 807919c0dc9..7604c9272de 100644 --- a/addons/web_editor/static/lib/summernote/src/css/summernote.css +++ b/addons/web_editor/static/lib/summernote/src/css/summernote.css @@ -112,7 +112,7 @@ .note-popover .popover { max-width: none; } -.note-popover .popover .popover-content a { +.note-popover .popover .popover-body a { display: inline-block; max-width: 200px; overflow: hidden; @@ -127,29 +127,29 @@ } /* Popover and Toolbar (Button container) ------------------------------------------*/ -.note-popover .popover .popover-content, +.note-popover .popover .popover-body, .panel-heading.note-toolbar { margin: 0; padding: 0 0 5px 5px; /* dropdown-menu for toolbar and popover */ /* color palette for toolbar and popover */ } -.note-popover .popover .popover-content > .btn-group, +.note-popover .popover .popover-body > .btn-group, .panel-heading.note-toolbar > .btn-group { margin-top: 5px; margin-left: 0; margin-right: 5px; } -.note-popover .popover .popover-content .btn-group .note-table, +.note-popover .popover .popover-body .btn-group .note-table, .panel-heading.note-toolbar .btn-group .note-table { min-width: 0; padding: 5px; } -.note-popover .popover .popover-content .btn-group .note-table .note-dimension-picker, +.note-popover .popover .popover-body .btn-group .note-table .note-dimension-picker, .panel-heading.note-toolbar .btn-group .note-table .note-dimension-picker { font-size: 18px; } -.note-popover .popover .popover-content .btn-group .note-table .note-dimension-picker .note-dimension-picker-mousecatcher, +.note-popover .popover .popover-body .btn-group .note-table .note-dimension-picker .note-dimension-picker-mousecatcher, .panel-heading.note-toolbar .btn-group .note-table .note-dimension-picker .note-dimension-picker-mousecatcher { position: absolute !important; z-index: 3; @@ -157,7 +157,7 @@ height: 10em; cursor: pointer; } -.note-popover .popover .popover-content .btn-group .note-table .note-dimension-picker .note-dimension-picker-unhighlighted, +.note-popover .popover .popover-body .btn-group .note-table .note-dimension-picker .note-dimension-picker-unhighlighted, .panel-heading.note-toolbar .btn-group .note-table .note-dimension-picker .note-dimension-picker-unhighlighted { position: relative !important; z-index: 1; @@ -165,7 +165,7 @@ height: 5em; background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASAgMAAAAroGbEAAAACVBMVEUAAIj4+Pjp6ekKlAqjAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsTAQCanBgAAAAHdElNRQfYAR0BKhmnaJzPAAAAG0lEQVQI12NgAAOtVatWMTCohoaGUY+EmIkEAEruEzK2J7tvAAAAAElFTkSuQmCC') repeat; } -.note-popover .popover .popover-content .btn-group .note-table .note-dimension-picker .note-dimension-picker-highlighted, +.note-popover .popover .popover-body .btn-group .note-table .note-dimension-picker .note-dimension-picker-highlighted, .panel-heading.note-toolbar .btn-group .note-table .note-dimension-picker .note-dimension-picker-highlighted { position: absolute !important; z-index: 2; @@ -173,47 +173,47 @@ height: 1em; background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASAgMAAAAroGbEAAAACVBMVEUAAIjd6vvD2f9LKLW+AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxMAAAsTAQCanBgAAAAHdElNRQfYAR0BKwNDEVT0AAAAG0lEQVQI12NgAAOtVatWMTCohoaGUY+EmIkEAEruEzK2J7tvAAAAAElFTkSuQmCC') repeat; } -.note-popover .popover .popover-content .note-style h1, +.note-popover .popover .popover-body .note-style h1, .panel-heading.note-toolbar .note-style h1, -.note-popover .popover .popover-content .note-style h2, +.note-popover .popover .popover-body .note-style h2, .panel-heading.note-toolbar .note-style h2, -.note-popover .popover .popover-content .note-style h3, +.note-popover .popover .popover-body .note-style h3, .panel-heading.note-toolbar .note-style h3, -.note-popover .popover .popover-content .note-style h4, +.note-popover .popover .popover-body .note-style h4, .panel-heading.note-toolbar .note-style h4, -.note-popover .popover .popover-content .note-style h5, +.note-popover .popover .popover-body .note-style h5, .panel-heading.note-toolbar .note-style h5, -.note-popover .popover .popover-content .note-style h6, +.note-popover .popover .popover-body .note-style h6, .panel-heading.note-toolbar .note-style h6, -.note-popover .popover .popover-content .note-style blockquote, +.note-popover .popover .popover-body .note-style blockquote, .panel-heading.note-toolbar .note-style blockquote { margin: 0; } -.note-popover .popover .popover-content .note-color .dropdown-toggle, +.note-popover .popover .popover-body .note-color .dropdown-toggle, .panel-heading.note-toolbar .note-color .dropdown-toggle { width: 20px; padding-left: 5px; } -.note-popover .popover .popover-content .note-color .dropdown-menu, +.note-popover .popover .popover-body .note-color .dropdown-menu, .panel-heading.note-toolbar .note-color .dropdown-menu { min-width: 340px; } -.note-popover .popover .popover-content .note-color .dropdown-menu .btn-group, +.note-popover .popover .popover-body .note-color .dropdown-menu .btn-group, .panel-heading.note-toolbar .note-color .dropdown-menu .btn-group { margin: 0; } -.note-popover .popover .popover-content .note-color .dropdown-menu .btn-group:first-child, +.note-popover .popover .popover-body .note-color .dropdown-menu .btn-group:first-child, .panel-heading.note-toolbar .note-color .dropdown-menu .btn-group:first-child { margin: 0 5px; } -.note-popover .popover .popover-content .note-color .dropdown-menu .btn-group .note-palette-title, +.note-popover .popover .popover-body .note-color .dropdown-menu .btn-group .note-palette-title, .panel-heading.note-toolbar .note-color .dropdown-menu .btn-group .note-palette-title { font-size: 12px; margin: 2px 7px; text-align: center; border-bottom: 1px solid #eee; } -.note-popover .popover .popover-content .note-color .dropdown-menu .btn-group .note-color-reset, +.note-popover .popover .popover-body .note-color .dropdown-menu .btn-group .note-color-reset, .panel-heading.note-toolbar .note-color .dropdown-menu .btn-group .note-color-reset { font-size: 11px; margin: 3px; @@ -221,63 +221,63 @@ cursor: pointer; border-radius: 5px; } -.note-popover .popover .popover-content .note-color .dropdown-menu .btn-group .note-color-row, +.note-popover .popover .popover-body .note-color .dropdown-menu .btn-group .note-color-row, .panel-heading.note-toolbar .note-color .dropdown-menu .btn-group .note-color-row { height: 20px; } -.note-popover .popover .popover-content .note-color .dropdown-menu .btn-group .note-color-reset:hover, +.note-popover .popover .popover-body .note-color .dropdown-menu .btn-group .note-color-reset:hover, .panel-heading.note-toolbar .note-color .dropdown-menu .btn-group .note-color-reset:hover { background: #eee; } -.note-popover .popover .popover-content .note-para .dropdown-menu, +.note-popover .popover .popover-body .note-para .dropdown-menu, .panel-heading.note-toolbar .note-para .dropdown-menu { min-width: 216px; padding: 5px; } -.note-popover .popover .popover-content .note-para .dropdown-menu > div:first-child, +.note-popover .popover .popover-body .note-para .dropdown-menu > div:first-child, .panel-heading.note-toolbar .note-para .dropdown-menu > div:first-child { margin-right: 5px; } -.note-popover .popover .popover-content .dropdown-menu, +.note-popover .popover .popover-body .dropdown-menu, .panel-heading.note-toolbar .dropdown-menu { min-width: 90px; /* dropdown-menu right position */ /* http://forrst.com/posts/Bootstrap_right_positioned_dropdown-2KB */ /* dropdown-menu for selectbox */ } -.note-popover .popover .popover-content .dropdown-menu.right, +.note-popover .popover .popover-body .dropdown-menu.right, .panel-heading.note-toolbar .dropdown-menu.right { right: 0; left: auto; } -.note-popover .popover .popover-content .dropdown-menu.right::before, +.note-popover .popover .popover-body .dropdown-menu.right::before, .panel-heading.note-toolbar .dropdown-menu.right::before { right: 9px; left: auto !important; } -.note-popover .popover .popover-content .dropdown-menu.right::after, +.note-popover .popover .popover-body .dropdown-menu.right::after, .panel-heading.note-toolbar .dropdown-menu.right::after { right: 10px; left: auto !important; } -.note-popover .popover .popover-content .dropdown-menu.note-check li a i, +.note-popover .popover .popover-body .dropdown-menu.note-check li a i, .panel-heading.note-toolbar .dropdown-menu.note-check li a i { color: deepskyblue; visibility: hidden; } -.note-popover .popover .popover-content .dropdown-menu.note-check li a.checked i, +.note-popover .popover .popover-body .dropdown-menu.note-check li a.checked i, .panel-heading.note-toolbar .dropdown-menu.note-check li a.checked i { visibility: visible; } -.note-popover .popover .popover-content .note-fontsize-10, +.note-popover .popover .popover-body .note-fontsize-10, .panel-heading.note-toolbar .note-fontsize-10 { font-size: 10px; } -.note-popover .popover .popover-content .note-color-palette, +.note-popover .popover .popover-body .note-color-palette, .panel-heading.note-toolbar .note-color-palette { line-height: 1; } -.note-popover .popover .popover-content .note-color-palette div .note-color-btn, +.note-popover .popover .popover-body .note-color-palette div .note-color-btn, .panel-heading.note-toolbar .note-color-palette div .note-color-btn { width: 20px; height: 20px; @@ -285,7 +285,7 @@ margin: 0; border: 1px solid #fff; } -.note-popover .popover .popover-content .note-color-palette div .note-color-btn:hover, +.note-popover .popover .popover-body .note-color-palette div .note-color-btn:hover, .panel-heading.note-toolbar .note-color-palette div .note-color-btn:hover { border: 1px solid #000; } diff --git a/addons/web_editor/static/lib/summernote/src/js/Renderer.js b/addons/web_editor/static/lib/summernote/src/js/Renderer.js index bf72f9f945f..a57dab67573 100644 --- a/addons/web_editor/static/lib/summernote/src/js/Renderer.js +++ b/addons/web_editor/static/lib/summernote/src/js/Renderer.js @@ -77,11 +77,11 @@ define([ var tplPopover = function (className, content) { var $popover = $('<div class="' + className + ' popover bottom in" style="display: none;">' + '<div class="arrow"></div>' + - '<div class="popover-content">' + + '<div class="popover-body">' + '</div>' + '</div>'); - $popover.find('.popover-content').append(content); + $popover.find('.popover-body').append(content); return $popover; }; diff --git a/addons/web_editor/static/lib/summernote/src/less/summernote.less b/addons/web_editor/static/lib/summernote/src/less/summernote.less index 512216845b2..dc8da25122d 100644 --- a/addons/web_editor/static/lib/summernote/src/less/summernote.less +++ b/addons/web_editor/static/lib/summernote/src/less/summernote.less @@ -133,7 +133,7 @@ ------------------------------------------*/ .note-popover .popover { max-width: none; - .popover-content { + .popover-body { a { display: inline-block; max-width: 200px; @@ -150,7 +150,7 @@ /* Popover and Toolbar (Button container) ------------------------------------------*/ -.note-popover .popover .popover-content, .panel-heading.note-toolbar { +.note-popover .popover .popover-body, .panel-heading.note-toolbar { margin: 0; padding: 0 0 5px 5px; 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 = $('<div class="btn-group"/>'); - $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 = $('<div class="btn-group"/>'); - $alt.appendTo($imagePopover.find('.popover-content')); + $alt.appendTo($imagePopover.find('.popover-body')); $alt.append('<button class="btn btn-secondary" data-event="alt"><strong>' + _t('Description') + ': </strong><span class="o_image_alt"/></button>'); //////////////// 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; diff --git a/addons/website_sale/static/src/js/website_sale.js b/addons/website_sale/static/src/js/website_sale.js index 4210c75a1e8..565e2c8032f 100644 --- a/addons/website_sale/static/src/js/website_sale.js +++ b/addons/website_sale/static/src/js/website_sale.js @@ -16,7 +16,7 @@ odoo.define('website_sale.cart', function (require) { }, container: 'body', placement: 'auto', - template: '<div class="popover mycart-popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>' + template: '<div class="popover mycart-popover" role="tooltip"><div class="arrow"></div><h3 class="popover-header"></h3><div class="popover-body"></div></div>' }).on("mouseenter",function () { var self = this; clearTimeout(shopping_cart_link_counter); diff --git a/addons/website_sale_comparison/static/src/js/website_sale_comparison.js b/addons/website_sale_comparison/static/src/js/website_sale_comparison.js index 9d27a98d558..3125e223239 100644 --- a/addons/website_sale_comparison/static/src/js/website_sale_comparison.js +++ b/addons/website_sale_comparison/static/src/js/website_sale_comparison.js @@ -46,7 +46,7 @@ var ProductComparison = Widget.extend({ }, container: '.o_product_feature_panel', placement: 'top', - template: '<div style="width:600px;" class="popover comparator-popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>', + template: '<div style="width:600px;" class="popover comparator-popover" role="tooltip"><div class="arrow"></div><h3 class="popover-header"></h3><div class="popover-body"></div></div>', content: function() { return $('#comparelist .o_product_panel_content').html(); } |
