From 149d05a83faa23fb1948e89f10fd5a141335d248 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 24 Oct 2012 18:05:25 +0200 Subject: [PATCH] [ADD] Saas file bzr revid: fme@openerp.com-20121024160525-rta4chbzjkj3a1sj --- addons/web_calendar/__openerp__.py | 4 +- .../static/src/css/web_calendar.css | 60 ++++++++++--------- .../static/src/css/web_calendar.sass | 40 +++++++++++++ 3 files changed, 74 insertions(+), 30 deletions(-) create mode 100644 addons/web_calendar/static/src/css/web_calendar.sass diff --git a/addons/web_calendar/__openerp__.py b/addons/web_calendar/__openerp__.py index 169cdb1317f..d4b348bd17f 100644 --- a/addons/web_calendar/__openerp__.py +++ b/addons/web_calendar/__openerp__.py @@ -15,8 +15,8 @@ OpenERP Web Calendar view. ], 'css': [ #'static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler.css', - 'static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler_dhx_terrace.css', - #'static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler_glossy.css', + #'static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler_dhx_terrace.css', + 'static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler_glossy.css', 'static/src/css/web_calendar.css' ], 'qweb' : [ diff --git a/addons/web_calendar/static/src/css/web_calendar.css b/addons/web_calendar/static/src/css/web_calendar.css index 9aeea8a9c8c..64d41500b71 100644 --- a/addons/web_calendar/static/src/css/web_calendar.css +++ b/addons/web_calendar/static/src/css/web_calendar.css @@ -1,31 +1,35 @@ -.oe_view_manager_view_calendar { - position: relative; -} -.oe_calendar_table { - position: absolute; - left: 0px; - right: 0px; - top: 0px; - border-top: 3px solid #eee; - width:100%; - overflow: hidden; -} -.oe_calendar { - background-color:#eee; - height: 600px; - border-right: 1px solid #eee; -} -.oe_calendar_sidebar { - width: 200px; -} -.oe_calendar_mini { - background-color: #eee; - padding: 5px; -} -.oe_calendar_filter { - padding: 0 10px; +@charset "utf-8"; +.openerp .oe_view_manager_view_calendar { + position: relative; } -.openerp .dhx_cal_select_menu { - display: none; +.openerp .oe_calendar_sidebar { + width: 200px; + padding: 5px; +} +.openerp .oe_calendar { + background-color: white; + height: 600px; + border-right: 1px solid #eeeeee; +} +.openerp .oe_calendar .oe_calendar_table { + position: absolute; + left: 0px; + right: 0px; + top: 0px; + border-top: 3px solid #eeeeee; + width: 100%; + overflow: hidden; +} +.openerp .oe_calendar .oe_calendar_filter { + padding: 0 10px; +} +.openerp .oe_calendar .dhx_cal_select_menu { + display: none; +} +.openerp .oe_calendar.oe_cal_month .dhx_cal_data { + overflow-y: hidden; +} +.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 new file mode 100644 index 00000000000..72a3a262e60 --- /dev/null +++ b/addons/web_calendar/static/src/css/web_calendar.sass @@ -0,0 +1,40 @@ +@charset "utf-8" + +.openerp + .oe_view_manager_view_calendar + position: relative + +.openerp + .oe_calendar_sidebar + width: 200px + padding: 5px + + .oe_calendar + background-color: white + height: 600px + border-right: 1px solid #eee + + .oe_calendar_table + position: absolute + left: 0px + right: 0px + top: 0px + border-top: 3px solid #eee + width: 100% + overflow: hidden + + .oe_calendar_filter + padding: 0 10px + + // Dhtmlx Scheduler css overrides + .dhx_cal_select_menu + display: none + + &.oe_cal_month .dhx_cal_data + overflow-y: hidden + + table tr td:last-child div.dhx_month_body + padding-right: 5px + +// au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers > "%:p:r.css" +// vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker: