diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-12-21 17:01:30 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-12-21 17:01:30 +0100 |
| commit | 6e8d8a08639b9a9fec565963af196f2bea8b58db (patch) | |
| tree | fb1e4f286026c66fabd44f6c032261a62755b930 /addons/note/static/src/css | |
| parent | f9763f5d05166b91962a1a88e97b4a401349e3fd (diff) | |
| parent | cfd226746096d156f853ad1289d15e0a2da0ca36 (diff) | |
[MPERGE] Sync with trunk.
bzr revid: tde@openerp.com-20121221160130-x07kk2mscu5zo3ta
Diffstat (limited to 'addons/note/static/src/css')
| -rw-r--r-- | addons/note/static/src/css/note.css | 4 | ||||
| -rw-r--r-- | addons/note/static/src/css/note.sass | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/addons/note/static/src/css/note.css b/addons/note/static/src/css/note.css index 303e35e9146..fe9c8510e7d 100644 --- a/addons/note/static/src/css/note.css +++ b/addons/note/static/src/css/note.css @@ -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; diff --git a/addons/note/static/src/css/note.sass b/addons/note/static/src/css/note.sass index 3fafb7b7c21..6fa76b32d43 100644 --- a/addons/note/static/src/css/note.sass +++ b/addons/note/static/src/css/note.sass @@ -17,6 +17,8 @@ .openerp .oe_form + .oe_pad.oe_memo + width: auto .oe_form_field.oe_memo margin: 0 padding: 0px |