diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css index 2294513a389..d78276b2b97 100644 --- a/addons/point_of_sale/static/src/css/pos.css +++ b/addons/point_of_sale/static/src/css/pos.css @@ -222,7 +222,7 @@ .point-of-sale #rightheader .header-button:last-child{ border-left: 1px solid #3a3a3a; } -.point-of-sale #rightheader .header-button:hover{ +.point-of-sale #rightheader .header-button:active{ background: rgba(0,0,0,0.2); text-shadow: #000 0px 0px 3px; color:#EEE; @@ -314,18 +314,10 @@ border-top: 1px solid #efefef; font-size: 14px; } -.point-of-sale #paypad button, .point-of-sale #numpad button, .point-of-sale .popup button{ - position: relative; - top: 0; - -webkit-transition: top 150ms linear; - -moz-transition: top 150ms linear; - -ms-transition: top 150ms linear; - transition: top 150ms linear; -} -.point-of-sale #paypad button:active, .point-of-sale #numpad button:active, .point-of-sale .popup button:active{ - top:3px; -} -.point-of-sale #paypad button:hover, .point-of-sale #numpad button:hover, .point-of-sale #numpad .selected-mode, .point-of-sale .popup button:hover { +.point-of-sale #paypad button:active, +.point-of-sale #numpad button:active, +.point-of-sale #numpad .selected-mode, +.point-of-sale .popup button:active{ border: none; color: white; background: #7f82ac; @@ -525,7 +517,7 @@ -moz-box-shadow: 0px 2px 2px rgba(0,0,0, 0.1); box-shadow: 0px 2px 2px rgba(0,0,0, 0.1); } -.point-of-sale .category-simple-button:hover { +.point-of-sale .category-simple-button:active{ color: white; background: #7f82ac; border: 1px solid #7f82ac; @@ -1056,13 +1048,13 @@ -moz-transition: background 250ms ease-in-out; transition: background 250ms ease-in-out; } -.point-of-sale .order .orderline:hover{ +.point-of-sale .order .orderline:active{ background: rgba(140,143,183,0.05); -webkit-transition: background 50ms ease-in-out; -moz-transition: background 50ms ease-in-out; transition: background 50ms ease-in-out; } -.point-of-sale .order .orderline.empty:hover{ +.point-of-sale .order .orderline.empty:active{ background: transparent; cursor: default; } @@ -1163,7 +1155,7 @@ .point-of-sale .pos-actionbar .button .icon{ margin-top: 10px; } -.point-of-sale .pos-actionbar .button:hover { +.point-of-sale .pos-actionbar .button:active{ color: white; background: #7f82ac; border: 1px solid #7f82ac; @@ -1180,7 +1172,7 @@ .point-of-sale .pos-actionbar .button.disabled *{ opacity: 0.5; } -.point-of-sale .pos-actionbar .button.disabled:hover{ +.point-of-sale .pos-actionbar .button.disabled:active{ border: 1px solid #cacaca; border-radius: 4px; color: #555; @@ -1249,7 +1241,7 @@ display: block; cursor:pointer; } -.point-of-sale .debug-widget .button:hover{ +.point-of-sale .debug-widget .button:active{ background: rgba(96,21,177,0.45); } .point-of-sale .debug-widget input{ @@ -1337,7 +1329,7 @@ -moz-box-shadow: 0px 2px 2px rgba(0,0,0, 0.3); box-shadow: 0px 2px 2px rgba(0,0,0, 0.3); } -.point-of-sale .popup .button:hover { +.point-of-sale .popup .button:active{ color: white; background: #7f82ac; border: 1px solid #7f82ac; @@ -1405,7 +1397,7 @@ -moz-transition: all 250ms ease-in-out; transition: all 250ms ease-in-out; } -.point-of-sale .scrollbar .button:hover{ +.point-of-sale .scrollbar .button:active{ text-shadow: rgba(255,255,255,0.8) 0px 0px 15px; } .point-of-sale .scrollbar .button.disabled{ diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js index dc00c995480..c67bb609a96 100644 --- a/addons/point_of_sale/static/src/js/widgets.js +++ b/addons/point_of_sale/static/src/js/widgets.js @@ -62,10 +62,10 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa start: function() { this.state.bind('change:mode', this.changedMode, this); this.changedMode(); - this.$el.find('button#numpad-backspace').click(_.bind(this.clickDeleteLastChar, this)); - this.$el.find('button#numpad-minus').click(_.bind(this.clickSwitchSign, this)); - this.$el.find('button.number-char').click(_.bind(this.clickAppendNewChar, this)); - this.$el.find('button.mode-button').click(_.bind(this.clickChangeMode, this)); + this.$el.find('.numpad-backspace').click(_.bind(this.clickDeleteLastChar, this)); + this.$el.find('.numpad-minus').click(_.bind(this.clickSwitchSign, this)); + this.$el.find('.number-char').click(_.bind(this.clickAppendNewChar, this)); + this.$el.find('.mode-button').click(_.bind(this.clickChangeMode, this)); }, clickDeleteLastChar: function() { return this.state.deleteLastChar(); @@ -844,12 +844,13 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa this.cashier_controls_visible = true; this.image_cache = new module.ImageCache(); // for faster products image display - $('.oe_tooltip').remove(); // remove tooltip from the start session button }, start: function() { var self = this; return self.pos.ready.done(function() { + $('.oe_tooltip').remove(); // remove tooltip from the start session button + self.build_currency_template(); self.renderElement();