diff options
| author | Géry Debongnie <ged@odoo.com> | 2014-06-27 15:06:45 +0200 |
|---|---|---|
| committer | Géry Debongnie <ged@odoo.com> | 2014-06-27 15:06:45 +0200 |
| commit | 2ae0e6b7c342b8097cdb9045fda83cd8955cc95b (patch) | |
| tree | 22f834be6170615c7a945ea31f0b6aa24bb9f135 /addons/web/static | |
| parent | e556fd735e66dc8d769be0bb3b7ea23777c24116 (diff) | |
| parent | b36f5d6d33260637013ae339525353c2fb2b1ef5 (diff) | |
Merge remote-tracking branch 'odoo/master' into master-autocompletion-ged
Diffstat (limited to 'addons/web/static')
| -rw-r--r-- | addons/web/static/src/css/base.css | 2 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/chrome.js | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index d496496c1fe..f6a507d7a87 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -775,7 +775,7 @@ } .openerp .oe_loading { display: none; - z-index: 100; + z-index: 1001; position: fixed; top: 0; right: 50%; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 9817daab5c7..f2dda44b72f 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -667,7 +667,7 @@ $sheet-padding: 16px // Loading {{{ .oe_loading display: none - z-index: 100 + z-index: 1001 position: fixed top: 0 right: 50% diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index e53c8f0da6c..f21cfbc1f84 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -1150,7 +1150,7 @@ instance.web.Client = instance.web.Widget.extend({ self.notification = new instance.web.Notification(this); self.notification.appendTo(self.$el); self.loading = new instance.web.Loading(self); - self.loading.appendTo(self.$el); + self.loading.appendTo(self.$('.openerp_webclient_container')); self.action_manager = new instance.web.ActionManager(self); self.action_manager.appendTo(self.$('.oe_application')); }, |