[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>
This commit is contained in:
qsm-odoo
2020-09-29 11:14:37 +00:00
parent 81ca8647aa
commit f1c09c7769
2 changed files with 3 additions and 13 deletions
@@ -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 {
@@ -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 {