From fef6ed2f9390de21b54eb77f081f2ebb25a17967 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 28 Nov 2012 12:17:41 +0100
Subject: [PATCH 1/2] [FIX] When the avatar of 'change my preferences' is
 mousehover, the scrollbar appears, and after a color bar appears. Set
 oe_form_field_image_controls on overflow hidden for fixing.

bzr revid: chm@openerp.com-20121128111741-pm6fy7z01se90oxd
---
 addons/web/static/src/css/base.css  | 1 +
 addons/web/static/src/css/base.sass | 1 +
 2 files changed, 2 insertions(+)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index ee81492b8ad..6a351fc9971 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2353,6 +2353,7 @@
   display: none;
   text-align: center;
   color: #eeeeee;
+  overflow: hidden;
   background: rgba(37, 37, 37, 0.9);
   -moz-border-radius: 3px 3px 0 0;
   -webkit-border-radius: 3px 3px 0 0;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 3923fcaf2ff..18d0c52c66b 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1885,6 +1885,7 @@ $sheet-padding: 16px
                 display: none
                 text-align: center
                 color: #eee
+                overflow: hidden
                 background: rgba(37,37,37,0.9)
                 @include radius(3px 3px 0 0)
                 @include box-sizing(border)

From 66e13eb9bf9c2d1b44abd22555dcd0374a8521b8 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 29 Nov 2012 09:33:14 +0100
Subject: [PATCH 2/2] [IMP] web avatar preference: change overflow hidden into
 padding: 4px 0

bzr revid: chm@openerp.com-20121129083314-gbhblm0vi4nw08sb
---
 addons/web/static/src/css/base.css  | 3 +--
 addons/web/static/src/css/base.sass | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 6a351fc9971..24a035a3050 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2348,12 +2348,11 @@
 .openerp .oe_form .oe_form_field_image .oe_form_field_image_controls {
   position: absolute;
   top: 1px;
-  padding: 4px;
+  padding: 4px 0;
   width: 100%;
   display: none;
   text-align: center;
   color: #eeeeee;
-  overflow: hidden;
   background: rgba(37, 37, 37, 0.9);
   -moz-border-radius: 3px 3px 0 0;
   -webkit-border-radius: 3px 3px 0 0;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 18d0c52c66b..6d167709692 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1880,12 +1880,11 @@ $sheet-padding: 16px
             .oe_form_field_image_controls
                 position: absolute
                 top: 1px
-                padding: 4px
+                padding: 4px 0
                 width: 100%
                 display: none
                 text-align: center
                 color: #eee
-                overflow: hidden
                 background: rgba(37,37,37,0.9)
                 @include radius(3px 3px 0 0)
                 @include box-sizing(border)