[MERGE]resove conflict and merge with main branch.

bzr revid: vme@tinyerp.com-20111122061753-5uxqy3mxw0eedthn

1 files changed, 36 insertions, 24 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index c061353d113..d8f31af1d35 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -809,33 +809,33 @@ label.error {
     also on the first and last children of the first and last row
  */
 .openerp .oe-listview table.oe-listview-content {
-    -webkit-border-radius: 7px;
-    -moz-border-radius: 7px;
-    border-radius: 7px;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
 }
 .openerp .oe-listview table.oe-listview-content thead tr:first-child th:first-child {
-    -webkit-border-top-left-radius: 7px;
-    -moz-border-radius-topleft: 7px;
-    border-top-left-radius: 7px;
+    -webkit-border-top-left-radius: 4px;
+    -moz-border-radius-topleft: 4px;
+    border-top-left-radius: 4px;
 }
 .openerp .oe-listview table.oe-listview-content thead tr:first-child th:last-child {
-    -webkit-border-top-right-radius: 7px;
-    -moz-border-radius-topright: 7px;
-    border-top-right-radius: 7px;
+    -webkit-border-top-right-radius: 4px;
+    -moz-border-radius-topright: 4px;
+    border-top-right-radius: 4px;
 }
 .openerp .oe-listview table.oe-listview-content tfoot tr:last-child th:first-child,
 .openerp .oe-listview table.oe-listview-content tfoot tr:last-child td:first-child,
 .openerp .oe-listview table.oe-listview-content tbody:last-child tr:last-child th:first-child {
-    -webkit-border-bottom-left-radius: 7px;
-    -moz-border-radius-bottomleft: 7px;
-    border-bottom-left-radius: 7px;
+    -webkit-border-bottom-left-radius: 4px;
+    -moz-border-radius-bottomleft: 4px;
+    border-bottom-left-radius: 4px;
 }
 .openerp .oe-listview table.oe-listview-content tfoot tr:last-child th:last-child,
 .openerp .oe-listview table.oe-listview-content tfoot tr:last-child td:last-child,
 .openerp .oe-listview table.oe-listview-content tbody:last-child tr:last-child td:last-child {
-    -webkit-border-bottom-right-radius: 7px;
-    -moz-border-radius-bottomright: 7px;
-    border-bottom-right-radius: 7px;
+    -webkit-border-bottom-right-radius: 4px;
+    -moz-border-radius-bottomright: 4px;
+    border-bottom-right-radius: 4px;
 }
 
 /* Notebook */
@@ -967,20 +967,25 @@ label.error {
 .openerp .oe_forms textarea {
     resize:vertical;
 }
-.openerp .oe_forms input[type="text"], .openerp .oe_forms input[type="password"], .openerp .oe_forms select, .openerp .oe_forms .button {
+.openerp .oe_forms input[type="text"], .openerp .oe_forms input[type="password"], .openerp .oe_forms select, .openerp .oe_forms .oe_button {
     height: 22px;
 }
 .openerp .oe_forms input.field_datetime {
     min-width: 11em;
 }
-.openerp .oe_forms.oe_frame .oe_datepicker_root {
-    width: 100%;
-}
-.openerp .oe_forms .button {
+.openerp .oe_forms .oe_button {
     color: #4c4c4c;
     white-space: nowrap;
+    min-width: 100%;
+    width: 100%;
 }
-.openerp .oe_forms .button span {
+@-moz-document url-prefix() {
+    /* Strange firefox behaviour on width: 100% + white-space: nowrap */
+    .openerp .oe_forms .oe_button {
+        width: auto;
+    }
+}
+.openerp .oe_forms .oe_button span {
     position: relative;
     vertical-align: top;
 }
@@ -989,13 +994,20 @@ label.error {
     cursor: pointer;
     right: 5px;
     top: 3px;
+    z-index: 2;
+}
+.openerp .oe_datepicker_container {
+    position: absolute;
+    top: 0;
+    right: 0;
+    display: none;
 }
 .openerp .oe_datepicker_root {
     position: relative;
     display: inline-block;
 }
-.openerp .oe_datepicker_root input[type="text"] {
-    min-width: 160px;
+.openerp .oe_forms.oe_frame .oe_datepicker_root {
+    width: 100%;
 }
 .openerp .oe_input_icon_disabled {
     position: absolute;
@@ -1003,7 +1015,7 @@ label.error {
     opacity: 0.5;
     filter:alpha(opacity=50);
     right: 5px;
-    top: 5px;
+    top: 3px;
 }
 .openerp img.oe_field_translate {
     margin-left: -21px;