diff options
| author | Christophe Matthieu <chm@odoo.com> | 2016-09-20 17:21:44 +0200 |
|---|---|---|
| committer | Christophe Matthieu <chm@odoo.com> | 2016-09-21 16:14:49 +0200 |
| commit | ab06013e30d2a8ca561874c6141b2a52dc1843b1 (patch) | |
| tree | 8e85c2f130a5c8afeb9c1f49794992fd90d4eb8f /addons/web_editor/static/src | |
| parent | 5b4c1d405d4f2118c088eed39b5c6ffa600361c2 (diff) | |
[FIX] mass_mailing: can't change color button snippet when edit mass mailing
Diffstat (limited to 'addons/web_editor/static/src')
| -rw-r--r-- | addons/web_editor/static/src/js/widgets.js | 4 | ||||
| -rw-r--r-- | addons/web_editor/static/src/less/web_editor.ui.less | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/addons/web_editor/static/src/js/widgets.js b/addons/web_editor/static/src/js/widgets.js index dcb5f58f5b8..792a9b51b95 100644 --- a/addons/web_editor/static/src/js/widgets.js +++ b/addons/web_editor/static/src/js/widgets.js @@ -1087,7 +1087,9 @@ var LinkDialog = Dialog.extend({ self.data.isNewWindow = new_window; self.data.text = label; self.data.className = classes.replace(/\s+/gi, ' ').replace(/^\s+|\s+$/gi, ''); - + if (classes.replace(/(^|[ ])(btn-default|btn-success|btn-primary|btn-info|btn-warning|btn-danger)([ ]|$)/gi, ' ')) { + self.data.style = {'background-color': '', 'color': ''}; + } self.trigger("save", self.data); }).then(_super); }, 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 38bd5b7cd87..b464da9f70f 100644 --- a/addons/web_editor/static/src/less/web_editor.ui.less +++ b/addons/web_editor/static/src/less/web_editor.ui.less @@ -949,7 +949,7 @@ body.editor_enable { p { margin: initial; } - a, a:hover { + a:not(.btn), a:not(.btn):hover { color: inherit; } } |