diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-10-11 10:34:48 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-10-11 10:34:48 +0200 |
| commit | 77286e4296b627bdae3d7433a5a0079f7e06ce38 (patch) | |
| tree | d8116a5e8671404628198ecb5630ea31a0dc1d0e /addons/web_editor/static/src | |
| parent | 637e4c68fc052d93ffec88cb4ab618e32a772fd0 (diff) | |
| parent | c2688e45f318629cc44d445cec65c67e1ccdc3f2 (diff) | |
[MERGE] forward port branch 10.0 up to c2688e45f31
Diffstat (limited to 'addons/web_editor/static/src')
| -rw-r--r-- | addons/web_editor/static/src/js/snippets.options.js | 1 | ||||
| -rw-r--r-- | addons/web_editor/static/src/less/web_editor.ui.less | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/addons/web_editor/static/src/js/snippets.options.js b/addons/web_editor/static/src/js/snippets.options.js index 1444f404ff6..daceee43eaa 100644 --- a/addons/web_editor/static/src/js/snippets.options.js +++ b/addons/web_editor/static/src/js/snippets.options.js @@ -565,6 +565,7 @@ odoo.define('web_editor.snippets.options', function (require) { this.$el.find('.note-color-reset').on('click', function () { self.$target.removeClass(self.classes); + self.$target.trigger('content_changed'); $colors.removeClass("selected"); }); } diff --git a/addons/web_editor/static/src/less/web_editor.ui.less b/addons/web_editor/static/src/less/web_editor.ui.less index db1d6a8b2fe..02094adf754 100644 --- a/addons/web_editor/static/src/less/web_editor.ui.less +++ b/addons/web_editor/static/src/less/web_editor.ui.less @@ -1069,6 +1069,9 @@ body.editor_enable { left: 0; } } + .btn { + -webkit-user-select: initial; + } } #web_editor_inside_iframe { |