[MPERGE] Sync with trunk.

bzr revid: tde@openerp.com-20121221160130-x07kk2mscu5zo3ta
2012-12-21 17:01:30 +01:00
parent f9763f5d05 cfd2267460
commit 6e8d8a0863
20 changed files with 504 additions and 530 deletions
@@ -2,13 +2,15 @@
 .oe_kanban_column .note_text_line_through {
  text-decoration: line-through;
 }
-
 .openerp .oe_form .oe_form_field.oe_memo {
  margin: 0;
  padding: 0px;
  width: 100%;
  min-height: 200px;
 }
+.openerp .oe_form .oe_pad.oe_memo {
+  width: auto;
+}
 .openerp .oe_form .oe_form_field.oe_memo .cleditorMain {
  border: none;
  padding: 0px;