Merge branch 'master' into add-dublin-talks

This commit is contained in:
Oliver Davies 2017-09-07 10:09:20 +01:00
commit 69b42c6a47
14 changed files with 92 additions and 1269 deletions

View file

@ -1 +0,0 @@
www.oliverdavies.uk

View file

@ -22,7 +22,7 @@
{{ row.date.date|date(row.date.fuzzy_date ? 'F Y' : 'j F Y') }}
{% if row.date.time is defined %}
<small class="db black-50">
<small class="db black-70">
{{ row.date.time }}
</small>
{% endif %}
@ -40,14 +40,14 @@
{{ row.date.talk_title }}
{% endif %}
<small class="db black-50">
<small class="db black-70">
{{ row.date.type|default('Talk') }}
</small>
</td>
{% endif %}
<td class="pa2">
{% if row.event.website is defined %}
{% if row.event.website is not empty %}
<a href="{{ row.event.website }}">
{{ row.event.name }}
</a>
@ -56,7 +56,7 @@
{% endif %}
{% if row.event.location is defined %}
<small class="db black-50">
<small class="db black-70">
{{ row.event.location }}
</small>
{% endif %}