diff options
| author | Christophe Matthieu <chm@openerp.com> | 2012-12-21 14:42:27 +0100 |
|---|---|---|
| committer | Christophe Matthieu <chm@openerp.com> | 2012-12-21 14:42:27 +0100 |
| commit | 558fcc4471f3b5bf4ee9675a36ad834d611d9fca (patch) | |
| tree | f635a32b142d5fb4e0d6af545202ed85e98bcfeb /addons/note/static/src/css | |
| parent | f3a71a1dc3a82b09e62c366e025739941e94f3e8 (diff) | |
| parent | 86a1802556cae70401f450c15a9bd51f5ccf9249 (diff) | |
[MERGE] FIX etherpad:When: a user access to the edit mode from a kanban view or list view, etherpad is dipslay on readonly mode but with the oe_editing class.
bzr revid: chm@openerp.com-20121221134227-1nbb922oz37ibjw5
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 |