diff --git a/addons/hr/static/src/css/hr.css b/addons/hr/static/src/css/hr.css index eb0728c6f1c..00ef92c0fd8 100644 --- a/addons/hr/static/src/css/hr.css +++ b/addons/hr/static/src/css/hr.css @@ -1,5 +1,5 @@ .oe_employee_vignette { - padding: 8px 0; + padding: 8px 8px; min-height: 100px; } diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index 2f9b35f1c95..717d0439486 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -132,8 +132,6 @@ display: none; white-space: normal; padding: 8px; - background: #eee; - border-top: 1px solid #ccc; } .openerp div.oe_mail_thread_action:after { @@ -201,7 +199,7 @@ .openerp .oe_mail_msg_email { padding: 8px; background: white; - border-top: 1px solid #ccc; + border-top: 1px solid #ebebeb; } .openerp div.oe_mail_thread_subthread .oe_mail_msg_comment { 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 @@ - Fullscreen + Fullscreen + You must configure the etherpad through the menu Setting > Companies > Companies, in the configuration tab of your company. +
You must configure the etherpad through the menu Setting > Companies > Companies, in the configuration tab of your company. +