diff options
| author | Fabien Pinckaers <fp@tinyerp.com> | 2012-12-15 12:07:58 +0100 |
|---|---|---|
| committer | Fabien Pinckaers <fp@tinyerp.com> | 2012-12-15 12:07:58 +0100 |
| commit | bdc7dcd5390d5c19d94caa0364fe6c638b23d1b7 (patch) | |
| tree | fb933ec064ac59063640fa75425b2d59b1555914 | |
| parent | b8008dc7e448d27e341e9cf61fe0102ca28e9761 (diff) | |
[IMP] CSS of etherpad
bzr revid: fp@tinyerp.com-20121215110758-3ahwmk20uh5kt6g7
| -rw-r--r-- | addons/note/note_view.xml | 2 | ||||
| -rw-r--r-- | addons/pad/static/src/css/etherpad.css | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml index d11ea6f351d..49a154d10cc 100644 --- a/addons/note/note_view.xml +++ b/addons/note/note_view.xml @@ -112,7 +112,7 @@ <field name="name">note.note.form</field> <field name="model">note.note</field> <field name="arch" type="xml"> - <form string="Note" version="7.0"> + <form string="Note" version="7.0" class="oe_form_nomargin"> <header> <field name="tag_ids" widget="many2many_tags" class="oe_inline" placeholder="Tags"/> <field name="stage_id" domain="[('user_id','=',uid)]" widget="statusbar" clickable="1"/> diff --git a/addons/pad/static/src/css/etherpad.css b/addons/pad/static/src/css/etherpad.css index 6d27b527383..d2e60414b99 100644 --- a/addons/pad/static/src/css/etherpad.css +++ b/addons/pad/static/src/css/etherpad.css @@ -1,6 +1,3 @@ -.oe_pad { - margin-top: 16px; -} .oe_pad_switch_positioner { position: relative; @@ -48,7 +45,7 @@ .oe_pad.oe_configured .oe_pad_content.oe_editing{ border: solid 1px #c4c4c4; - height:300px; + height:500px; -webkit-box-shadow: 0 5px 10px rgba(0,0,0,0.1); -moz-box-shadow: 0 5px 10px rgba(0,0,0,0.1); -ms-box-shadow: 0 5px 10px rgba(0,0,0,0.1); |