diff options
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/css/base.css | 23 | ||||
| -rw-r--r-- | addons/web/static/src/js/corelib.js | 6 | ||||
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 3 | ||||
| -rw-r--r-- | addons/web/static/src/js/view_list.js | 3 |
4 files changed, 23 insertions, 12 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 0d79e783370..293d182e6b7 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2367,7 +2367,26 @@ div.ui-widget-overlay { filter: alpha(opacity=30); opacity: 0.3; } -.openerp .oe_bounce_button_left { + +.oe_bounce_left { float: left; - margin-right: 4px; +} + +.openerp .oe_bounce { + -moz-animation:bounce .40s linear; + -webkit-animation:bounce .40s linear; +} + +@-moz-keyframes bounce { + 0%{ -moz-transform:scale(0); opacity:0;} + 50%{ -moz-transform:scale(1.3); opacity:0.4; } + 75%{ -moz-transform:scale(0.9); opacity:0.7;} + 100%{ -moz-transform:scale(1); opacity:1;} +} + +@-webkit-keyframes bounce { + 0%{ -webkit-transform:scale(0); opacity:0;} + 50%{ -webkit-transform:scale(1.3); opacity:0.4;} + 75%{ -webkit-transform:scale(0.9); opacity:0.7;} + 100%{ -webkit-transform:scale(1); opacity:1;} }
\ No newline at end of file diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js index 03b67bce405..1ed4c4788e3 100644 --- a/addons/web/static/src/js/corelib.js +++ b/addons/web/static/src/js/corelib.js @@ -728,12 +728,6 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, { } return false; }, - /** - * Add bounce effect when click on wrong area - */ - do_bounce: function(element) { - element.effect("bounce", { times:3}, 300); - }, do_notify: function() { if (this.getParent()) { return this.getParent().do_notify.apply(this,arguments); diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 6139a8db5fd..3c9ff030441 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -564,8 +564,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM }); var edit_btn = $(".oe_form_button_edit"); this.$element.find(".oe_form_field, .oe_form_group_cell").click(function (e) { - edit_btn.wrap("<div>").addClass('oe_bounce_button_left'); - self.do_bounce(edit_btn); + edit_btn.wrap('<div>').css('margin-right','4px').addClass('oe_bounce_left oe_bounce'); e.stopImmediatePropagation(); }); } else { diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index f10c2bee4b2..da93a047259 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -984,8 +984,7 @@ instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web. self.row_clicked(e); } else if (opts.options.$buttons) { var create_btn = $(opts.options.$buttons.find('.oe_list_add')); - create_btn..wrap("<div>").addClass('oe_bounce_button_left') - self.view.do_bounce(create_btn); + create_btn.wrap('<div>').css('margin-right','4px').addClass('oe_bounce_left oe_bounce'); } }); }, |