summaryrefslogtreecommitdiff
path: root/addons/web/static/src/css
diff options
context:
space:
mode:
authorniv-openerp <nicolas.vanhoren@openerp.com>2013-10-18 15:41:49 +0200
committerniv-openerp <nicolas.vanhoren@openerp.com>2013-10-18 15:41:49 +0200
commitebeeae0ed4c57e36db143c11de11174ca1330892 (patch)
treea69943dd477755374a31939360c9042b240ab6d4 /addons/web/static/src/css
parentf2e561afecc8a4845b12578c259a1428d0fc5be4 (diff)
parent7636d71dfcff09648d080ea4513871a0e27b08ad (diff)
[MERGE] saas2
bzr revid: nicolas.vanhoren@openerp.com-20131018134149-yveqfs6tqwnjo6xt
Diffstat (limited to 'addons/web/static/src/css')
-rw-r--r--addons/web/static/src/css/base.css2
-rw-r--r--addons/web/static/src/css/base.sass2
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 5420462cbf1..87e129bb211 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1453,7 +1453,7 @@
display: table-row;
height: inherit;
}
-.openerp .oe_view_manager .oe_view_manager_view_kanban {
+.openerp .oe_view_manager .oe_view_manager_view_kanban:not(:empty) {
height: inherit;
}
.openerp .oe_view_manager table.oe_view_manager_header {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 5900eb9d268..e8eab4544a6 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1169,7 +1169,7 @@ $sheet-padding: 16px
.oe_view_manager_body
display: table-row
height: inherit
- .oe_view_manager_view_kanban
+ .oe_view_manager_view_kanban:not(:empty)
height: inherit
table.oe_view_manager_header