From 9c6389b782b7eb845ef24e5b89d09dce7e7bb35c Mon Sep 17 00:00:00 2001 From: "Emilien Durieu (edu)" Date: Fri, 13 Nov 2020 13:51:55 +0000 Subject: [PATCH] [FIX] web_editor: table picker not fully displayed The table picker was hard to use because its container scrolls instead of letting it overflow. closes odoo/odoo#61783 Signed-off-by: David Monjoie (dmo) --- .../static/src/js/editor/snippets.editor.js | 7 -- .../static/src/scss/wysiwyg_snippets.scss | 109 +----------------- 2 files changed, 1 insertion(+), 115 deletions(-) diff --git a/addons/web_editor/static/src/js/editor/snippets.editor.js b/addons/web_editor/static/src/js/editor/snippets.editor.js index 4795ce409a7..6778da60d29 100644 --- a/addons/web_editor/static/src/js/editor/snippets.editor.js +++ b/addons/web_editor/static/src/js/editor/snippets.editor.js @@ -1086,8 +1086,6 @@ var SnippetsMenu = Widget.extend({ this.customizePanel = document.createElement('div'); this.customizePanel.classList.add('o_we_customize_panel', 'd-none'); - this.textEditorPanelEl = document.createElement('div'); - this.textEditorPanelEl.classList.add('o_we_snippet_text_tools', 'd-none'); if (this.options.onlyStyleTab) { await this._loadSnippetsTemplates(); @@ -1850,7 +1848,6 @@ var SnippetsMenu = Widget.extend({ // Add the computed template and make elements draggable this.$el.html($html); this.$el.append(this.customizePanel); - this.$el.append(this.textEditorPanelEl); this.$el.append(this.invisibleDOMPanelEl); this._makeSnippetDraggable(this.$snippets); await this._disableUndroppableSnippets(); @@ -2244,7 +2241,6 @@ var SnippetsMenu = Widget.extend({ this.$('.o_snippet_search_filter').toggleClass('d-none', tab !== this.tabs.BLOCKS); this.$('#o_scroll').toggleClass('d-none', tab !== this.tabs.BLOCKS); this.customizePanel.classList.toggle('d-none', tab === this.tabs.BLOCKS); - this.textEditorPanelEl.classList.toggle('d-none', tab !== this.tabs.OPTIONS); this.$('.o_we_add_snippet_btn').toggleClass('active', tab === this.tabs.BLOCKS); this.$('.o_we_customize_snippet_btn').toggleClass('active', tab === this.tabs.OPTIONS) @@ -2808,9 +2804,6 @@ var SnippetsMenu = Widget.extend({ // Sometimes not enough... return; } - this.textEditorPanelEl.classList.add('d-block'); - const hasVisibleButtons = !!$(this.textEditorPanelEl).find('.btn:visible').length; - this.textEditorPanelEl.classList.remove('d-block'); if (!hasVisibleButtons) { // Ugly way to detect that summernote was updated but there is no // visible text tools. diff --git a/addons/web_editor/static/src/scss/wysiwyg_snippets.scss b/addons/web_editor/static/src/scss/wysiwyg_snippets.scss index a3cbce01548..5b5f7490bfc 100644 --- a/addons/web_editor/static/src/scss/wysiwyg_snippets.scss +++ b/addons/web_editor/static/src/scss/wysiwyg_snippets.scss @@ -38,112 +38,6 @@ body.editor_enable.editor_has_snippets { } } -// Ugly hack to force ugly rules... while waiting for new editor -#oe_snippets#oe_snippets .o_we_snippet_text_tools { - $-text-tools-gap: 3px; - $-text-tools-header-height: 35px; - - padding: $-text-tools-header-height $o-we-sidebar-content-padding-base 0 $o-we-sidebar-content-indent; - box-shadow: $o-we-item-standup-top rgba($o-we-item-standup-color-light, .2); - z-index: $o-we-zindex; - - .popover { - position: static !important; - top: 0 !important; - left: 0 !important; - transform: none !important; - border: none !important; - } - .popover-body { - padding: 0 !important; - border: none !important; - display: flex; - flex-wrap: wrap; - justify-content: space-between; - gap: $-text-tools-gap; - - > * { - margin: 0 0 $o-we-sidebar-content-field-spacing*.5 0; - } - } - .btn { - @extend %we-generic-button; - border-radius: 0; - padding: 0 $o-we-sidebar-content-field-button-group-button-spacing!important; - line-height: $o-we-sidebar-content-field-height + ($o-we-sidebar-content-field-border-width*2)!important; - } - // Achieve a "button-group effect" for siblings buttons. - .popover-body > .btn-group { - > .btn { - border-radius: 0; - } - > .btn:first-of-type, > div:first-of-type .btn { - @include border-left-radius($o-we-sidebar-content-field-border-radius); - } - > .btn:last-of-type, > div:last-of-type .btn { - @include border-right-radius($o-we-sidebar-content-field-border-radius); - } - } - .btn-group { - - &.note-color { - order: -3; - - .note-back-color-preview { - margin-left: $-text-tools-gap; - } - .btn::after { - display: none; - } - } - &.note-style { - order: -2; - - &, > div { - flex-grow: 1; - } - } - &.note-fontsize { - order: -1; - } - &.note-font [data-name="clear"] { - @include o-position-absolute(($-text-tools-header-height*-1) + 5px, 0); - background: 0; - border: 0; - @extend %we-generic-link; - } - &.note-para { - flex-grow: 1; - gap: $-text-tools-gap; - justify-content: space-between; - - > * { - flex: 1 1 33%; - } - } - > .d-none + * { - margin-left: 0 !important; - } - } - .note-color { - .btn-group { - position: static; - } - .dropdown-menu { // Drop up - top: auto; - bottom: 100%; - margin-top: 0; - margin-bottom: $dropdown-spacer; - } - } - .note-popover ~ .note-popover, - .note-handle ~ .note-handle, - .note-dialog ~ .note-dialog { - // Prevent flickering of summernote when switching text tools... - display: none; - } -} - .oe_snippet { // No root because can be drag and drop (and the helper is in the body) position: relative; @@ -292,7 +186,7 @@ body.editor_enable.editor_has_snippets { // SNIPPET PANEL #oe_snippets { @include o-w-preserve-btn; - + overflow: auto; display: flex; flex-flow: column nowrap; width: $o-we-sidebar-width; @@ -369,7 +263,6 @@ body.editor_enable.editor_has_snippets { > #o_scroll, > .o_we_customize_panel { min-height: 0; - overflow: auto; } > #o_scroll {