diff options
Diffstat (limited to 'apps/calendar')
-rw-r--r-- | apps/calendar/css/style.css | 6 | ||||
-rw-r--r-- | apps/calendar/lib/object.php | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/calendar/css/style.css b/apps/calendar/css/style.css index 06892e896b1..5d08402422a 100644 --- a/apps/calendar/css/style.css +++ b/apps/calendar/css/style.css @@ -49,14 +49,14 @@ .controls {min-width: 800px;} .center {text-align: center;} .dateinfo {height: 20px;width: 100%; overflow: hidden; margin-top: 0; padding: 0; font-size: 12px;background: #F7F7F7;} -.events {width: 100%; margin: 0; padding: 0;} +.events {width: 100%; margin: 0; padding: 0;min-height: 100px;} .calendar_row {height: 20px; text-align: center;background: #ffffff;} #oneweekview .calendar_row {width: 13.5%;} .calendar_time {height: 20px; width: 50px; text-align:right;background: #ffffff;} .day {text-align: center; background: #ffffff; margin: 0; padding: 0; vertical-align: top; width: 14%; height: 22%;} -.weekend .events{text-align: center;margin: 0; padding: 0;vertical-align: top;background: #F3F3F3; width: 100%; } +.weekend {background: #F3F3F3; } .weekend_thead, .weekend_row{height: 20px;text-align: center;text-align: center;background: #F3F3F3;} -.thisday{background: #FFFABC;text-align: center;margin: 0;padding: 0;vertical-align: top;height: 20px;} +.thisday{background: #FFFABC;} .event {position:relative;} .popup {display: none; position: absolute; z-index: 1000; background: #eeeeee; color: #000000; border: 1px solid #1a1a1a; font-size: 90%;} .event_popup {width: 280px; height: 40px; padding: 10px;} diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php index 52fa391f1f8..702033c169c 100644 --- a/apps/calendar/lib/object.php +++ b/apps/calendar/lib/object.php @@ -21,7 +21,7 @@ */ /** - * This class manages our calendars + * This class manages our calendar objects */ class OC_Calendar_Object{ /** |