From bb7a95f928791e0a8819758aff5205b682eaf901 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 18 Jun 2017 19:54:05 +0100 Subject: [PATCH] Fix layout on talks archive --- assets/sass/base/_layout.sass | 4 ++++ source/_partials/talks-table.twig | 26 ++++++++++++++++---------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/assets/sass/base/_layout.sass b/assets/sass/base/_layout.sass index 9c8a2fa5..f3d13e38 100644 --- a/assets/sass/base/_layout.sass +++ b/assets/sass/base/_layout.sass @@ -9,3 +9,7 @@ .flex flex: 1 + +@each $value in 'block' 'inline' 'inline-block' + .display-#{$value} + display: #{$value} diff --git a/source/_partials/talks-table.twig b/source/_partials/talks-table.twig index aedd9d3a..6dc3749d 100644 --- a/source/_partials/talks-table.twig +++ b/source/_partials/talks-table.twig @@ -12,7 +12,9 @@ {% for event in events %} - {{ event.date|date('j F Y') }} +
+ {{ event.date|date('j F Y') }} +
{% if event.time %} @@ -23,13 +25,15 @@ {% if not hide_talk %} - {% if not event.talk.hide_page %} - +
+ {% if not event.talk.hide_page %} + + {{ event.talk.title }} + + {% else %} {{ event.talk.title }} - - {% else %} - {{ event.talk.title }} - {% endif %} + {% endif %} +
{% if event.talk.type %} @@ -40,9 +44,11 @@ {% endif %} - {% if event.url %}{% endif %} - {{ event.title }} - {% if event.url %}{% endif %} +
+ {% if event.url %}{% endif %} + {{ event.title }} + {% if event.url %}{% endif %} +
{% if event.location %}