diff options
| author | Divyesh Makwana (Open ERP) <mdi@tinyerp.com> | 2012-11-23 11:11:40 +0530 |
|---|---|---|
| committer | Divyesh Makwana (Open ERP) <mdi@tinyerp.com> | 2012-11-23 11:11:40 +0530 |
| commit | a49b3e6c641e821fc99478a6e825c62d128bf032 (patch) | |
| tree | fcffd207d8e3e22e5594f3a87a33b408ee7ba1e4 /addons/web/static/src | |
| parent | 189aa1152094d7bbbf6ae7553d1419f05d11dc90 (diff) | |
| parent | 0b995d57d1e8fcd6d0b454d1bcd6ddae871abd0b (diff) | |
[Merge] Merge the General section.
bzr revid: mdi@tinyerp.com-20121123054140-2mgtjrfmey4z7gb4
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/css/base.css | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/coresetup.js | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 45cd8ef70aa..6b30a4768a0 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -652,7 +652,7 @@ cursor: pointer; } .openerp .oe_dropdown_toggle { - color: rgba(0, 0, 0, 0.3); + color: #4C4C4C; font-weight: normal; } .openerp .oe_dropdown_hover:hover .oe_dropdown_menu, .openerp .oe_dropdown_menu.oe_opened { diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js index 8b12f39c5e4..fa1348a5f8c 100644 --- a/addons/web/static/src/js/coresetup.js +++ b/addons/web/static/src/js/coresetup.js @@ -119,6 +119,9 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess }, session_logout: function() { this.set_cookie('session_id', ''); + var url = "#"; + $.bbq.pushState(url); + window.location.search = ""; return this.rpc("/web/session/destroy", {}); }, get_cookie: function (name) { |