Upgraded Full Calendar, now things are left aligned

pull/6/head
Mark McDowall 12 years ago committed by markus101
parent 2e1d36a05e
commit 0df8157b01

@ -15,7 +15,7 @@ define(['app', 'Calendar/CalendarItemView'], function () {
this.calendar = new NzbDrone.Calendar.CalendarCollection(); this.calendar = new NzbDrone.Calendar.CalendarCollection();
}, },
onCompositeCollectionRendered: function () { onCompositeCollectionRendered: function () {
$(this.ui.calendar).fullCalendar({ $(this.ui.calendar).empty().fullCalendar({
allDayDefault : false, allDayDefault : false,
ignoreTimezone: false, ignoreTimezone: false,
weekMode : 'variable', weekMode : 'variable',

@ -1,14 +1,10 @@
/* /*!
* FullCalendar v1.5.4 Stylesheet * FullCalendar v1.6.1 Stylesheet
* * Docs & License: http://arshaw.com/fullcalendar/
* Copyright (c) 2011 Adam Shaw * (c) 2013 Adam Shaw
* Dual licensed under the MIT and GPL licenses, located in
* MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
*
* Date: Tue Sep 4 23:38:33 2012 -0700
*
*/ */
.fc { .fc {
direction: ltr; direction: ltr;
text-align: left; text-align: left;
@ -30,6 +26,8 @@ html .fc,
vertical-align: top; vertical-align: top;
} }
/* Header /* Header
------------------------------------------------------------------------*/ ------------------------------------------------------------------------*/
@ -76,11 +74,8 @@ html .fc,
margin-right: -1px; margin-right: -1px;
} }
.fc-header .fc-corner-right { .fc-header .fc-corner-right, /* non-theme */
margin-right: 1px; /* back to normal */ .fc-header .ui-corner-right { /* theme */
}
.fc-header .ui-corner-right {
margin-right: 0; /* back to normal */ margin-right: 0; /* back to normal */
} }
@ -100,6 +95,8 @@ html .fc,
z-index: 4; z-index: 4;
} }
/* Content /* Content
------------------------------------------------------------------------*/ ------------------------------------------------------------------------*/
@ -109,76 +106,85 @@ html .fc,
.fc-view { .fc-view {
width: 100%; /* needed for view switching (when view is absolute) */ width: 100%; /* needed for view switching (when view is absolute) */
/*overflow: hidden;*/ overflow: hidden;
} }
/* Cell Styles /* Cell Styles
------------------------------------------------------------------------*/ ------------------------------------------------------------------------*/
.fc-widget-header, /* <th>, usually */ .fc-widget-header, /* <th>, usually */
.fc-widget-content { .fc-widget-content { /* <td>, usually */
/* <td>, usually */ border: 1px solid #ddd;
border: 1px solid #cccccc;
} }
.fc-state-highlight { .fc-state-highlight { /* <td> today cell */ /* TODO: add .fc-today to <th> */
/* <td> today cell */ background: #fcf8e3;
/* TODO: add .fc-today to <th> */
background: #ffffcc;
} }
.fc-cell-overlay { .fc-cell-overlay { /* semi-transparent rectangle while dragging */
/* semi-transparent rectangle while dragging */ background: #bce8f1;
background: #99ccff; opacity: .3;
opacity: .2; filter: alpha(opacity=30); /* for IE */
filter: alpha(opacity=20); /* for IE */
} }
/* Buttons /* Buttons
------------------------------------------------------------------------*/ ------------------------------------------------------------------------*/
.fc-button { .fc-button {
position: relative; position: relative;
display: inline-block; display: inline-block;
padding: 0 .6em;
overflow: hidden;
height: 1.9em;
line-height: 1.9em;
white-space: nowrap;
cursor: pointer; cursor: pointer;
} }
.fc-state-default { .fc-state-default { /* non-theme */
/* non-theme */ border: 1px solid;
border-style: solid;
border-width: 1px 0;
} }
.fc-button-inner { .fc-state-default.fc-corner-left { /* non-theme */
position: relative; border-top-left-radius: 4px;
float: left; border-bottom-left-radius: 4px;
overflow: hidden;
} }
.fc-state-default .fc-button-inner { .fc-state-default.fc-corner-right { /* non-theme */
/* non-theme */ border-top-right-radius: 4px;
border-style: solid; border-bottom-right-radius: 4px;
border-width: 0 1px;
} }
.fc-button-content { /*
position: relative; Our default prev/next buttons use HTML entities like &lsaquo; &rsaquo; &laquo; &raquo;
float: left; and we'll try to make them look good cross-browser.
height: 1.9em; */
line-height: 1.9em;
padding: 0 .6em; .fc-text-arrow {
white-space: nowrap; margin: 0 .1em;
font-size: 2em;
font-family: "Courier New", Courier, monospace;
vertical-align: baseline; /* for IE7 */
}
.fc-button-prev .fc-text-arrow,
.fc-button-next .fc-text-arrow { /* for &lsaquo; &rsaquo; */
font-weight: bold;
} }
/* icon (for jquery ui) */ /* icon (for jquery ui) */
.fc-button-content .fc-icon-wrap { .fc-button .fc-icon-wrap {
position: relative; position: relative;
float: left; float: left;
top: 50%; top: 50%;
} }
.fc-button-content .ui-icon { .fc-button .ui-icon {
position: relative; position: relative;
float: left; float: left;
margin-top: -50%; margin-top: -50%;
@ -186,105 +192,89 @@ html .fc,
*top: -50%; *top: -50%;
} }
/* gloss effect */ /*
button states
.fc-state-default .fc-button-effect { borrowed from twitter bootstrap (http://twitter.github.com/bootstrap/)
position: absolute; */
top: 50%;
left: 0;
}
.fc-state-default .fc-button-effect span {
position: absolute;
top: -100px;
left: 0;
width: 500px;
height: 100px;
border-width: 100px 0 0 1px;
border-style: solid;
border-color: #ffffff;
background: #444444;
opacity: .09;
filter: alpha(opacity=9);
}
/* button states (determines colors) */
.fc-state-default, .fc-state-default {
.fc-state-default .fc-button-inner { background-color: #f5f5f5;
border-style: solid; background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
border-color: #cccccc #bbbbbb #aaaaaa; background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
background: #f3f3f3; background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
color: #000000; background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
background-repeat: repeat-x;
border-color: #e6e6e6 #e6e6e6 #bfbfbf;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
color: #333;
text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
} }
.fc-state-hover, .fc-state-hover,
.fc-state-hover .fc-button-inner {
border-color: #999999;
}
.fc-state-down, .fc-state-down,
.fc-state-down .fc-button-inner { .fc-state-active,
border-color: #555555; .fc-state-disabled {
background: #777777; color: #333333;
background-color: #e6e6e6;
} }
.fc-state-active, .fc-state-hover {
.fc-state-active .fc-button-inner { color: #333333;
border-color: #555555; text-decoration: none;
background: #777777; background-position: 0 -15px;
color: #ffffff; -webkit-transition: background-position 0.1s linear;
-moz-transition: background-position 0.1s linear;
-o-transition: background-position 0.1s linear;
transition: background-position 0.1s linear;
} }
.fc-state-disabled, .fc-state-down,
.fc-state-disabled .fc-button-inner { .fc-state-active {
color: #999999; background-color: #cccccc;
border-color: #dddddd; background-image: none;
outline: 0;
box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
} }
.fc-state-disabled { .fc-state-disabled {
cursor: default; cursor: default;
background-image: none;
opacity: 0.65;
filter: alpha(opacity=65);
box-shadow: none;
} }
.fc-state-disabled .fc-button-effect {
display: none;
}
/* Global Event Styles /* Global Event Styles
------------------------------------------------------------------------*/ ------------------------------------------------------------------------*/
.fc-event { .fc-event {
border-style: solid; border: 1px solid #3a87ad; /* default BORDER color */
border-width: 0; background-color: #3a87ad; /* default BACKGROUND color */
color: #fff; /* default TEXT color */
font-size: .85em; font-size: .85em;
cursor: default; cursor: default;
} }
a.fc-event {
text-decoration: none;
}
a.fc-event, a.fc-event,
.fc-event-draggable { .fc-event-draggable {
cursor: pointer; cursor: pointer;
} }
a.fc-event {
text-decoration: none;
}
.fc-rtl .fc-event { .fc-rtl .fc-event {
text-align: right; text-align: right;
} }
.fc-event-skin {
border-color: #3366cc; /* default BORDER color */
background-color: #3366cc; /* default BACKGROUND color */
color: #ffffff; /* default TEXT color */
}
.fc-event-inner { .fc-event-inner {
position: relative;
width: 100%; width: 100%;
height: 100%; height: 100%;
border-style: solid;
border-width: 0;
overflow: hidden; overflow: hidden;
} }
@ -294,7 +284,6 @@ a.fc-event {
} }
.fc .ui-resizable-handle { .fc .ui-resizable-handle {
/*** TODO: don't use ui-resizable anymore, change class ***/
display: block; display: block;
position: absolute; position: absolute;
z-index: 99999; z-index: 99999;
@ -303,6 +292,8 @@ a.fc-event {
line-height: 50%; /* */ line-height: 50%; /* */
} }
/* Horizontal Events /* Horizontal Events
------------------------------------------------------------------------*/ ------------------------------------------------------------------------*/
@ -311,6 +302,20 @@ a.fc-event {
margin-bottom: 1px; margin-bottom: 1px;
} }
.fc-ltr .fc-event-hori.fc-event-start,
.fc-rtl .fc-event-hori.fc-event-end {
border-left-width: 1px;
border-top-left-radius: 3px;
border-bottom-left-radius: 3px;
}
.fc-ltr .fc-event-hori.fc-event-end,
.fc-rtl .fc-event-hori.fc-event-start {
border-right-width: 1px;
border-top-right-radius: 3px;
border-bottom-right-radius: 3px;
}
/* resizable */ /* resizable */
.fc-event-hori .ui-resizable-e { .fc-event-hori .ui-resizable-e {
@ -333,61 +338,7 @@ a.fc-event {
_padding-bottom: 14px; /* IE6 had 0 height */ _padding-bottom: 14px; /* IE6 had 0 height */
} }
/* Fake Rounded Corners (for buttons and events)
------------------------------------------------------------*/
.fc-corner-left {
margin-left: 1px;
}
.fc-corner-left .fc-button-inner,
.fc-corner-left .fc-event-inner {
margin-left: -1px;
}
.fc-corner-right {
margin-right: 1px;
}
.fc-corner-right .fc-button-inner,
.fc-corner-right .fc-event-inner {
margin-right: -1px;
}
.fc-corner-top {
margin-top: 1px;
}
.fc-corner-top .fc-event-inner {
margin-top: -1px;
}
.fc-corner-bottom {
margin-bottom: 1px;
}
.fc-corner-bottom .fc-event-inner {
margin-bottom: -1px;
}
/* Fake Rounded Corners SPECIFICALLY FOR EVENTS
-----------------------------------------------------------------*/
.fc-corner-left .fc-event-inner {
border-left-width: 1px;
}
.fc-corner-right .fc-event-inner {
border-right-width: 1px;
}
.fc-corner-top .fc-event-inner {
border-top-width: 1px;
}
.fc-corner-bottom .fc-event-inner {
border-bottom-width: 1px;
}
/* Reusable Separate-border Table /* Reusable Separate-border Table
------------------------------------------------------------*/ ------------------------------------------------------------*/
@ -416,6 +367,8 @@ table.fc-border-separate {
border-top-width: 0; border-top-width: 0;
} }
/* Month View, Basic Week View, Basic Day View /* Month View, Basic Week View, Basic Day View
------------------------------------------------------------------------*/ ------------------------------------------------------------------------*/
@ -423,6 +376,15 @@ table.fc-border-separate {
text-align: center; text-align: center;
} }
.fc .fc-week-number {
width: 22px;
text-align: center;
}
.fc .fc-week-number div {
padding: 0 2px;
}
.fc-grid .fc-day-number { .fc-grid .fc-day-number {
float: right; float: right;
padding: 0 2px; padding: 0 2px;
@ -457,6 +419,8 @@ table.fc-border-separate {
float: right; float: right;
} }
/* Agenda Week View, Agenda Day View /* Agenda Week View, Agenda Day View
------------------------------------------------------------------------*/ ------------------------------------------------------------------------*/
@ -477,6 +441,10 @@ table.fc-border-separate {
font-weight: normal; font-weight: normal;
} }
.fc-agenda .fc-week-number {
font-weight: bold;
}
.fc-agenda .fc-day-content { .fc-agenda .fc-day-content {
padding: 2px 2px 1px; padding: 2px 2px 1px;
} }
@ -510,7 +478,7 @@ table.fc-border-separate {
} }
.fc-widget-header .fc-agenda-divider-inner { .fc-widget-header .fc-agenda-divider-inner {
background: #eeeeee; background: #eee;
} }
/* slot rows */ /* slot rows */
@ -542,6 +510,8 @@ table.fc-border-separate {
*border-top-style: solid; /* doesn't work with background in IE6/7 */ *border-top-style: solid; /* doesn't work with background in IE6/7 */
} }
/* Vertical Events /* Vertical Events
------------------------------------------------------------------------*/ ------------------------------------------------------------------------*/
@ -549,12 +519,16 @@ table.fc-border-separate {
border-width: 0 1px; border-width: 0 1px;
} }
.fc-event-vert .fc-event-head, .fc-event-vert.fc-event-start {
.fc-event-vert .fc-event-content { border-top-width: 1px;
position: relative; border-top-left-radius: 3px;
z-index: 2; border-top-right-radius: 3px;
width: 100%; }
overflow: hidden;
.fc-event-vert.fc-event-end {
border-bottom-width: 1px;
border-bottom-left-radius: 3px;
border-bottom-right-radius: 3px;
} }
.fc-event-vert .fc-event-time { .fc-event-vert .fc-event-time {
@ -562,17 +536,21 @@ table.fc-border-separate {
font-size: 10px; font-size: 10px;
} }
.fc-event-vert .fc-event-bg { .fc-event-vert .fc-event-inner {
/* makes the event lighter w/ a semi-transparent overlay */ position: relative;
z-index: 2;
}
.fc-event-vert .fc-event-bg { /* makes the event lighter w/ a semi-transparent overlay */
position: absolute; position: absolute;
z-index: 1; z-index: 1;
top: 0; top: 0;
left: 0; left: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
background: #ffffff; background: #fff;
opacity: .3; opacity: .25;
filter: alpha(opacity=30); filter: alpha(opacity=25);
} }
.fc .ui-draggable-dragging .fc-event-bg, /* TODO: something nicer like .fc-opacity */ .fc .ui-draggable-dragging .fc-event-bg, /* TODO: something nicer like .fc-opacity */
@ -594,7 +572,8 @@ table.fc-border-separate {
cursor: s-resize; cursor: s-resize;
} }
.fc-agenda .ui-resizable-resizing { .fc-agenda .ui-resizable-resizing { /* TODO: better selector */
/* TODO: better selector */
_overflow: hidden; _overflow: hidden;
} }

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save