From 9a21d2c7818e916cbe8e3835a9778e9912d50fb9 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer <_@chrisjrn.com> Date: Thu, 8 Dec 2016 19:56:43 +1100 Subject: [PATCH] Schedule tweaks etc (#80) --- pinaxcon/templates/symposion/schedule/_grid.html | 1 + .../templates/symposion/schedule/schedule_conference.html | 2 -- static/src/lca2017/css/app.css | 8 ++++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pinaxcon/templates/symposion/schedule/_grid.html b/pinaxcon/templates/symposion/schedule/_grid.html index eac7abd4..b1ce1b12 100644 --- a/pinaxcon/templates/symposion/schedule/_grid.html +++ b/pinaxcon/templates/symposion/schedule/_grid.html @@ -23,6 +23,7 @@ {{ slot.content.speakers|join:", " }} {% endif %} + {% elif slot.kind.label == "shortbreak" %} {% else %} {% if slot.content_override.raw %} {{ slot.content_override.rendered|safe }} diff --git a/pinaxcon/templates/symposion/schedule/schedule_conference.html b/pinaxcon/templates/symposion/schedule/schedule_conference.html index 28122d6f..8c6022e1 100644 --- a/pinaxcon/templates/symposion/schedule/schedule_conference.html +++ b/pinaxcon/templates/symposion/schedule/schedule_conference.html @@ -25,9 +25,7 @@ {% cache 600 "schedule-table" section.schedule.section %} {% for timetable in section.days %}

{{ section.schedule.section.name }} — {{ timetable.day.date|date:"l" }}, {{ timetable.day.date }}

-
{% include "symposion/schedule/_grid.html" %} -
{% endfor %} {% endcache %} {% endfor %} diff --git a/static/src/lca2017/css/app.css b/static/src/lca2017/css/app.css index b549bde7..2c7fcddf 100644 --- a/static/src/lca2017/css/app.css +++ b/static/src/lca2017/css/app.css @@ -1610,7 +1610,6 @@ table.alt tr:not(:last-of-type) { /* Schedule timetable needs some more specific font sizes */ .calendar td { - vertical-align: top; font-size: 0.9vw; } @@ -1619,6 +1618,7 @@ table.alt tr:not(:last-of-type) { padding-top: 0.2rem; padding-bottom: 0.625rem; padding-right: 0.625rem; + vertical-align: middle; } .calendar th { @@ -1635,10 +1635,14 @@ table.alt tr:not(:last-of-type) { color: #fff ; } +.slot-tutorial { + vertical-align: top; +} + .time { font-size: 0.5vw; line-height: 0.4; - vertical-align: top; + vertical-align: middle; padding-top: 0.25rem; }