Merge branch 'dev' into sabre32

This commit is contained in:
Mario Vavti 2016-06-28 13:45:00 +02:00
commit feaad50b6c

View file

@ -34,7 +34,13 @@
$('#events-calendar').fullCalendar('option', 'height', 'auto'); $('#events-calendar').fullCalendar('option', 'height', 'auto');
} }
else { else {
$('#events-calendar').fullCalendar('option', 'height', ''); if($('main').hasClass('fullscreen')) {
$('#calendar').fullCalendar('option', 'height', $(window).height() - $('.section-title-wrapper').outerHeight(true) - 2); // -2 is for border width (.generic-content-wrapper top and bottom) of .generic-content-wrapper
}
else {
$('#calendar').fullCalendar('option', 'height', '');
}
} }
$('#title').text(view.title); $('#title').text(view.title);
} }