diff options
| author | dle@openerp.com <> | 2012-12-21 15:44:34 +0100 |
|---|---|---|
| committer | dle@openerp.com <> | 2012-12-21 15:44:34 +0100 |
| commit | 91ccc4570beac673a2d7af211a868e557e7b748e (patch) | |
| tree | f1bc21eca2bd1d3cafb533591653a5ddbde0434a /addons/note/static/src/css | |
| parent | 91cbb9dec9e2f17947719ee65362c11b91b150f5 (diff) | |
| parent | e9f9e1191ca4e782d8014a4ba13a1feedf3fc4d7 (diff) | |
[MERGE]Latest trunk
bzr revid: dle@openerp.com-20121221144434-1lj0ir3jjosw5iih
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 16d71e28aa5..ece2d7d5ffd 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 -16px 0 -16px; 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 6f0c0883ae7..f30ff7246e7 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 -16px 0 -16px padding: 0px |