From 3982e3524a1ab8bbe18b931d614fbcb46ece07bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Tue, 17 Jul 2012 16:29:23 +0200
Subject: [PATCH] [FIX] point_of_sale: various css fixes

bzr revid: fva@openerp.com-20120717142923-tk4nkp4mdbegcndi
---
 addons/point_of_sale/static/src/css/pos.css                | 3 +++
 addons/point_of_sale/static/src/js/pos_scrollbar_widget.js | 1 +
 2 files changed, 4 insertions(+)

diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css
index 0b92dce6504..d90a12b22eb 100644
--- a/addons/point_of_sale/static/src/css/pos.css
+++ b/addons/point_of_sale/static/src/css/pos.css
@@ -522,6 +522,7 @@
     position:relative;
     vertical-align: top;
     display: inline-block;
+    line-height: 100px;
     font-size: 11px;
     margin: 5px;
     width: 120px;
@@ -548,6 +549,7 @@
     right: 2px;
     vertical-align: top;
     color: white;
+    line-height: 14px;
     background: #7f82ac;
     padding: 2px 5px;
     border-radius: 3px;
@@ -561,6 +563,7 @@
             box-sizing: border-box;
     bottom:0;
     top:auto;
+    line-height: 14px;
     width:100%;
     background: -webkit-linear-gradient(-90deg,rgba(255,255,255,0),rgba(255,255,255,1), rgba(255,255,255,1));
     background:    -moz-linear-gradient(-90deg,rgba(255,255,255,0),rgba(255,255,255,1), rgba(255,255,255,1));
diff --git a/addons/point_of_sale/static/src/js/pos_scrollbar_widget.js b/addons/point_of_sale/static/src/js/pos_scrollbar_widget.js
index d4f6903c435..7c765028231 100644
--- a/addons/point_of_sale/static/src/js/pos_scrollbar_widget.js
+++ b/addons/point_of_sale/static/src/js/pos_scrollbar_widget.js
@@ -65,6 +65,7 @@ function openerp_pos_scrollbar(instance, module){ //module is instance.point_of_
             this.auto_hide(false);
             this.$element.bind('mousewheel',function(event,delta){
                 self.scroll(delta*self.wheel_step);
+                return false;
             });
             this.$element.bind('click',function(event){
                 var vpos = event.pageY - self.$element.offset().top;