diff options
| author | Randhir Mayatra rma-openerp <rma@tinyerp.com> | 2014-04-11 11:48:43 +0530 |
|---|---|---|
| committer | Randhir Mayatra rma-openerp <rma@tinyerp.com> | 2014-04-11 11:48:43 +0530 |
| commit | a8e2cf30069246e90d0e06fc42fe6b64f2e1cfa2 (patch) | |
| tree | f33bb4203334f53ac0d87a11bf4d61834d5009d1 /addons/web/static/src/css | |
| parent | c037ebb362cf196edabc07a7e40c85a15a51eb27 (diff) | |
| parent | 60f74ff3f4c7bb1e5208b0f4be3ef2577a5645f4 (diff) | |
[MERGE] merge with latest trunk
bzr revid: rma@tinyerp.com-20140411061843-kxugxk0p63ifkjg7
Diffstat (limited to 'addons/web/static/src/css')
| -rw-r--r-- | addons/web/static/src/css/base.css | 4 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 66bfaca7c6e..08ae6df5e0b 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1284,12 +1284,14 @@ width: 100%; } .openerp .oe_view_manager .oe_view_manager_body { - display: table-row; height: inherit; } .openerp .oe_view_manager .oe_view_manager_view_kanban:not(:empty) { height: inherit; } +.openerp .oe_view_manager[data-view-type=kanban] .oe_view_manager_body { + display: table-row; +} .openerp .oe_view_manager table.oe_view_manager_header { border-collapse: separate; width: 100%; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 7110349557a..7ebc7408127 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1068,10 +1068,12 @@ $sheet-padding: 16px height: inherit width: 100% .oe_view_manager_body - display: table-row height: inherit .oe_view_manager_view_kanban:not(:empty) height: inherit + &[data-view-type=kanban] + .oe_view_manager_body + display: table-row table.oe_view_manager_header border-collapse: separate |