From 754237c57b7556d732c508a0e709e4907ac6f472 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Tue, 16 Jun 2015 23:40:54 -0700 Subject: [PATCH] Remove scrollbar from calendar --- src/UI/Calendar/CalendarView.js | 6 +++++- src/UI/Content/Overrides/fullcalendar.less | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/UI/Calendar/CalendarView.js b/src/UI/Calendar/CalendarView.js index f10eb74ee..e3c019a3b 100644 --- a/src/UI/Calendar/CalendarView.js +++ b/src/UI/Calendar/CalendarView.js @@ -36,12 +36,13 @@ module.exports = Marionette.ItemView.extend({ } }, - _viewRender : function(view) { + _viewRender : function(view, element) { if (Config.getValue(this.storageKey) !== view.name) { Config.setValue(this.storageKey, view.name); } this._getEvents(view); + element.find('.fc-day-grid-container').css('height', ''); }, _eventAfterAllRender : function () { @@ -55,6 +56,9 @@ module.exports = Marionette.ItemView.extend({ this.$('.fc-toolbar').before(titleDiv); this.$('.fc-center').hide(); } + + // Remove height from calendar so we don't have another scroll bar + this.$('.fc-day-grid-container').css('height', ''); }, _eventRender : function(event, element) { diff --git a/src/UI/Content/Overrides/fullcalendar.less b/src/UI/Content/Overrides/fullcalendar.less index 269181bd8..0ae2a1636 100644 --- a/src/UI/Content/Overrides/fullcalendar.less +++ b/src/UI/Content/Overrides/fullcalendar.less @@ -14,6 +14,10 @@ overflow: hidden; } +.fc-scroller { + overflow-y: visible; +} + @media (max-width: @screen-xs-max) { .fc-button { padding: 0px 5px;