diff options
| author | Frédéric van der Essen <fva@openerp.com> | 2012-09-20 17:52:16 +0200 |
|---|---|---|
| committer | Frédéric van der Essen <fva@openerp.com> | 2012-09-20 17:52:16 +0200 |
| commit | 615cc753147b99df3bbc9edfb778ca0b23d4a41e (patch) | |
| tree | bc7567b65c860db53d3113e6e6d80506d28a337b /addons/pad/static/src | |
| parent | 05c912603aa60336ba6f88255ce2ebf243cfcb1f (diff) | |
| parent | db6c61f66687cb64a3b50b62a43dd2f87a3755c1 (diff) | |
[MERGE] css improvements to mail, hr, and etherpad integration
bzr revid: fva@openerp.com-20120920155216-wzvpnk8rv4ltym5v
Diffstat (limited to 'addons/pad/static/src')
| -rw-r--r-- | addons/pad/static/src/css/etherpad.css | 33 | ||||
| -rw-r--r-- | addons/pad/static/src/xml/pad.xml | 4 |
2 files changed, 34 insertions, 3 deletions
diff --git a/addons/pad/static/src/css/etherpad.css b/addons/pad/static/src/css/etherpad.css index 8ea7972071e..bd73af6c2cd 100644 --- a/addons/pad/static/src/css/etherpad.css +++ b/addons/pad/static/src/css/etherpad.css @@ -1,7 +1,12 @@ .oe_pad_head { + box-sizing: border-box; width: 100%; display: block; padding: 4px; + text-align: right; +} +.oe_pad_head .oe_pad_switch { + } .oe_pad_readonly { @@ -13,14 +18,38 @@ position: fixed; top: 0px; left: 0px; - width: 100%; - height: 100%; + right: 0px; + bottom: 0px; background-color: white; + margin:0; + padding:0; + border:none; z-index: 1000; } +.oe_pad_content { + border: solid 1px #c4c4c4; + height: 150px; + -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); + -o-box-shadow: 0 5px 10px rgba(0,0,0,0.1); + box-shadow: 0 5px 10px rgba(0,0,0,0.1); +} + +.oe_pad_content > p { + text-align: center; + opacity: 0.75; +} + .oe_pad_fullscreen .oe_pad_content { height: 100%; + border: none; + -webkit-box-shadow: none; + -moz-box-shadow: none; + -ms-box-shadow: none; + -o-box-shadow: none; + box-shadow: none; } .etherpad_readonly ul, .etherpad_readonly ol { diff --git a/addons/pad/static/src/xml/pad.xml b/addons/pad/static/src/xml/pad.xml index ce79df52684..911655b6b89 100644 --- a/addons/pad/static/src/xml/pad.xml +++ b/addons/pad/static/src/xml/pad.xml @@ -5,12 +5,14 @@ <t t-name="FieldPad"> <div class="oe_form_field_text oe_pad"> <div class="oe_pad_head"> - <span class="oe_pad_switch">Fullscreen</span> + <button class="oe_pad_switch oe_button">Fullscreen</button> </div> <div class="oe_pad_content"></div> </div> </t> <t t-name="FieldPad.unconfigured"> + <p> You must configure the etherpad through the menu Setting > Companies > Companies, in the configuration tab of your company.<br/> + </p> </t> </templates> |