diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-01-27 12:23:09 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-01-27 12:23:09 +0100 |
| commit | 7e44ddcda3f21c7e6401173539dc0fe93f9a7dd2 (patch) | |
| tree | 322d7f2ce86ce328c27197c5c1b31c9f4a2b2c5c /addons/web_editor/static/src/css | |
| parent | 3c7b08c030daf84323279b3d87361214e4f1b729 (diff) | |
| parent | 6f923cbdcdc9a78d1999999b3bbd917eb8b4e921 (diff) | |
[MERGE] forward port of branch saas-7 up to 6f923cb
Diffstat (limited to 'addons/web_editor/static/src/css')
| -rw-r--r-- | addons/web_editor/static/src/css/backend.css | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/addons/web_editor/static/src/css/backend.css b/addons/web_editor/static/src/css/backend.css index 29871c3d305..33a7155354c 100644 --- a/addons/web_editor/static/src/css/backend.css +++ b/addons/web_editor/static/src/css/backend.css @@ -5,11 +5,17 @@ line-height: initial !important; color: initial !important; } -.oe_form_field_html_text .note-editable p { - margin: initial; +.oe_form_field_html_text iframe.o_readonly { + min-height: 1em; + width: 100%; + margin: 0; + padding: 0; + border: 0; } -.oe_form_field_html_text .note-editable a, .oe_form_field_html_text .note-editable a:hover { - color: initial; +.oe_form_field_html_text .note-editable p { + font-family: 'Lucida Grande', Helvetica, Verdana, Arial, sans-serif; + -webkit-margin-before: 0; + font-size: 13px; } .oe_form_field_html iframe { @@ -47,7 +53,6 @@ overflow: hidden !important; } - .openerp .oe_form .oe_form_field_html_translate textarea { min-width: 60px; width: 100%; |