From 32ca8ce3da120fbeb34886abbb7e1c073de26f3e Mon Sep 17 00:00:00 2001 From: Vidhin Mehta Date: Fri, 1 Feb 2013 17:37:13 +0530 Subject: [PATCH] [IMP]sass2css changes bzr revid: vme@tinyerp.com-20130201120713-pxwej4ti38vo5f37 --- addons/web_kanban/static/src/css/kanban.css | 11 +++++++++++ addons/web_kanban/static/src/css/kanban.sass | 9 +++++++++ addons/web_kanban/static/src/js/kanban.js | 2 +- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index 521d4305cc8..30d93b81c10 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -2,6 +2,9 @@ background: white; height: inherit; } +.openerp .oe_kanban_view .oe_kanban_column_higlight { + background: #eeddf6 !important; +} .openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_dummy_cell { background: url(/web/static/src/img/form_sheetbg.png); width: 100%; @@ -137,6 +140,9 @@ padding: 0; margin: 0px; } +.openerp .oe_kanban_view .oe_kanban_column .oe_kanban_folded_column_cards { + visibility: hidden; +} .openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_group_title, .openerp .oe_kanban_view .oe_kanban_group_folded.oe_kanban_column *, .openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_aggregates, .openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_add { display: none; } @@ -146,6 +152,11 @@ .openerp .oe_kanban_view .oe_kanban_group_folded .oe_dropdown_kanban { left: -5px; } +.openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_folded_column_cards { + visibility: visible; + display: block !important; + height: 100%; +} .openerp .oe_kanban_view .oe_kanban_group_title_undefined { color: #666666; } diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index b5c1e656243..0925f3f959a 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -51,6 +51,8 @@ //background: url(data:image/pngbase64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAAKElEQVQIHWP8DwTv379nAAFBQUEGhnfv3oHEwADEZgJLIRGMIClkLQCr3x2Htp/lLwAAAABJRU5ErkJggg==) background: white height: inherit + .oe_kanban_column_higlight + background: #eeddf6 !important &.oe_kanban_grouped .oe_kanban_dummy_cell background: url(/web/static/src/img/form_sheetbg.png) width: 100% @@ -158,6 +160,9 @@ .oe_kanban_aggregates padding: 0 margin: 0px + .oe_kanban_column + .oe_kanban_folded_column_cards + visibility: hidden .oe_kanban_group_folded .oe_kanban_group_title, &.oe_kanban_column *, .oe_kanban_aggregates, .oe_kanban_add display: none @@ -165,6 +170,10 @@ display: block .oe_dropdown_kanban left: -5px + .oe_kanban_folded_column_cards + visibility: visible + display: block !important + height: 100% .oe_kanban_group_title_undefined color: #666666 .oe_kanban_group_title_vertical diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 2866c6794e2..3559d3862bd 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -326,7 +326,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ if (this.group_by) { // Kanban cards drag'n'drop var prev_widet; - var $columns = this.$el.find('.oe_kanban_column .oe_kanban_column_cards, .oe_kanban_column .oe_kanban_on_fold_cards'); + var $columns = this.$el.find('.oe_kanban_column .oe_kanban_column_cards, .oe_kanban_column .oe_kanban_folded_column_cards'); $columns.sortable({ handle : '.oe_kanban_draghandle', start: function(event, ui) {