summaryrefslogtreecommitdiff
path: root/addons/website/static/src/css
diff options
context:
space:
mode:
authorXavier Morel <xmo@openerp.com>2013-10-14 12:02:22 +0200
committerXavier Morel <xmo@openerp.com>2013-10-14 12:02:22 +0200
commit804f87951802d0d28d548e242f9b6885a7f1cdfa (patch)
tree013768279f04a9df81ea63848cb05bf4775a0ad0 /addons/website/static/src/css
parent000870508fb94e0480b98ce1b300a839f5c9380a (diff)
parent2cdaa44b9e09409838d43901e0bcab394c13c3f3 (diff)
[MERGE] new fields & field conversions in CMS
bzr revid: xmo@openerp.com-20131014100222-v73qz8dbrurc2eoq
Diffstat (limited to 'addons/website/static/src/css')
-rw-r--r--addons/website/static/src/css/editor.css4
-rw-r--r--addons/website/static/src/css/editor.sass4
2 files changed, 8 insertions, 0 deletions
diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index 45960414926..d0b0b34d180 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -155,6 +155,10 @@ table.editorbar-panel td.selected {
margin-bottom: 0.5em;
}
+.cke_widget_wrapper {
+ position: static !important;
+}
+
.cke_widget_drag_handler_container {
display: none !important;
}
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 82497b6f784..51bae3dcf3a 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -138,6 +138,10 @@ table.editorbar-panel
.modal .image-preview
margin-bottom: 0.5em
+// wrapper positioned relatively for drag&drop widget which is disabled below.
+// Breaks completely horribly crazy products listing page, so take it out.
+.cke_widget_wrapper
+ position: static !important
// "remove" drag & drop of CKE widgets
.cke_widget_drag_handler_container
display: none !important