From 791061b067c787cf00a3a3a24d2c756a80957e28 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 21 May 2012 13:47:27 +0200
Subject: [PATCH] [IMP] Merge previous fp's base.css changes in base.sass

bzr revid: fme@openerp.com-20120521114727-ou14pali2255am6w
---
 addons/web/static/src/css/base.css  |  5 +----
 addons/web/static/src/css/base.sass | 13 ++++---------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index a2fefddb32a..7682f92fcc6 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -517,6 +517,7 @@
   border-right: 1px solid #afafb6;
   text-shadow: 0 1px 1px white;
   padding-bottom: 16px;
+  line-height: 18px;
 }
 .openerp a.oe_logo {
   width: 220px;
@@ -729,10 +730,6 @@
 .openerp .oe_menu_more_container .oe_menu_more li a {
   white-space: nowrap;
 }
-.oe_leftbar {
-  line-height: 18px;
-}
-
 .openerp .oe_secondary_menu_section {
   font-weight: bold;
   margin-left: 8px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index d7e42639254..f10224522c5 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -105,7 +105,6 @@ $colour4: #8a89ba
                 border-right: none
     th, td
         padding: 0
-        line-height: 18px
         text-align: left
     th
         font-weight: bold
@@ -423,6 +422,7 @@ $colour4: #8a89ba
         border-right: 1px solid #afafb6
         text-shadow: 0 1px 1px white
         padding-bottom: 16px
+        line-height: 18px
     a.oe_logo
         width: 220px
         display: block
@@ -784,11 +784,6 @@ $colour4: #8a89ba
         .oe_view_manager_buttons
             white-space: nowrap
     // }}}
-    // ViewManager.body {{{
-    .oe_view_manager_body
-        h4
-            margin: 8px 0
-    // }}}
     // ViewManager.pager {{{
     .oe_view_manager_pager
         line-height: 26px
@@ -1112,11 +1107,12 @@ $colour4: #8a89ba
     .oe_view_nocontent
         > img
             float: left
-            margin-right: 1.5em
+            margin: 1.5em
         > div
             // don't encroach on my arrow
             overflow: hidden
-            padding: 6px
+            padding: 35px 0px 0px 0px
+            max-width: 700px
             font-size: 125%
     .oe_view_topbar
         border-bottom: 1px solid #cacaca
@@ -1308,7 +1304,6 @@ $colour4: #8a89ba
             padding-left: 8px
             @include box-shadow(none)
             @include radius(0px)
-            color: #666
         .oe_form_field_many2one input,
         .oe_form_field_binary input,
         .oe_form_field_binary input,