From ea8a853400c10a1e9f5fdb584a3120ffff90847e Mon Sep 17 00:00:00 2001
From: Martin Geubelle <mge@odoo.com>
Date: Fri, 3 Jul 2015 17:08:47 +0200
Subject: [PATCH] [FIX] web_kanban: dashboard style remains when grouped

---
 .../src/less/account_journal_dashboard.less   | 13 +++-
 .../src/less/hr_recruitment_dashboard.less    |  6 --
 .../hr_recruitment/views/hr_recruitment.xml   |  1 -
 .../static/src/less/kanban_dashboard.less     | 67 +++++++++----------
 4 files changed, 44 insertions(+), 43 deletions(-)
 delete mode 100644 addons/hr_recruitment/static/src/less/hr_recruitment_dashboard.less

diff --git a/addons/account/static/src/less/account_journal_dashboard.less b/addons/account/static/src/less/account_journal_dashboard.less
index 20ab33eaf09..e0b15be344c 100644
--- a/addons/account/static/src/less/account_journal_dashboard.less
+++ b/addons/account/static/src/less/account_journal_dashboard.less
@@ -1,7 +1,10 @@
 .o_kanban_view.o_kanban_dashboard.o_account_kanban {
     .o_kanban_record {
-        min-width: 500px;
-        max-width: 650px;
+        min-width: 400px;
+
+        @media (max-width: @grid-float-breakpoint) {
+            min-width: inherit;
+        }
 
         .o_kanban_card_settings {
             padding: 8px;
@@ -93,4 +96,10 @@
             }
         }
     }
+
+    &.o_kanban_grouped {
+        .o_kanban_record {
+            min-width: inherit;
+        }
+    }
 }
diff --git a/addons/hr_recruitment/static/src/less/hr_recruitment_dashboard.less b/addons/hr_recruitment/static/src/less/hr_recruitment_dashboard.less
deleted file mode 100644
index 7b1e83ceb4f..00000000000
--- a/addons/hr_recruitment/static/src/less/hr_recruitment_dashboard.less
+++ /dev/null
@@ -1,6 +0,0 @@
-.o_kanban_view.o_kanban_dashboard.o_hr_recruitment_kanban {
-	.o_kanban_record {
-		max-width: 500px;
-		min-width: 450px;
-	}
-}
\ No newline at end of file
diff --git a/addons/hr_recruitment/views/hr_recruitment.xml b/addons/hr_recruitment/views/hr_recruitment.xml
index 7fcfe6fc683..b628713118b 100644
--- a/addons/hr_recruitment/views/hr_recruitment.xml
+++ b/addons/hr_recruitment/views/hr_recruitment.xml
@@ -4,7 +4,6 @@
         <template id="assets_backend" name="hr_recruitment assets" inherit_id="web.assets_backend">
             <xpath expr="." position="inside">
                 <link rel="stylesheet" href="/hr_recruitment/static/src/css/job_position.css"/>
-                <link rel="stylesheet" href="/hr_recruitment/static/src/less/hr_recruitment_dashboard.less"/>
 
                 <script type="text/javascript" src="/hr_recruitment/static/src/js/job_position.js"></script>
             </xpath>
diff --git a/addons/web_kanban/static/src/less/kanban_dashboard.less b/addons/web_kanban/static/src/less/kanban_dashboard.less
index 82446e6faab..01bb69b7089 100644
--- a/addons/web_kanban/static/src/less/kanban_dashboard.less
+++ b/addons/web_kanban/static/src/less/kanban_dashboard.less
@@ -12,50 +12,49 @@
         }
     }
 
-    &.o_kanban_dashboard.o_kanban_ungrouped {
+    .o_visible {
+        width: 100%;
 
-        .o_visible {
-            width: 100%;
-
-            /* This is a hack ; without this, a scrollbar appears
-             * to scroll horizontally because of inline-block and width: 100%,
-             * but they are both necessary.
-            */
-            overflow: hidden;
-        }
-
-        /* This is a hack but this is the least ugly way to do it:
-         * We want two blocks (a visible one and an invisible one)
-         * to be overlap but both height should be equal to the
-         * height of the biggest block. Solution : put 0 width for
-         * the invisible on. The 0 padding and margin is mandatory for
-         * the elements to use the same space in both state (visible
-         * and invisible).
+        /* This is a hack ; without this, a scrollbar appears
+         * to scroll horizontally because of inline-block and width: 100%,
+         * but they are both necessary.
         */
-        .o_invisible {
-            width: 0;
-            visibility: hidden;
+        overflow: hidden;
+    }
+
+    /* This is a hack but this is the least ugly way to do it:
+     * We want two blocks (a visible one and an invisible one)
+     * to be overlap but both height should be equal to the
+     * height of the biggest block. Solution : put 0 width for
+     * the invisible on. The 0 padding and margin is mandatory for
+     * the elements to use the same space in both state (visible
+     * and invisible).
+    */
+    .o_invisible {
+        width: 0;
+        visibility: hidden;
+        padding-left: 0px !important;
+        padding-right: 0px !important;
+        margin-left: 0px !important;
+        margin-right: 0px !important;
+        overflow: hidden;
+
+        * {
             padding-left: 0px !important;
             padding-right: 0px !important;
             margin-left: 0px !important;
             margin-right: 0px !important;
-            overflow: hidden;
-            
-            * {
-                padding-left: 0px !important;
-                padding-right: 0px !important;
-                margin-left: 0px !important;
-                margin-right: 0px !important;
-            }
+        }
 
+        .oe_kanban_colorpicker {
 
-            .oe_kanban_colorpicker {
-
-                li {
-                    height: 0px;
-                }
+            li {
+                height: 0px;
             }
         }
+    }
+
+    &.o_kanban_dashboard.o_kanban_ungrouped, &.o_kanban_dashboard.o_kanban_grouped {
 
         // If invisible, elem will no take more than its original height
         a, span {