summaryrefslogtreecommitdiff
path: root/addons/web_editor
diff options
context:
space:
mode:
authorRobot Odoo <xmo+roboto@odoo.com>2018-10-19 15:36:30 +0200
committerGitHub <noreply@github.com>2018-10-19 15:36:30 +0200
commit489408bf263b7ef1bf39ef8d5417bd21e41c2f4f (patch)
treebc2764b3cad5cc96c09d77db2a09c56efa31abf2 /addons/web_editor
parent4e72669cc8be00f29dc54740e6d791bc3623e85b (diff)
parent932fdb4e24e4f187adbe37ba6babe8159fbca39a (diff)
[MERGE] website, *: fix some snippet options
* web_editor See sub-commits for details. closes odoo/odoo#27969
Diffstat (limited to 'addons/web_editor')
-rw-r--r--addons/web_editor/static/src/js/widgets/widgets.js2
-rw-r--r--addons/web_editor/static/src/scss/web_editor.common.scss2
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/web_editor/static/src/js/widgets/widgets.js b/addons/web_editor/static/src/js/widgets/widgets.js
index 2c06743b361..0edc1adb9b9 100644
--- a/addons/web_editor/static/src/js/widgets/widgets.js
+++ b/addons/web_editor/static/src/js/widgets/widgets.js
@@ -1466,7 +1466,7 @@ var LinkDialog = Dialog.extend({
var $btn = $(btn);
var color = $btn.css('background-color');
if (_.contains(colors, color)) {
- $btn.remove();
+ $btn.hide(); // Not remove to be able to edit buttons with those styles
} else {
colors.push(color);
}
diff --git a/addons/web_editor/static/src/scss/web_editor.common.scss b/addons/web_editor/static/src/scss/web_editor.common.scss
index 11fa94cd010..648d76b2aec 100644
--- a/addons/web_editor/static/src/scss/web_editor.common.scss
+++ b/addons/web_editor/static/src/scss/web_editor.common.scss
@@ -122,7 +122,7 @@ html[data-browser^="msie"] div.media_iframe_video iframe {
}
@include media-breakpoint-down(sm) {
- img:not(.cke_iframe), .media_iframe_video, span.fa, i.fa {
+ img, .media_iframe_video, span.fa, i.fa {
transform: none !important;
}
}