From a29d3fe80394429fed85e124a67ff9bf1a6c7b64 Mon Sep 17 00:00:00 2001
From: Felix Albrigtsen <felix@albrigtsen.it>
Date: Sat, 17 Aug 2024 23:59:17 +0200
Subject: [PATCH] Err, try again

---
 www/css/landing.css | 28 ++++------------------------
 www/index.php       | 11 +++++++----
 2 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/www/css/landing.css b/www/css/landing.css
index 5e64a84..ed4312d 100644
--- a/www/css/landing.css
+++ b/www/css/landing.css
@@ -65,43 +65,23 @@ img.float-right {
     list-style: none;
 }
 
-.calendar-events ul li :not(.date):not(.time) {
-    display: inline-block;
-    width: calc(100% - 7em);
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
-.calendar-events ul .date {
-    color: rgba(0, 0, 0, 0.5);
-    font-size: 0.8em;
-    margin-top: 0.2em;
-}
-
-.calendar-events > li > p {
-    border-bottom: 0.1em dotted rgba(0, 0, 0, 0.2);
-}
-
 .calendar-events ul {
     list-style: none;
     padding: 0;
 }
 
 .calendar-events a {
-  color: rgba(0,0,0, 0.85);
+    color: rgba(0,0,0, 0.85);
 }
 
-.calendar-events ul .time {
+.calendar-events ul .datetime {
     color: rgba(0, 0, 0, 0.5);
     float: right;
     margin-left: 0.2em;
 }
 
-.calendar-events ul .icon,
-.calendar-events ul .date {
-    float: right;
-    margin-right: 0.5em;
+.calendar-events ul li {
+    margin-bottom: 0.4em;
 }
 
 main.contentsplit {
diff --git a/www/index.php b/www/index.php
index ea45fab..8bca744 100644
--- a/www/index.php
+++ b/www/index.php
@@ -77,17 +77,20 @@ $doorTime = date("H:i", $doorEntry->time);
 							<?php } else { ?>
 								<strong><?= $event->getName(); ?></strong>
 							<?php } ?>
+
+                            <span class="datetime">
                             <?php if ($period !== \pvv\side\Agenda::TODAY) {
-                                echo '<span class="time">' . $event->getStart()->format('H:i') . ' </span>';
+                                echo $event->getStart()->format('H:i') . " " ;
                                 if (\pvv\side\Agenda::isThisWeek($event->getStart()) || $event->getStart()->sub(new DateInterval('P3D'))->getTimestamp() < time()) {
-                                    echo '<span class="time">' . $event->getStart()->format('D') . '</span>';
+                                    echo $event->getStart()->format('D');
                                 } else {
-                                    echo '<span class="time">' . $event->getStart()->format('j. F') . '</span>';
+                                    echo $event->getStart()->format('j. F');
                                 }
                             } else {
-                                echo '<span class="time">' . $event->getStart()->format('H:i') . '</span>';
+                                echo $event->getStart()->format('H:i');
                             }
                             ?>
+                            </span>
 						</li>
 						<?php } ?>
 					</ul>