downgrading full calendar (too much to do the necessary updates at the moment) but still an upgrade from 2.4.x

This commit is contained in:
Naomi 2013-08-09 15:52:22 -04:00
parent 27b079ace9
commit 333ee7453e
3 changed files with 1382 additions and 1987 deletions

View file

@ -1,7 +1,12 @@
/*! /*
* FullCalendar v1.6.2 Stylesheet * FullCalendar v1.5.4 Stylesheet
* Docs & License: http://arshaw.com/fullcalendar/ *
* (c) 2013 Adam Shaw * Copyright (c) 2011 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
*
*/ */
@ -74,8 +79,11 @@ html .fc,
margin-right: -1px; margin-right: -1px;
} }
.fc-header .fc-corner-right, /* non-theme */ .fc-header .fc-corner-right {
.fc-header .ui-corner-right { /* theme */ margin-right: 1px; /* back to normal */
}
.fc-header .ui-corner-right {
margin-right: 0; /* back to normal */ margin-right: 0; /* back to normal */
} }
@ -116,17 +124,17 @@ html .fc,
.fc-widget-header, /* <th>, usually */ .fc-widget-header, /* <th>, usually */
.fc-widget-content { /* <td>, usually */ .fc-widget-content { /* <td>, usually */
border: 1px solid #ddd; border: 1px solid #ccc;
} }
.fc-state-highlight { /* <td> today cell */ /* TODO: add .fc-today to <th> */ .fc-state-highlight { /* <td> today cell */ /* TODO: add .fc-today to <th> */
background: #fcf8e3; background: #ffc;
} }
.fc-cell-overlay { /* semi-transparent rectangle while dragging */ .fc-cell-overlay { /* semi-transparent rectangle while dragging */
background: #bce8f1; background: #9cf;
opacity: .3; opacity: .2;
filter: alpha(opacity=30); /* for IE */ filter: alpha(opacity=20); /* for IE */
} }
@ -137,54 +145,43 @@ html .fc,
.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 { /* non-theme */ .fc-state-default { /* non-theme */
border: 1px solid; border-style: solid;
border-width: 1px 0;
} }
.fc-state-default.fc-corner-left { /* non-theme */ .fc-button-inner {
border-top-left-radius: 4px; position: relative;
border-bottom-left-radius: 4px; float: left;
overflow: hidden;
} }
.fc-state-default.fc-corner-right { /* non-theme */ .fc-state-default .fc-button-inner { /* non-theme */
border-top-right-radius: 4px; border-style: solid;
border-bottom-right-radius: 4px; border-width: 0 1px;
} }
/* .fc-button-content {
Our default prev/next buttons use HTML entities like &lsaquo; &rsaquo; &laquo; &raquo; position: relative;
and we'll try to make them look good cross-browser. float: left;
*/ height: 1.9em;
line-height: 1.9em;
.fc-text-arrow { padding: 0 .6em;
margin: 0 .1em; white-space: nowrap;
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 .fc-icon-wrap { .fc-button-content .fc-icon-wrap {
position: relative; position: relative;
float: left; float: left;
top: 50%; top: 50%;
} }
.fc-button .ui-icon { .fc-button-content .ui-icon {
position: relative; position: relative;
float: left; float: left;
margin-top: -50%; margin-top: -50%;
@ -192,58 +189,68 @@ html .fc,
*top: -50%; *top: -50%;
} }
/* /* gloss effect */
button states
borrowed from twitter bootstrap (http://twitter.github.com/bootstrap/)
*/
.fc-state-default { .fc-state-default .fc-button-effect {
background-color: #f5f5f5; position: absolute;
background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); top: 50%;
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6)); left: 0;
background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); }
background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); .fc-state-default .fc-button-effect span {
background-repeat: repeat-x; position: absolute;
border-color: #e6e6e6 #e6e6e6 #bfbfbf; top: -100px;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); left: 0;
color: #333; width: 500px;
text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); height: 100px;
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); border-width: 100px 0 0 1px;
border-style: solid;
border-color: #fff;
background: #444;
opacity: .09;
filter: alpha(opacity=9);
}
/* button states (determines colors) */
.fc-state-default,
.fc-state-default .fc-button-inner {
border-style: solid;
border-color: #ccc #bbb #aaa;
background: #F3F3F3;
color: #000;
} }
.fc-state-hover, .fc-state-hover,
.fc-state-hover .fc-button-inner {
border-color: #999;
}
.fc-state-down, .fc-state-down,
.fc-state-down .fc-button-inner {
border-color: #555;
background: #777;
}
.fc-state-active, .fc-state-active,
.fc-state-disabled { .fc-state-active .fc-button-inner {
color: #333333; border-color: #555;
background-color: #e6e6e6; background: #777;
color: #fff;
} }
.fc-state-hover { .fc-state-disabled,
color: #333333; .fc-state-disabled .fc-button-inner {
text-decoration: none; color: #999;
background-position: 0 -15px; border-color: #ddd;
-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-down,
.fc-state-active {
background-color: #cccccc;
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); .fc-state-disabled .fc-button-effect {
box-shadow: none; display: none;
} }
@ -252,29 +259,37 @@ html .fc,
------------------------------------------------------------------------*/ ------------------------------------------------------------------------*/
.fc-event { .fc-event {
border: 1px solid #3a87ad; /* default BORDER color */ border-style: solid;
background-color: #3a87ad; /* default BACKGROUND color */ border-width: 0;
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: #36c; /* default BORDER color */
background-color: #36c; /* default BACKGROUND color */
color: #fff; /* 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;
} }
@ -283,7 +298,7 @@ a.fc-event,
padding: 0 1px; padding: 0 1px;
} }
.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;
@ -302,20 +317,6 @@ 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 {
@ -340,6 +341,66 @@ a.fc-event,
/* 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
------------------------------------------------------------*/ ------------------------------------------------------------*/
@ -376,15 +437,6 @@ 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;
@ -441,10 +493,6 @@ 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;
} }
@ -519,16 +567,12 @@ table.fc-border-separate {
border-width: 0 1px; border-width: 0 1px;
} }
.fc-event-vert.fc-event-start { .fc-event-vert .fc-event-head,
border-top-width: 1px; .fc-event-vert .fc-event-content {
border-top-left-radius: 3px; position: relative;
border-top-right-radius: 3px; z-index: 2;
} 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 {
@ -536,11 +580,6 @@ table.fc-border-separate {
font-size: 10px; font-size: 10px;
} }
.fc-event-vert .fc-event-inner {
position: relative;
z-index: 2;
}
.fc-event-vert .fc-event-bg { /* makes the event lighter w/ a semi-transparent overlay */ .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;
@ -549,8 +588,8 @@ table.fc-border-separate {
width: 100%; width: 100%;
height: 100%; height: 100%;
background: #fff; background: #fff;
opacity: .25; opacity: .3;
filter: alpha(opacity=25); filter: alpha(opacity=30);
} }
.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 */

View file

@ -444,28 +444,28 @@ function getCurrentShow(){
* is switching from week view to day view (and vice versa) * is switching from week view to day view (and vice versa)
* the icon may already be there from previous view * the icon may already be there from previous view
*/ */
$el.siblings().remove("span[class=small-icon now-playing]"); $el.siblings().remove("span.now-playing");
if (!$el.siblings().hasClass("small-icon now-playing")) { if (!$el.siblings().hasClass("small-icon now-playing")) {
if ($el.siblings().hasClass("small-icon recording")) { if ($el.siblings().hasClass("small-icon recording")) {
/* Without removing recording icon, the now playing /* Without removing recording icon, the now playing
* icon will overwrite it. * icon will overwrite it.
*/ */
$el.siblings().remove("span[class=small-icon recording]"); $el.siblings().remove("span.recording");
$el.before('<span class="small-icon now-playing"></span><span class="small-icon recording"></span>'); $el.before('<span class="small-icon now-playing"></span><span class="small-icon recording"></span>');
} else if ($el.siblings().hasClass("small-icon rebroadcast")) { } else if ($el.siblings().hasClass("small-icon rebroadcast")) {
/* Without removing rebroadcast icon, the now playing /* Without removing rebroadcast icon, the now playing
* icon will overwrite it. * icon will overwrite it.
*/ */
$el.siblings().remove("span[class=small-icon rebroadcast]"); $el.siblings().remove("span.rebroadcast");
$el.before('<span class="small-icon now-playing"></span><span class="small-icon rebroadcast"></span>'); $el.before('<span class="small-icon now-playing"></span><span class="small-icon rebroadcast"></span>');
} else { } else {
$el.before('<span class="small-icon now-playing"></span>'); $el.before('<span class="small-icon now-playing"></span>');
} }
} }
} else if (view_name === 'month') { } else if (view_name === 'month') {
if (!$("span[class*=fc-event-title]").siblings().hasClass("small-icon now-playing")) { if (!$("span[class*=fc-event-title]").siblings().hasClass("now-playing")) {
$("span[class*=fc-event-title]").after('<span class="small-icon now-playing"></span>'); $("span[class*=fc-event-title]").after('<span class="small-icon now-playing"></span>');
} }
} }
@ -475,7 +475,7 @@ function getCurrentShow(){
id = $(this).parents("div.fc-event").data("event").id; id = $(this).parents("div.fc-event").data("event").id;
if (id != json.si_id) { if (id != json.si_id) {
$(this).remove("span[small-icon now-playing]"); $(this).remove("span.now-playing");
} }
}); });

File diff suppressed because it is too large Load diff