fix [unreleased] bug with event text overflow

This commit is contained in:
Adam Shaw
2013-03-18 01:47:33 -07:00
parent 8398608f30
commit 05a8a2317d
5 changed files with 88 additions and 5 deletions
+2
View File
@@ -303,12 +303,14 @@ function AgendaEventRenderer() {
" class='" + classes.join(' ') + "'" +
" style='position:absolute;z-index:8;top:" + seg.top + "px;left:" + seg.left + "px;" + skinCss + "'" +
">" +
"<div class='fc-event-inner'>" +
"<div class='fc-event-time'>" +
htmlEscape(formatDates(event.start, event.end, opt('timeFormat'))) +
"</div>" +
"<div class='fc-event-title'>" +
htmlEscape(event.title) +
"</div>" +
"</div>" +
"<div class='fc-event-bg'></div>";
if (seg.isEnd && isEventResizable(event)) {
html +=
+1 -2
View File
@@ -114,8 +114,7 @@
font-size: 10px;
}
.fc-event-vert .fc-event-time,
.fc-event-vert .fc-event-title {
.fc-event-vert .fc-event-inner {
position: relative;
z-index: 2;
}
+4 -2
View File
@@ -171,7 +171,8 @@ function DayEventRenderer() {
html +=
" class='" + classes.join(' ') + "'" +
" style='position:absolute;z-index:8;left:"+left+"px;" + skinCss + "'" +
">";
">" +
"<div class='fc-event-inner'>";
if (!event.allDay && seg.isStart) {
html +=
"<span class='fc-event-time'>" +
@@ -179,7 +180,8 @@ function DayEventRenderer() {
"</span>";
}
html +=
"<span class='fc-event-title'>" + htmlEscape(event.title) + "</span>";
"<span class='fc-event-title'>" + htmlEscape(event.title) + "</span>" +
"</div>";
if (seg.isEnd && isEventResizable(event)) {
html +=
"<div class='ui-resizable-handle ui-resizable-" + (rtl ? 'w' : 'e') + "'>" +
+5 -1
View File
@@ -140,7 +140,6 @@
------------------------------------------------------------------------*/
.fc-event {
overflow: hidden;
border: 1px solid #3a87ad; /* default BORDER color */
background-color: #3a87ad; /* default BACKGROUND color */
color: #fff; /* default TEXT color */
@@ -161,6 +160,11 @@ a.fc-event,
.fc-rtl .fc-event {
text-align: right;
}
.fc-event-inner {
width: 100%;
overflow: hidden;
}
.fc-event-time,
.fc-event-title {