Changeset 5868

Timestamp:

04/03/12 14:17:49 (12 years ago)

Author:

thiago

Message:

Ticket #2582 - Merge desfeito, estava ocorrendo problemas no calender...

Location:

trunk

Files:

• expressoMail1_2/index.php (modified) (1 diff)
• prototype/plugins/fullcalendar/fullcalendar.css (modified) (1 diff)

trunk/expressoMail1_2/index.php

@@ -28 +28 @@
         echo '                          
                 <link rel="stylesheet" type="text/css" href="../prototype/plugins/fullcalendar/fullcalendar.css"></link>
+                <link rel="stylesheet" type="text/css" href="../prototype/plugins/fullcalendar/fullcalendar.print.css"></link> 
                 <link rel="stylesheet" type="text/css" href="../prototype/plugins/icalendar/jquery.icalendar.css"></link>
         

trunk/prototype/plugins/fullcalendar/fullcalendar.css

@@ -648 +648 @@
         filter:alpha(opacity=0); /* For IE8 and earlier */
 }
-
-
-/*fullcanlendar.print.css => fixed bug on IE8*/
-
-
-/*
- * FullCalendar v1.5.3 Print Stylesheet
- *
- * Include this stylesheet on your page to get a more printer-friendly calendar.
- * When including this stylesheet, use the media='print' attribute of the <link> tag.
- * Make sure to include this stylesheet IN ADDITION to the regular fullcalendar.css.
- *
- * Copyright (c) 2011 Adam Shaw
- * Dual licensed under the MIT and GPL licenses, located in
- * MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
- *
- * Date: Mon Feb 6 22:40:40 2012 -0800
- *
- */
- 
- 
- /* Events
------------------------------------------------------*/
- 
-.fc-event-skin {
-        background: none !important;
-        color: #000 !important;
-        }
-        
-/* horizontal events */
-        
-.fc-event-hori {
-        border-width: 0 0 1px 0 !important;
-        border-bottom-style: dotted !important;
-        border-bottom-color: #000 !important;
-        padding: 1px 0 0 0 !important;
-        }
-        
-.fc-event-hori .fc-event-inner {
-        border-width: 0 !important;
-        padding: 0 1px !important;
-        }
-        
-/* vertical events */
-        
-.fc-event-vert {
-        border-width: 0 0 0 1px !important;
-        border-left-style: dotted !important;
-        border-left-color: #000 !important;
-        padding: 0 1px 0 0 !important;
-        }
-        
-.fc-event-vert .fc-event-inner {
-        border-width: 0 !important;
-        padding: 1px 0 !important;
-        }
-        
-.fc-event-bg {
-        display: none !important;
-        }
-        
-.fc-event .ui-resizable-handle {
-        display: none !important;
-        }
-        
-