From e6639cd1f6908a3e880b39f1ba4f949648fc37ba Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Tue, 21 Nov 2017 22:02:24 +0000
Subject: [PATCH] Adjust table styling

---
 assets/less/components/talks-table.less    |  3 ---
 assets/less/main.less                      |  3 ++-
 source/_includes/talks-table-row.html.twig | 10 +++++-----
 source/_includes/talks-table.html.twig     |  2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)
 delete mode 100644 assets/less/components/talks-table.less

diff --git a/assets/less/components/talks-table.less b/assets/less/components/talks-table.less
deleted file mode 100644
index 79aae2e8..00000000
--- a/assets/less/components/talks-table.less
+++ /dev/null
@@ -1,3 +0,0 @@
-.talks-table tr:nth-child(odd) {
-    @apply .bg-grey-lighter;
-}
diff --git a/assets/less/main.less b/assets/less/main.less
index dc213a21..00e5b226 100644
--- a/assets/less/main.less
+++ b/assets/less/main.less
@@ -62,11 +62,12 @@ svg {
     fill: currentColor;
 }
 
+.table-collapse { border-collapse: collapse }
+
 @import "components/listing";
 @import "components/post";
 @import "components/talk/slides";
 @import "components/talk/video";
-@import "components/talks-table";
 @import "components/testimonial";
 
 @tailwind utilities;
diff --git a/source/_includes/talks-table-row.html.twig b/source/_includes/talks-table-row.html.twig
index ea5add5c..ffbc4746 100644
--- a/source/_includes/talks-table-row.html.twig
+++ b/source/_includes/talks-table-row.html.twig
@@ -1,5 +1,5 @@
-<tr>
-    <td class="p-2">
+<tr class="{{ loop.index is odd ? 'bg-grey-lightest' }}">
+    <td class="p-2 border-t">
         {{ row.event.date|date(row.event.fuzzy_date ? 'F Y' : 'j F Y') }}
 
         {% if row.event.time is defined %}
@@ -10,7 +10,7 @@
     </td>
 
     {% if not talk_page %}
-        <td class="p-2">
+        <td class="p-2 border-t">
             {% if row.talk.url is not empty %}
                 <a href="{{ row.talk.url }}">
                     {{ row.talk.title }}
@@ -29,7 +29,7 @@
         </td>
     {% endif %}
 
-    <td class="p-2">
+    <td class="p-2 border-t">
         {% if row.event.website is not empty %}
             <a href="{{ row.event.website }}">
                 {{ row.event.name }}
@@ -46,7 +46,7 @@
     </td>
 
     {% if not upcoming %}
-        <td class="p-2">
+        <td class="p-2 border-t">
             {% if row.event.feedback and row.event.date <= today %}
                 <a href="{{ row.event.feedback }}"
                    class="button"
diff --git a/source/_includes/talks-table.html.twig b/source/_includes/talks-table.html.twig
index a9b347f4..e4b2587b 100644
--- a/source/_includes/talks-table.html.twig
+++ b/source/_includes/talks-table.html.twig
@@ -1,5 +1,5 @@
 <div class="overflow-auto">
-    <table class="talks-table w-full border border-grey-light">
+    <table class="w-full table-collapse border border-grey-light">
         <thead>
             <tr>
                 <th class="w-1/4 p-2 text-left bg-white">Date</th>