From 9a52dc7c0daa3a48421c89b078c0450ce867d320 Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Mon, 10 May 2010 19:19:06 +0200
Subject: [PATCH] Revert "Try centering the events a bit."

This reverts commit 6f74a78158f57ee7f1cbcbac5f8a31513f4695a0.

Conflicts:

	kronolith/themes/screen.css
---
 kronolith/js/kronolith.js   | 7 +++----
 kronolith/themes/screen.css | 6 +-----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/kronolith/js/kronolith.js b/kronolith/js/kronolith.js
index adb4d3a78..5fba95b60 100644
--- a/kronolith/js/kronolith.js
+++ b/kronolith/js/kronolith.js
@@ -1522,7 +1522,7 @@ KronolithCore = {
         case 'week':
             var storage = view + 'Sizes',
                 div = _createElement(event),
-                margin = view == 'day' ? 2.5 : 5,
+                margin = view == 'day' ? 5 : 10,
                 style = { backgroundColor: Kronolith.conf.calendars[calendar[0]][calendar[1]].bg,
                           color: Kronolith.conf.calendars[calendar[0]][calendar[1]].fg };
 
@@ -1560,8 +1560,7 @@ KronolithCore = {
 
             div.setStyle({
                 top: (Math.round(midnight.getElapsed(event.value.start) / 60000) * this[storage].height / 60 | 0) + 'px',
-                width: 100 - margin * 2 + '%',
-                left: margin + '%'
+                width: 100 - margin + '%'
             })
                 .insert(innerDiv.setStyle(style));
             if (draggerTop) {
@@ -1760,7 +1759,7 @@ KronolithCore = {
             width = 100 / columns;
             this.dayGroups[pos].each(function(ev) {
                 ev.columns = columns;
-                $(ev.nodeId).setStyle({ width: width - margin * 2 + '%', left: (width * (ev.column - 1)) + margin + '%' });
+                $(ev.nodeId).setStyle({ width: width - margin + '%', left: (width * (ev.column - 1)) + '%' });
             });
             this.dayEvents.push(event.value);
 
diff --git a/kronolith/themes/screen.css b/kronolith/themes/screen.css
index 85d7463c9..8d35f180d 100644
--- a/kronolith/themes/screen.css
+++ b/kronolith/themes/screen.css
@@ -1184,9 +1184,6 @@ table.kronolithView td.kronolithFirstCol {
 #kronolithViewMonth .kronolithMore {
     position: absolute;
 }
-#kronolithViewWeek .kronolithMore {
-    margin-left: 5%;
-}
 
 /* Main view agenda. */
 #kronolithViewAgenda td.kronolithFirstCol {
@@ -1395,8 +1392,7 @@ div.kronolithEvent {
     float: left;
 }
 #kronolithViewWeek .kronolithAllDay div.kronolithEvent {
-    margin-left: 5%;
-    margin-right: 5%;
+    margin-right: 10%;
 }
 div.kronolithEvent .kronolithDragger {
     position: absolute;
-- 
2.11.0