[MERGE] Merged web branch holding timepicker update + kanban improvements (move into...

bzr revid: tde@openerp.com-20131125100547-vejcpe9p4le7jury

diff --cc addons/web_kanban/static/src/css/kanban.css
index 731fab4,b16c61b..e3afd35
--- 1/addons/web_kanban/static/src/css/kanban.css
--- 2/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@@ -3,8 -2,12 +2,11 @@@
    background: white;
    height: inherit;
  }
+ .openerp .oe_kanban_view .oe_kanban_column_higlight {
+   background: #eeddf6 !important;
+ }
  .openerp .oe_kanban_view .oe_view_nocontent {
    position: relative;
 -  z-index: 1;
    max-width: none;
    height: 100%;
  }

diff --cc addons/web_kanban/static/src/css/kanban.sass
index dfca3b0,1d34497..d13cbca
--- 1/addons/web_kanban/static/src/css/kanban.sass
--- 2/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@@ -51,8 -51,11 +51,10 @@@
      //background: url(data:image/pngbase64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAAKElEQVQIHWP8DwTv379nAAFBQUEGhnfv3oHEwADEZgJLIRGMIClkLQCr3x2Htp/lLwAAAABJRU5ErkJggg==)
      background: white
      height: inherit
+     .oe_kanban_column_higlight
+         background: #eeddf6 !important
      .oe_view_nocontent
          position: relative
 -        z-index: 1
          max-width: none
          height: 100%
          .oe_view_nocontent_content

diff --cc addons/web_kanban/static/src/js/kanban.js
Simple merge