From faff3a2a8dc9fc1a9c43f4b36af572a7800ce49b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rn=20=C3=85ne?= <git@jornane.no>
Date: Sat, 7 Oct 2017 16:58:27 +0200
Subject: [PATCH] Better alignment of date/time for today

---
 www/css/splash.css | 1 -
 www/index.php      | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/www/css/splash.css b/www/css/splash.css
index d0bdd98..81c3f63 100644
--- a/www/css/splash.css
+++ b/www/css/splash.css
@@ -33,7 +33,6 @@ img.float-right {
 .calendar-events ul .time {
 	color: rgba(0,0,0,.5);
 	float: right;
-	width: 4em;
 }
 .calendar-events ul .icon, .calendar-events ul .date {
 	float: right;
diff --git a/www/index.php b/www/index.php
index 87b22a2..cb4a37c 100644
--- a/www/index.php
+++ b/www/index.php
@@ -54,14 +54,14 @@ include '../inc/ticker.php';
 <a href="<?= htmlspecialchars($event->getURL()) ?>"><?= $event->getName(); ?></a>
 <?php /* <a class="icon subscribe">+</a> */ ?>
 <?php if ($period !== \pvv\side\Agenda::TODAY) {
+	echo '<span class="time">' . $event->getStart()->format('H:i') . '</span>';
 	if (\pvv\side\Agenda::isThisWeek($event->getStart()) || $event->getStart()->sub(new DateInterval('P3D'))->getTimestamp() < time()) {
 		echo '<span class="date">' . strftime('%a', $event->getStart()->getTimestamp()) . '</span>';
 	} else {
 		echo '<span class="date">' . strftime('%e. %b', $event->getStart()->getTimestamp()) . '</span>';
 	}
-	echo '<span class="time">' . $event->getStart()->format('H:i') . '</span>';
 } else {
-	echo '<span class="date">' . $event->getStart()->format('H:i') . '</span>';
+	echo '<span class="time">' . $event->getStart()->format('H:i') . '</span>';
 }
 ?>
 </li>