From b9fd12a3018739e8db5ac193ffdd7423fccad617 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Thu, 20 Sep 2012 16:40:17 +0200
Subject: [PATCH 1/2] [FIX] fixed etherpad's css integration

bzr revid: fva@openerp.com-20120920144017-il5ck5997gjdn5e7
---
 addons/pad/static/src/css/etherpad.css | 33 ++++++++++++++++++++++++--
 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>

From db6c61f66687cb64a3b50b62a43dd2f87a3755c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Thu, 20 Sep 2012 17:46:45 +0200
Subject: [PATCH 2/2] [FIX] made things more to my taste in hr and chatter's
 css

bzr revid: fva@openerp.com-20120920154645-lctwfo0tbaxsobwg
---
 addons/hr/static/src/css/hr.css     | 2 +-
 addons/mail/static/src/css/mail.css | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

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 48a178732b0..90e776b5547 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 {