diff options
| author | Christophe Simonis <chs@odoo.com> | 2014-06-10 12:29:47 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2014-06-10 12:29:47 +0200 |
| commit | 6b8e9727e5ab2e7b841c307d4700934048af8d37 (patch) | |
| tree | 771c742ebf5a550f9bd9c9389ce82a260ff71ac1 /addons/web_kanban/static/src/css | |
| parent | 6eacf9167177b3809700b1ae96604fef03fb226b (diff) | |
| parent | 4601d859440c7be464c670741e434a012e16d3b3 (diff) | |
[MERGE] forward port of branch saas-3 up to 4601d85
Diffstat (limited to 'addons/web_kanban/static/src/css')
| -rw-r--r-- | addons/web_kanban/static/src/css/kanban.css | 8 | ||||
| -rw-r--r-- | addons/web_kanban/static/src/css/kanban.sass | 8 |
2 files changed, 9 insertions, 7 deletions
diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index db43cc00586..83562142643 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -95,6 +95,9 @@ .openerp .oe_kanban_view .oe_kanban_groups { height: inherit; } +.openerp .oe_kanban_view .oe_kanban_groups_records { + height: 100%; +} .openerp .oe_kanban_view.oe_kanban_grouped_by_m2o .oe_kanban_group_title { cursor: move; } @@ -162,10 +165,7 @@ padding: 0px; background: white; } -.openerp .oe_kanban_view .oe_kanban_column, .openerp .oe_kanban_view .oe_kanban_column_cards { - height: 100%; -} -.openerp .oe_kanban_view .oe_kanban_column, .openerp .oe_kanban_view .oe_kanban_column_cards { +.openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_column, .openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_column_cards { height: 100%; } .openerp .oe_kanban_view .oe_kanban_aggregates { diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index 77533c1182e..8d2174bc22e 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -119,6 +119,8 @@ // KanbanGroups {{{ .oe_kanban_groups height: inherit + .oe_kanban_groups_records + height: 100% &.oe_kanban_grouped_by_m2o .oe_kanban_group_title cursor: move .oe_kanban_header @@ -178,9 +180,9 @@ .oe_kanban_column padding: 0px background: #ffffff - - .oe_kanban_column, .oe_kanban_column_cards - height: 100% + &.oe_kanban_grouped + .oe_kanban_column, .oe_kanban_column_cards + height: 100% .oe_kanban_aggregates padding: 0 margin: 0px |