summaryrefslogtreecommitdiff
path: root/addons/website/static/src
diff options
context:
space:
mode:
authorqsm-odoo <qsm@odoo.com>2020-05-28 10:04:43 +0000
committerqsm-odoo <qsm@odoo.com>2020-06-02 09:42:19 +0000
commitd9c4d928f7c7e148d024cb56f53e6bfb98389f6d (patch)
tree7f3a5a4a98065447a82f38cdfa52b1b87a47c5d5 /addons/website/static/src
parent69190959ce8e08481be7ebdfefd314edf0c5dce1 (diff)
[IMP] web_editor, *: integrate new o_cc${xxx} classes in the colorpicker
*: website Part of https://github.com/odoo/odoo/pull/45856 task-2197038
Diffstat (limited to 'addons/website/static/src')
-rw-r--r--addons/website/static/src/js/editor/snippets.options.js3
-rw-r--r--addons/website/static/src/scss/website.wysiwyg.scss9
2 files changed, 8 insertions, 4 deletions
diff --git a/addons/website/static/src/js/editor/snippets.options.js b/addons/website/static/src/js/editor/snippets.options.js
index 89310998fde..5bde2b6d1c8 100644
--- a/addons/website/static/src/js/editor/snippets.options.js
+++ b/addons/website/static/src/js/editor/snippets.options.js
@@ -5,8 +5,9 @@ const {ColorpickerWidget} = require('web.Colorpicker');
const config = require('web.config');
var core = require('web.core');
var Dialog = require('web.Dialog');
-const wUtils = require('website.utils');
+const weUtils = require('web_editor.utils');
var options = require('web_editor.snippets.options');
+const wUtils = require('website.utils');
require('website.s_popup_options');
var _t = core._t;
diff --git a/addons/website/static/src/scss/website.wysiwyg.scss b/addons/website/static/src/scss/website.wysiwyg.scss
index 1eaaa7d97b8..a2f210f70da 100644
--- a/addons/website/static/src/scss/website.wysiwyg.scss
+++ b/addons/website/static/src/scss/website.wysiwyg.scss
@@ -135,7 +135,7 @@ $i: 1;
clear: both;
}
- > button {
+ > .o_we_color_btn {
&:hover,
&.selected {
@@ -152,8 +152,11 @@ $i: 1;
}
}
- .note-palette-title {
- color: $o-we-color-text-light;
+ .note-palette-title, a, button:not(.o_we_color_combination_btn) {
+
+ &, &:hover {
+ color: $o-we-color-text-light;
+ }
}
.palette-reset {