diff --git a/sites/all/modules/calendar/calendar_multiday/calendar-overlap.css b/sites/all/modules/calendar/calendar_multiday/calendar-overlap.css index 3f669df..93b6cd3 100644 --- a/sites/all/modules/calendar/calendar_multiday/calendar-overlap.css +++ b/sites/all/modules/calendar/calendar_multiday/calendar-overlap.css @@ -124,9 +124,9 @@ border-bottom : 0px; } -.calendar-calendar .week-view table.full { +.calendar-calendar .week-view table.full { /* table-layout : fixed; - width : 925px; + width : 925px; */ margin : 0px; } @@ -719,7 +719,7 @@ } .calendar-calendar .week-view div.single-day .i_0.md_0 .view-item .calendar { - width : 115px !important; + width : 100px !important; width : auto; } diff --git a/sites/all/modules/calendar/calendar_multiday/calendar_overlap.js b/sites/all/modules/calendar/calendar_multiday/calendar_overlap.js index 2f8c4c7..befe2c4 100644 --- a/sites/all/modules/calendar/calendar_multiday/calendar_overlap.js +++ b/sites/all/modules/calendar/calendar_multiday/calendar_overlap.js @@ -21,12 +21,7 @@ Drupal.behaviors.calendarSetScroll = function (context) { function performDrag(e) { var offset = e.pageY - start_y; var mwc = $('#multi-day-container'); - var sdc = $('#single-day-container'); - var mwc_height = mwc.height(); - var sdc_height = sdc.height(); - var max_height = mwc_height + sdc_height; - mwc.height(Math.min(max_height,Math.max(0,mwc_height + offset))); - sdc.height(Math.min(max_height,Math.max(0,sdc_height - offset))); + mwc.height(Math.max(0,mwc.height() + offset)); start_y = divider.offset().top; return false; } @@ -76,12 +71,12 @@ function calendar_scrollToFirst() { // Size the single day view function calendar_resizeViewport() { - // Size of the browser window var viewportHeight = window.innerHeight ? window.innerHeight : $(window).height(); var top = $('#single-day-container').offset().top; + $('#multi-day-container').height(75); // Give it a 20 pixel margin at the bottom - $('#single-day-container').height(viewportHeight - top - 20); + $('#single-day-container').height(Math.max(400,viewportHeight - top - 20)); } \ No newline at end of file