Merge lp:~openerp-dev/openobject-addons/trunk-bug-1093808-hip into lp:openobject-addons

[Hiral Patel (OpenERP)]

Hello,

      The notes content in kanban does not align correctly.

Thanks.

Unmerged revisions

8487. By Hiral Patel (OpenERP) on 2012-12-31

[FIX][trunk] Note module: Display of notes content in kanban does not align correctly align the content

=== modified file 'note/note_view.xml'
--- note/note_view.xml	2012-12-15 11:07:58 +0000
+++ note/note_view.xml	2012-12-31 07:19:24 +0000
@@ -74,7 +74,7 @@
                   </div>
                 </div>
                 <!-- kanban note -->
-                <div t-attf-class="oe_kanban_content #{record.open.raw_value ? '' : 'note_text_line_through'}">
+                <div t-attf-class="oe_kanban_content #{record.open.raw_value ? '' : 'note_text_line_through'} oe_kanban_margin_content">
                   <!-- title -->
                   <field name="name"/>
                 </div>

=== modified file 'note/static/src/css/note.css'
--- note/static/src/css/note.css	2012-12-21 16:01:30 +0000
+++ note/static/src/css/note.css	2012-12-31 07:19:24 +0000
@@ -8,6 +8,9 @@
   width: 100%;
   min-height: 200px;
 }
+.openerp .oe_kanban_view .oe_kanban_margin_content {
+  margin-right: 35px;
+}
 .openerp .oe_form .oe_pad.oe_memo {
   width: auto;
 }

=== modified file 'note/static/src/css/note.sass'
--- note/static/src/css/note.sass	2012-12-21 16:01:30 +0000
+++ note/static/src/css/note.sass	2012-12-31 07:19:24 +0000
@@ -14,6 +14,10 @@
 .oe_kanban_column
   .note_text_line_through
     text-decoration: line-through
+    
+.openerp .oe_kanban_view
+  .oe_kanban_margin_content
+        margin-right: 35px
 
 .openerp
   .oe_form