diff options
| author | Aaron Bohy <aab@odoo.com> | 2015-09-01 21:25:24 +0200 |
|---|---|---|
| committer | Aaron Bohy <aab@odoo.com> | 2015-09-01 21:25:24 +0200 |
| commit | cc6d2aa995ab13645627eae49ae462fbf2b038e8 (patch) | |
| tree | b6e3e351a0acfa3b5d6729177192dfe3162809eb /addons/web/static | |
| parent | 5907be1f335dc21934619a34fc928a19e7885211 (diff) | |
| parent | c2f2a518313727b090831da30a20add775c6970c (diff) | |
[MERGE] New view Messaging
Diffstat (limited to 'addons/web/static')
| -rw-r--r-- | addons/web/static/src/css/base.css | 1 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 1 | ||||
| -rw-r--r-- | addons/web/static/src/js/framework/session_instance.js | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index cf0043ad8a2..f3db3be8323 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1475,7 +1475,6 @@ max-width: 892px; margin: 0 auto; padding: 16px 16px 48px; - background-color: #f0eeee; } .openerp .oe_form div.oe_form_configuration p, .openerp .oe_form div.oe_form_configuration ul, .openerp .oe_form div.oe_form_configuration ol { color: #aaa; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 5c3a0e5bd69..68ed4eb36d7 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1321,7 +1321,6 @@ $sheet-padding: 16px max-width: $sheet-max-width + 2* $sheet-padding margin: 0 auto padding: 16px 16px 48px - background-color: #f0eeee div.oe_form_configuration p, ul, ol color: #aaa diff --git a/addons/web/static/src/js/framework/session_instance.js b/addons/web/static/src/js/framework/session_instance.js index af2812ac05f..50424de9718 100644 --- a/addons/web/static/src/js/framework/session_instance.js +++ b/addons/web/static/src/js/framework/session_instance.js @@ -1,5 +1,5 @@ odoo.define('web.session', function (require) { var Session = require('web.Session'); var modules = odoo._modules; - return new Session(undefined, undefined, {modules:modules}); + return new Session(undefined, undefined, {modules:modules, use_cors: false}); }); |