[MERGE] trunk

bzr revid: al@openerp.com-20120531134327-z4zcvhfdmdsor0m7

2 files changed, 18 insertions, 15 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index ab5f261dbf2..e2879011a72 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -518,6 +518,7 @@
   opacity: 0.5;
 }
 .openerp .oe_leftbar {
+  display: none;
   width: 220px;
   background: #f0eeee;
   border-right: 1px solid #afafb6;
@@ -1721,7 +1722,7 @@
   -webkit-border-radius: 3px;
   border-radius: 3px;
   background: white;
-  min-width: 90px;
+  min-width: 70px;
   color: #1f1f1f;
 }
 .openerp .oe_form input[readonly],
@@ -1760,8 +1761,6 @@
 .openerp .oe_form .oe_form_field_url button img {
   vertical-align: top;
 }
-.openerp .oe_form .oe_form_field_translatable,
-.openerp .oe_form .oe_form_field_many2one,
 .openerp .oe_form .oe_form_field_date,
 .openerp .oe_form .oe_form_field_datetime {
   white-space: nowrap;
@@ -1878,8 +1877,9 @@
 }
 .openerp .oe_horizontal_separator {
   font-weight: bold;
-  font-size: 16px;
-  margin: 4px 0;
+  font-size: 20px;
+  margin: 20px 0px 10px 0px;
+  color: #aaaabb;
 }
 .openerp .oe_horizontal_separator:empty {
   height: 5px;
@@ -1956,7 +1956,7 @@
   -webkit-border-radius: 3px;
   border-radius: 3px;
   background: white;
-  min-width: 90px;
+  min-width: 50px;
 }
 .openerp .oe_form .oe_form_field_progressbar.ui-progressbar span {
   position: absolute;
@@ -2070,8 +2070,10 @@
 .openerp .oe-listview-content > tbody > tr {
   border-top: 1px solid #dddddd;
 }
-.openerp .oe-listview-content > tbody > tr > td, .openerp .oe-listview-content > tbody > tr > th {
+.openerp .oe-listview-content > tbody > tr > td.oe-field-cell {
   padding: 3px 6px;
+}
+.openerp .oe-listview-content > tbody > tr > td, .openerp .oe-listview-content > tbody > tr > th {
   line-height: 18px;
 }
 .openerp .oe-listview-content > tbody > tr > td > button, .openerp .oe-listview-content > tbody > tr > th > button {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 75c351a8558..eda410aa6ca 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -434,6 +434,7 @@ $colour4: #8a89ba
     // }}}
     // Webclient.leftbar {{{
     .oe_leftbar
+        display: none
         width: 220px
         background: #f0eeee
         border-right: 1px solid #afafb6
@@ -1376,13 +1377,13 @@ $colour4: #8a89ba
             -webkit-border-radius: 3px
             border-radius: 3px
             background: white
-            min-width: 90px
+            min-width: 70px
             color: #1f1f1f
         input[readonly],
         select[readonly],
         textarea[readonly],
         input[disabled],
-        select[disabled],
+        select[disabled]
             background: #E5E5E5 !important
             color: #666
         textarea[disabled]
@@ -1406,8 +1407,6 @@ $colour4: #8a89ba
         .oe_form_field_email button img,
         .oe_form_field_url button img
             vertical-align: top
-        .oe_form_field_translatable,
-        .oe_form_field_many2one,
         .oe_form_field_date,
         .oe_form_field_datetime
             white-space: nowrap
@@ -1518,8 +1517,9 @@ $colour4: #8a89ba
         border-bottom: 1px solid black
     .oe_horizontal_separator
         font-weight: bold
-        font-size: 16px
-        margin: 4px 0
+        font-size: 20px
+        margin: 20px 0px 10px 0px
+        color: #aab
     .oe_horizontal_separator:empty
         height: 5px
     .oe_vertical_separator
@@ -1585,7 +1585,7 @@ $colour4: #8a89ba
             -webkit-border-radius: 3px
             border-radius: 3px
             background: white
-            min-width: 90px
+            min-width: 50px
 
             span
                 position: absolute
@@ -1689,8 +1689,9 @@ $colour4: #8a89ba
             background: white
             > tr
                 border-top: 1px solid #ddd
-                > td, > th
+                > td.oe-field-cell
                     padding: 3px 6px
+                > td, > th
                     line-height: 18px
                     > button
                         border: none