summaryrefslogtreecommitdiff
path: root/addons/website/static/src/css
diff options
context:
space:
mode:
authorChristophe Matthieu <chm@openerp.com>2013-09-27 17:26:25 +0200
committerChristophe Matthieu <chm@openerp.com>2013-09-27 17:26:25 +0200
commit8d3db3a13f8c03348c92f5f2e166668450aa3996 (patch)
tree60ad372c7cbe461dc7eb6fd47cefb292cdf9e1ac /addons/website/static/src/css
parenta5ac76bc2b265081e6dc83c235615e2cce796225 (diff)
[IMP] website_sale: responsible design (css height)
bzr revid: chm@openerp.com-20130927152625-mrr0r2514qfwyisp
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.sass3
-rw-r--r--addons/website/static/src/css/website.css6
-rw-r--r--addons/website/static/src/css/website.sass6
4 files changed, 12 insertions, 7 deletions
diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index 5a739cecb25..a808b9bab35 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -260,10 +260,6 @@ table.editorbar-panel td.selected {
}
/* ---- SNIPPETS DROP ZONES ---- */
-.col-md-12 {
- float: left;
-}
-
.oe_drop_zone.oe_insert {
display: block;
height: 48px;
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index bf8e7c1686c..406b8feeb78 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -225,9 +225,6 @@ table.editorbar-panel
/* ---- SNIPPETS DROP ZONES ---- */
-
-.col-md-12
- float: left
.oe_drop_zone.oe_insert
display: block
height: 48px
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index b1c41225370..f037f87b34f 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -216,6 +216,12 @@ footer {
padding-bottom: 12px;
}
+/* ----- BOOTSTRAP FIX ----- */
+.col-md-12 {
+ float: left;
+ width: 100%;
+}
+
/* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */
.oe_structure.oe_empty:empty, [data-oe-type=html]:empty, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child {
background-image: url("/website/static/src/img/drag_here.png");
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index d80d766bfbd..ac85bf67ed3 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -143,6 +143,12 @@ footer
padding-top: 24px
padding-bottom: 12px
+/* ----- BOOTSTRAP FIX ----- */
+
+.col-md-12
+ float: left
+ width: 100%
+
/* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */
.oe_structure.oe_empty:empty, [data-oe-type=html]:empty, .oe_structure.oe_empty > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child