summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js
diff options
context:
space:
mode:
authorAntony Lesuisse <al@openerp.com>2012-07-25 09:42:44 +0200
committerAntony Lesuisse <al@openerp.com>2012-07-25 09:42:44 +0200
commit0b2ccd00e082818253baaf2e880f4e0b1dae12fb (patch)
tree3bd0b6c95d5c2629a4fce63c5a109c013a5e6693 /addons/web/static/src/js
parent930dd711ed9369e5a918d2df45878e5421001057 (diff)
parent1d766a2bc6109b8801a3939880bdad45542ecd37 (diff)
[MERGE] trunk-mit
bzr revid: al@openerp.com-20120725074244-q871un3r8qh17gpa
Diffstat (limited to 'addons/web/static/src/js')
-rw-r--r--addons/web/static/src/js/chrome.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 7212108478d..b5c69f5c82f 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -864,7 +864,7 @@ instance.web.UserMenu = instance.web.Widget.extend({
window.location.href, 'debug');
});
instance.web.dialog($help, {autoOpen: true,
- modal: true, width: 960, title: _t("About")});
+ modal: true, width: 580, height: 290, resizable: false, title: _t("About")});
});
},
});
@@ -903,7 +903,7 @@ instance.web.Client = instance.web.Widget.extend({
var doc_width = $(document).width();
var offset = $menu.offset();
var menu_width = $menu.width();
- var x = doc_width - offset.left - menu_width - 15;
+ var x = doc_width - offset.left - menu_width - 2;
if (x < 0) {
$menu.offset({ left: offset.left + x }).width(menu_width);
}