Branch 'roundcubemail-plugins-kolab-format2-horde5' - 2 commits - plugins/calendar

[Thomas Brüderli]

 plugins/calendar/skins/classic/iehacks.css |    6 +++---
 plugins/calendar/skins/larry/calendar.css  |   22 ++++++----------------
 plugins/calendar/skins/larry/iehacks.css   |    8 ++++----
 3 files changed, 13 insertions(+), 23 deletions(-)

New commits:
commit 5781cb13ad21f675adf3961473c2423cfda9f52f
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Feb 28 15:26:56 2013 +0100

    Fix overflowing calendar widget in French localization (#1665)

diff --git a/plugins/calendar/skins/larry/calendar.css b/plugins/calendar/skins/larry/calendar.css
index 0f71aad..39d472e 100644
--- a/plugins/calendar/skins/larry/calendar.css
+++ b/plugins/calendar/skins/larry/calendar.css
@@ -922,31 +922,21 @@ a.dropdown-link:after {
 .ui-dialog-buttonset a.dropdown-link {
 	margin-right: 1em;
 }
-/*
-.ui-datepicker-calendar .ui-datepicker-today .ui-state-default {
-	border-color: #cccccc;
-	background: #ffffcc;
-	color: #000;
+
+#calendarsidebar .ui-datepicker-calendar {
+	table-layout: fixed;
 }
-*/
+
 .ui-datepicker-calendar .ui-datepicker-week-col {
 	border: 0;
 	color: #999;
 	font-size: 90%;
 	text-align: right;
 	padding-right: 6px;
-}
-/*
-.ui-datepicker th {
-    padding: 0.3em 0;
-    font-size: 10px;
+	width: 20px;
+	overflow: hidden;
 }
 
-.ui-datepicker td span,
-.ui-datepicker td a {
-	padding-left: 0.1em;
-}
-*/
 .ui-autocomplete {
 	max-height: 160px;
 	overflow-y: auto;


commit 2d2a8536852a3f6ac45e98e81ab7f6d9dc6fc2f2
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Feb 28 15:25:47 2013 +0100

    Fix javascript errors trown by CSS expressions

diff --git a/plugins/calendar/skins/classic/iehacks.css b/plugins/calendar/skins/classic/iehacks.css
index 2b6d6be..42bd736 100644
--- a/plugins/calendar/skins/classic/iehacks.css
+++ b/plugins/calendar/skins/classic/iehacks.css
@@ -5,13 +5,13 @@
 	height: expression(Math.max(300, parseInt(document.documentElement.clientHeight)-100)+'px');
 }
 
-#sidebar,
-#sidebartoggle {
+#calendarsidebar,
+#calendarsidebartoggle {
 	height: expression((parseInt(this.parentNode.offsetHeight)-37)+'px');
 }
 
 #calendar {
-	width: expression((parseInt(this.parentNode.offsetWidth)-parseInt(document.getElementById('sidebartoggle').offsetWidth)-parseInt(document.getElementById('sidebartoggle').offsetLeft)-4)+'px');
+	width: expression((parseInt(this.parentNode.offsetWidth)-parseInt(document.getElementById('calendarsidebartoggle').offsetWidth)-parseInt(document.getElementById('calendarsidebartoggle').offsetLeft)-4)+'px');
 	height: expression(parseInt(this.parentNode.offsetHeight)+'px');
 }
 
diff --git a/plugins/calendar/skins/larry/iehacks.css b/plugins/calendar/skins/larry/iehacks.css
index 529b029..d6e122d 100644
--- a/plugins/calendar/skins/larry/iehacks.css
+++ b/plugins/calendar/skins/larry/iehacks.css
@@ -1,17 +1,17 @@
 /* CSS hacks for IE 7 */
 
-#sidebar,
-#sidebartoggle {
+#calendarsidebar,
+#calendarsidebartoggle {
 	height: expression((parseInt(this.parentNode.offsetHeight)-37)+'px');
 }
 
 #calendar {
-	width: expression((parseInt(this.parentNode.offsetWidth)-parseInt(document.getElementById('sidebartoggle').offsetWidth)-parseInt(document.getElementById('sidebartoggle').offsetLeft)-4)+'px');
+	width: expression((parseInt(this.parentNode.offsetWidth)-parseInt(document.getElementById('calendarsidebartoggle').offsetWidth)-parseInt(document.getElementById('calendarsidebartoggle').offsetLeft)-4)+'px');
 	height: expression((parseInt(this.parentNode.offsetHeight)-30)+'px');
 }
 
 #calendars {
-	height: expression((parseInt(this.parentNode.offsetHeight)-280)+'px');
+	height: expression((parseInt(this.parentNode.offsetHeight)-240)+'px');
 }
 
 #agendaoptions {