From 3f07d75644b99dba7d67812f53649cc5c657a301 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 2 Jan 2013 14:57:52 +0100
Subject: [PATCH] [MERGE] trunk-bug-1092942-ggh: kanban display tags: bug
 #1092942 and bug #1094877

bzr revid: chm@openerp.com-20130102135752-0r1h31ntawksm7n9
---
 addons/web_kanban/static/src/css/kanban.css  | 9 +++++++++
 addons/web_kanban/static/src/css/kanban.sass | 7 +++++++
 2 files changed, 16 insertions(+)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index ae1903979a8..de7ff587be5 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -84,6 +84,7 @@
 }
 .openerp .oe_kanban_view .oe_kanban_group_title > span {
   margin-right: 4px;
+  display: inline-block;
 }
 .openerp .oe_kanban_view .oe_kanban_column, .openerp .oe_kanban_view .oe_kanban_group_header {
   vertical-align: top;
@@ -430,6 +431,14 @@
   line-height: 12px;
   font-size: 22px;
 }
+.openerp .oe_kanban_view .oe_kanban_footer_left .oe_tags {
+  margin-right: 0;
+}
+.openerp .oe_kanban_view .oe_kanban_footer_left .oe_tags .oe_tag {
+  display: inline-block;
+  padding: 0 2px;
+  line-height: 14px;
+}
 .openerp .oe_kanban_view .oe_kanban_footer_left .oe_kanban_mail_new {
   line-height: 18px;
   background-color: #8a89ba;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 4d7b0b82bac..f1b57893859 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -111,6 +111,7 @@
         text-shadow: 0 1px 0 white
         > span
             margin-right: 4px
+            display: inline-block
 
     .oe_kanban_column, .oe_kanban_group_header
         vertical-align: top
@@ -379,6 +380,12 @@
             .oe_e
                 line-height: 12px
                 font-size: 22px
+        .oe_tags
+            margin-right: 0
+            .oe_tag
+                display: inline-block
+                padding: 0 2px
+                line-height: 14px
         .oe_kanban_mail_new
             line-height: 18px
             background-color: #8a89ba