sanj/oxjs
1
0
Fork 0
forked from 0x2620/oxjs
Code Pull requests Activity

fix calendar css

Browse source
This commit is contained in:
rlx 2011-10-11 23:23:36 +00:00
commit ce2d568cd4
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
source/Ox.UI/js/Calendar/Ox.Calendar.js
View file

@ -587,7 +587,7 @@ Ox.Calendar = function(options, self) {
event.rangeText = Ox.formatDateRange(event.start, event.end, true);
event.durationText = Ox.formatDateRangeDuration(event.start, event.end, true);
if (event.current) {
event.rangeText = event.rangeText.split(' - ').shift() + ' - now';
event.rangeText = event.rangeText.split(' - ').shift() + ' - today';
}
return event;
}
@ -700,7 +700,7 @@ Ox.Calendar = function(options, self) {
});
self.contentHeight = Math.max(
self.lineEvents.length * 16,
self.options.height - 72 // 24 + 16 + 16 + 16
self.options.height // - 72 // 24 + 16 + 16 + 16
);
self.$content.css({height: self.contentHeight + 'px'});
}