From bbf2acc8e4ab9213113e7577231bc70988d9946f Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Mon, 10 Jul 2017 23:47:53 +0100
Subject: [PATCH] Fix talk table vertical alignment

---
 assets/sass/base/_layout.sass     | 11 +++++++++++
 assets/sass/talks-table.sass      | 12 ------------
 source/_partials/talks-table.twig |  8 ++++----
 source/_views/talk.twig           |  1 -
 source/talks.md                   |  4 ----
 5 files changed, 15 insertions(+), 21 deletions(-)
 delete mode 100644 assets/sass/talks-table.sass

diff --git a/assets/sass/base/_layout.sass b/assets/sass/base/_layout.sass
index c2141dc3..89413879 100644
--- a/assets/sass/base/_layout.sass
+++ b/assets/sass/base/_layout.sass
@@ -19,3 +19,14 @@
 @each $value in 'block', 'inline', 'inline-block'
     .display-#{$value}
         display: #{$value}
+
+@each $value in 'top', 'middle', 'bottom'
+    .table
+        & > thead > tr > th,
+        & > thead > tr > td,
+        & > tbody > tr > th,
+        & > tbody > tr > td,
+        & > tfoot > tr > th,
+        & > tfoot > tr > td
+            &.vertical-#{$value}
+                vertical-align: #{$value}
diff --git a/assets/sass/talks-table.sass b/assets/sass/talks-table.sass
deleted file mode 100644
index 3eaf1a7d..00000000
--- a/assets/sass/talks-table.sass
+++ /dev/null
@@ -1,12 +0,0 @@
-.talk-event-table
-    & > thead > tr > th,
-    & > tbody > tr > td
-        vertical-align: middle
-
-.talk-type,
-.event-location
-    display: block
-    margin-top: 1px
-
-.talk-full .column-event
-    width: auto
diff --git a/source/_partials/talks-table.twig b/source/_partials/talks-table.twig
index 01d619cb..582bab75 100644
--- a/source/_partials/talks-table.twig
+++ b/source/_partials/talks-table.twig
@@ -1,5 +1,5 @@
 <div class="table-responsive">
-    <table class="table table-striped">
+    <table class="table table-striped talks-table">
         <thead>
             <tr>
                 <th style="width: 20%">Date</th>
@@ -24,7 +24,7 @@
                     {% set talk = item %}
                 {% endfor %}
                 <tr>
-                    <td>
+                    <td class="vertical-middle">
                         {{ row.date.date|date(row.date.fuzzy_date ? 'F Y' : 'j F Y') }}
 
                         {% if row.date.time %}
@@ -46,7 +46,7 @@
                         </td>
                     {% endif %}
 
-                    <td>
+                    <td class="vertical-middle">
                         {% if row.event.website %}
                             <a href="{{ row.event.website }}">
                                 {{ row.event.name }}
@@ -61,7 +61,7 @@
                     </td>
 
                     {% if not upcoming %}
-                        <td>
+                        <td class="vertical-middle">
                             {% if row.date.feedback %}
                                 <a
                                     href="{{ row.date.feedback }}"
diff --git a/source/_views/talk.twig b/source/_views/talk.twig
index 5cb58a95..deb49d52 100644
--- a/source/_views/talk.twig
+++ b/source/_views/talk.twig
@@ -53,5 +53,4 @@
 
 {% block stylesheets %}
     <link rel="stylesheet" href="{{ site.url }}/assets/css/talk.css">
-    <link rel="stylesheet" href="{{ site.url }}/assets/css/talks-table.css">
 {% endblock %}
diff --git a/source/talks.md b/source/talks.md
index 59853426..6cc77b90 100644
--- a/source/talks.md
+++ b/source/talks.md
@@ -46,10 +46,6 @@ There is also information about events that I’ve attended and spoken at on my
 You can view more talks in the [talks archive][3].
 {% endblock %}
 
-{% block stylesheets %}
-<link rel="stylesheet" href="{{ site.url }}/assets/css/talks-table.css">
-{% endblock %}
-
 [0]: {{site.url}}/contact
 [1]: {{site.lanyrd.url}}
 [2]: {{site.joindin.url}}