diff options
| author | jke-openerp <jke@openerp.com> | 2013-11-07 12:19:57 +0100 |
|---|---|---|
| committer | jke-openerp <jke@openerp.com> | 2013-11-07 12:19:57 +0100 |
| commit | e6baeb0ff1ef3e9b36acc2657b1b3eb6ad3bf53b (patch) | |
| tree | 78a08910d81eec48e482550c15f14c3784aef462 /addons/web_calendar/static/src/css | |
| parent | 031d097e72b263c6610e7430aa88f1fe3791e380 (diff) | |
[IMP] Replace from web_calendar dx Calendar by jQ fullCalendar. Add lib for touchscreen (to test) in web
bzr revid: jke@openerp.com-20131107111957-139ny2sz899xx3tl
Diffstat (limited to 'addons/web_calendar/static/src/css')
4 files changed, 66 insertions, 61 deletions
diff --git a/addons/web_calendar/static/src/css/web_calendar.css b/addons/web_calendar/static/src/css/web_calendar.css deleted file mode 100644 index 214c777dbdc..00000000000 --- a/addons/web_calendar/static/src/css/web_calendar.css +++ /dev/null @@ -1,26 +0,0 @@ -@charset "utf-8"; -.openerp .oe_view_manager_view_calendar { - position: relative; -} - -.openerp .oe_calendar_sidebar { - width: 200px; - padding: 5px; -} -.openerp .oe_calendar { - background-color: white; - min-height: 600px; - border-right: 1px solid #eeeeee; -} -.openerp .oe_calendar .oe_calendar_filter { - padding: 0 10px; -} -.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_header { - z-index: auto; -} -.openerp .oe_calendar.oe_cal_month .dhx_cal_data table tr td:last-child div.dhx_month_body { - padding-right: 5px; -} diff --git a/addons/web_calendar/static/src/css/web_calendar.sass b/addons/web_calendar/static/src/css/web_calendar.sass deleted file mode 100644 index e4986981609..00000000000 --- a/addons/web_calendar/static/src/css/web_calendar.sass +++ /dev/null @@ -1,35 +0,0 @@ -@charset "utf-8" - -.openerp - .oe_view_manager_view_calendar - position: relative - -.openerp - .oe_calendar_sidebar - width: 200px - padding: 5px - - .oe_calendar - background-color: white - min-height: 600px - border-right: 1px solid #eee - - .oe_calendar_filter - padding: 0 10px - - // Dhtmlx Scheduler css overrides - .dhx_cal_select_menu .dhx_menu_icon.icon_edit - display: none - .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. - z-index: auto - - &.oe_cal_month .dhx_cal_data - - table tr td:last-child div.dhx_month_body - padding-right: 5px - -// au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css" -// vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker: diff --git a/addons/web_calendar/static/src/css/web_fullcalendar.css b/addons/web_calendar/static/src/css/web_fullcalendar.css new file mode 100644 index 00000000000..e2df45765d2 --- /dev/null +++ b/addons/web_calendar/static/src/css/web_fullcalendar.css @@ -0,0 +1,30 @@ +@charset "utf-8"; +.openerp .oe_view_manager_view_calendar { + position: relative; +} + +.openerp .oe_fullcalendar_widget .fc-content .fc-event .close-btn { + color: white; + position: absolute; + top: 1px; + right: 1px; + display: inline-block; + line-height: 6px; + height: 8px; + width: 8px; + border: 1px solid white; + border-radius: 3px; + text-align: center; + padding: 1px; + background-color: #b40000; + box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.5); + visibility: hidden; +} +.openerp .oe_fullcalendar_widget .fc-content .fc-event:hover .close-btn { + visibility: visible; + opacity: 0.5; +} +.openerp .oe_fullcalendar_widget .fc-content .fc-event:hover .close-btn:hover { + visibility: visible; + opacity: 1; +} diff --git a/addons/web_calendar/static/src/css/web_fullcalendar.sass b/addons/web_calendar/static/src/css/web_fullcalendar.sass new file mode 100644 index 00000000000..d1565c4860b --- /dev/null +++ b/addons/web_calendar/static/src/css/web_fullcalendar.sass @@ -0,0 +1,36 @@ +@charset "utf-8" + +.openerp + .oe_view_manager_view_calendar + position: relative + +.openerp + .oe_fullcalendar_widget + .fc-content + .fc-event + .close-btn + color: white + position: absolute + top: 1px + right: 1px + display: inline-block + line-height: 6px + height: 8px + width: 8px + border: 1px solid white + border-radius: 3px + text-align: center + padding: 1px + background-color: rgba(180, 0, 0, 1) + box-shadow: 0px 0px 2px rgba(0, 0, 0, .5) + visibility: hidden + z-index: 100 + .fc-event:hover + .close-btn + visibility: visible + opacity: 0.5 + .fc-event:hover + .close-btn:hover + visibility: visible + opacity: 1.0 + |
