diff options
| author | Bhumi Thakkar (Open ERP) <bth@tinyerp.com> | 2013-01-23 15:33:22 +0530 |
|---|---|---|
| committer | Bhumi Thakkar (Open ERP) <bth@tinyerp.com> | 2013-01-23 15:33:22 +0530 |
| commit | ffc09a7251fca17e207c6c4f6de01e17da29f4af (patch) | |
| tree | f37c8c00141f18585c221e81439e8e70e63c01a1 /addons | |
| parent | bf07b11a06c00e87aeee09e4584f947d94484bd9 (diff) | |
[FIX] Fixed calendar instead of ul of searchvox.
bzr revid: bth@tinyerp.com-20130123100322-zw0e40btcex2wfjc
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/web/static/src/js/search.js | 1 | ||||
| -rw-r--r-- | addons/web_calendar/static/src/css/web_calendar.css | 2 | ||||
| -rw-r--r-- | addons/web_calendar/static/src/css/web_calendar.sass | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 1d732292671..a0208cc6d7a 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -445,7 +445,6 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea ? $('<a>').html(item.label) : $('<a>').text(item.value)); } - $(ul[0]).css({'z-index': 2}); return $item.text(item.label) .css({ borderTop: '1px solid #cccccc', diff --git a/addons/web_calendar/static/src/css/web_calendar.css b/addons/web_calendar/static/src/css/web_calendar.css index d40a7a2940a..214c777dbdc 100644 --- a/addons/web_calendar/static/src/css/web_calendar.css +++ b/addons/web_calendar/static/src/css/web_calendar.css @@ -18,7 +18,7 @@ .openerp .oe_calendar .dhx_cal_select_menu .dhx_menu_icon.icon_edit { display: none; } -.openerp .oe_calendar .dhx_cal_navline { +.openerp .oe_calendar .dhx_cal_navline, .openerp .oe_calendar .dhx_cal_header { z-index: auto; } .openerp .oe_calendar.oe_cal_month .dhx_cal_data table tr td:last-child div.dhx_month_body { diff --git a/addons/web_calendar/static/src/css/web_calendar.sass b/addons/web_calendar/static/src/css/web_calendar.sass index f6b6a1a5eeb..e4986981609 100644 --- a/addons/web_calendar/static/src/css/web_calendar.sass +++ b/addons/web_calendar/static/src/css/web_calendar.sass @@ -20,7 +20,7 @@ // Dhtmlx Scheduler css overrides .dhx_cal_select_menu .dhx_menu_icon.icon_edit display: none - .dhx_cal_navline + .dhx_cal_navline, .dhx_cal_header // dhtmlx sets the index to 3 (in glossy theme) // I didn't found the reason yet but it overlaps the // dropdown menus and I want to avoid a z-index war. |