Branch 'roundcubemail-plugins-kolab-0.8' - plugins/calendar

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Mon Aug 6 17:05:10 CEST 2012


 plugins/calendar/skins/larry/calendar.css            |   23 ++++++++++---------
 plugins/calendar/skins/larry/templates/calendar.html |   20 ++++++++--------
 2 files changed, 23 insertions(+), 20 deletions(-)

New commits:
commit 90ffdc8c956ed34b1878972491b208fc9256a552
Author: Thomas Bruederli <thomas at roundcube.net>
Date:   Fri Jul 6 16:40:20 2012 +0200

    Adapt skin to recent changes in master layout

diff --git a/plugins/calendar/skins/larry/calendar.css b/plugins/calendar/skins/larry/calendar.css
index 488f37c..4ce9d81 100644
--- a/plugins/calendar/skins/larry/calendar.css
+++ b/plugins/calendar/skins/larry/calendar.css
@@ -29,7 +29,9 @@ body.calendarmain #mainscreen {
 }
 
 #datepicker {
-	margin-top: 12px;
+	position: absolute;
+	top: 40px;
+	left: 0;
 	width: 100%;
 	min-height: 190px;
 }
@@ -89,7 +91,7 @@ body.calendarmain #mainscreen {
 	position: absolute;
 	left: 254px;
 	width: 8px;
-	top: 37px;
+	top: 40px;
 	bottom: 0;
 	background: url(images/toggle.gif) 0 48% no-repeat transparent;
 	cursor: pointer;
@@ -241,17 +243,18 @@ pre {
 #calendartoolbar {
 	position: absolute;
 	top: -6px;
-	right: 0;
+	left: 0;
 	height: 40px;
-	z-index: 200;
 }
 
 #calendartoolbar a {
 	padding-right: 10px;
 }
 
-#quicksearchbar {
-	right: 4px;
+body.calendarmain #quicksearchbar {
+	top: -7px;
+	right: 2px;
+	z-index: 200;
 }
 
 body.calendarmain #searchmenulink {
@@ -832,7 +835,6 @@ span.edit-alarm-set {
 }
 
 a.dropdown-link {
-	color: #CC0000;
 	font-size: 12px;
 	text-decoration: none;
 }
@@ -866,7 +868,6 @@ a.dropdown-link:after {
 }
 
 .alarm-item div.alarm-actions a {
-	color: #CC0000;
 	margin-right: 0.8em;
 	text-decoration: none;
 }
@@ -981,7 +982,7 @@ span.spacer {
 
 .fc-content {
 	position: absolute !important;
-	top: 38px;
+	top: 40px;
 	left: 0;
 	right: 0;
 	bottom: 28px;
@@ -1172,7 +1173,9 @@ div.fc-event-location {
 	background: -ms-linear-gradient(left, #e3f2f6 0, #d6eaf3 14px ,#d6eaf3 100%);
 	background: linear-gradient(left, #e3f2f6 0, #d6eaf3 14px, #d6eaf3 100%);
 	border: 0;
-	padding: 7px;
+	border-bottom: 1px solid #ccc;
+	height: 18px;
+	padding: 8px 7px 3px 7px;
 }
 
 .calendarmain .fc-view-table tr.fc-event td {
diff --git a/plugins/calendar/skins/larry/templates/calendar.html b/plugins/calendar/skins/larry/templates/calendar.html
index c072e35..ecc6e5f 100644
--- a/plugins/calendar/skins/larry/templates/calendar.html
+++ b/plugins/calendar/skins/larry/templates/calendar.html
@@ -11,10 +11,11 @@
 
 <div id="mainscreen">
 	<div id="calendarsidebar">
-		<div id="quicksearchbar">
-			<roundcube:object name="plugin.searchform" id="quicksearchbox" />
-			<a id="searchmenulink" class="iconbutton searchoptions" > </a>
-			<roundcube:button command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" content=" " />
+		<div id="calendartoolbar" class="toolbar">
+			<roundcube:button command="addevent" type="link" class="button addevent disabled" classAct="button addevent" classSel="button addevent pressed" label="calendar.new_event" title="calendar.new_event" />
+			<roundcube:button command="print" type="link" class="button print disabled" classAct="button print" classSel="button print pressed" label="calendar.print" title="calendar.printtitle" />
+			<roundcube:button command="export" type="link" class="button export disabled" classAct="button export" classSel="button export pressed" label="calendar.export" title="calendar.exporttitle" />
+			<roundcube:container name="toolbar" id="calendartoolbar" />
 		</div>
 
 		<div id="datepicker" class="uibox"></div>
@@ -30,12 +31,11 @@
 		</div>
 	</div>
 	<div id="calendarsidebartoggle"></div>
-	
-	<div id="calendartoolbar" class="toolbar">
-		<roundcube:button command="addevent" type="link" class="button addevent disabled" classAct="button addevent" classSel="button addevent pressed" label="calendar.new_event" title="calendar.new_event" />
-		<roundcube:button command="print" type="link" class="button print disabled" classAct="button print" classSel="button print pressed" label="calendar.print" title="calendar.printtitle" />
-		<roundcube:button command="export" type="link" class="button export disabled" classAct="button export" classSel="button export pressed" label="calendar.export" title="calendar.exporttitle" />
-		<roundcube:container name="toolbar" id="calendartoolbar" />
+
+	<div id="quicksearchbar">
+		<roundcube:object name="plugin.searchform" id="quicksearchbox" />
+		<a id="searchmenulink" class="iconbutton searchoptions" > </a>
+		<roundcube:button command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" content=" " />
 	</div>
 
 	<div id="calendar">





More information about the commits mailing list