From ce2d568cd4eeea3ed56e652542d6dace2fb0c6ce Mon Sep 17 00:00:00 2001
From: rlx <0x0073@0x2620.org>
Date: Tue, 11 Oct 2011 23:23:36 +0000
Subject: [PATCH] fix calendar css

---
 source/Ox.UI/js/Calendar/Ox.Calendar.js   | 4 ++--
 source/Ox.UI/themes/modern/css/modern.css | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/source/Ox.UI/js/Calendar/Ox.Calendar.js b/source/Ox.UI/js/Calendar/Ox.Calendar.js
index 8a61f1cf..50d0369d 100644
--- a/source/Ox.UI/js/Calendar/Ox.Calendar.js
+++ b/source/Ox.UI/js/Calendar/Ox.Calendar.js
@@ -587,7 +587,7 @@ Ox.Calendar = function(options, self) {
         event.rangeText = Ox.formatDateRange(event.start, event.end, true);
         event.durationText = Ox.formatDateRangeDuration(event.start, event.end, true);
         if (event.current) {
-            event.rangeText = event.rangeText.split(' - ').shift() + ' - now';
+            event.rangeText = event.rangeText.split(' - ').shift() + ' - today';
         }
         return event;
     }
@@ -700,7 +700,7 @@ Ox.Calendar = function(options, self) {
         });
         self.contentHeight = Math.max(
             self.lineEvents.length * 16,
-            self.options.height - 72 // 24 + 16 + 16 + 16
+            self.options.height // - 72 // 24 + 16 + 16 + 16
         );
         self.$content.css({height: self.contentHeight + 'px'});
     }
diff --git a/source/Ox.UI/themes/modern/css/modern.css b/source/Ox.UI/themes/modern/css/modern.css
index 6bcd4784..f5c776dd 100644
--- a/source/Ox.UI/themes/modern/css/modern.css
+++ b/source/Ox.UI/themes/modern/css/modern.css
@@ -1,3 +1,5 @@
+/* fixme: it wouldn't hurt if focus was blue */
+
 body.OxThemeModern {
     background: rgb(16, 16, 16);
 }