From f1c09c77697ee497a39f3191160f76bb8b15ece8 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Tue, 29 Sep 2020 08:54:32 +0000
Subject: [PATCH] [FIX] web_editor: restore background and foreground color
 previews again

This was fixed in 13.0 and forward-ported twice in 14.0 with [1] and [2]
But the combination of the two commit were messed up.

[1]: https://github.com/odoo/odoo/commit/225ec35e50b5d71fa795f64cb9a9a6c2ceda7631
[2]: https://github.com/odoo/odoo/commit/19be84634d394f47ceb882c5ddd24585f31b50ae

closes odoo/odoo#58788

X-original-commit: 202c192cad16d2353603e3875ea9ee490eafb5bb
Related: odoo/enterprise#13672
Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
---
 addons/web_editor/static/src/scss/wysiwyg.scss       |  4 +---
 .../web_editor/static/src/scss/wysiwyg_snippets.scss | 12 ++----------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/addons/web_editor/static/src/scss/wysiwyg.scss b/addons/web_editor/static/src/scss/wysiwyg.scss
index 335bce16d8b..332e725ae60 100644
--- a/addons/web_editor/static/src/scss/wysiwyg.scss
+++ b/addons/web_editor/static/src/scss/wysiwyg.scss
@@ -78,7 +78,6 @@ $o-we-zindex: $o-we-overlay-zindex + 1 !default;
         background: $o-we-sidebar-content-field-clickable-bg;
         color: inherit;
         font-size: $o-we-font-size !important;
-        border-bottom-color: transparent; // See caret design below
 
         &.active,
         &:focus, &:active, &:focus:active {
@@ -92,8 +91,7 @@ $o-we-zindex: $o-we-overlay-zindex + 1 !default;
         > .caret {
             display: block;
             @include o-position-absolute(auto, 0, 0, 0);
-            border-bottom: 3px solid transparent;
-            border-bottom-color: inherit;
+            border-bottom: 2px solid transparent;
         }
     }
     .btn-group.show {
diff --git a/addons/web_editor/static/src/scss/wysiwyg_snippets.scss b/addons/web_editor/static/src/scss/wysiwyg_snippets.scss
index f432de9c9f6..2d5c5b8385b 100644
--- a/addons/web_editor/static/src/scss/wysiwyg_snippets.scss
+++ b/addons/web_editor/static/src/scss/wysiwyg_snippets.scss
@@ -96,16 +96,8 @@ body.editor_enable.editor_has_snippets {
             .note-back-color-preview {
                 margin-left: $-text-tools-gap;
             }
-            .btn {
-
-                > .caret {
-                    display: block;
-                    @include o-position-absolute(auto, 0, 0, 0);
-                    border-bottom: 2px solid transparent;
-                }
-                &::after {
-                    display: none;
-                }
+            .btn::after {
+                display: none;
             }
         }
         &.note-style {