Adjust column widths

This commit is contained in:
Oliver Davies 2017-03-19 11:59:35 +00:00
parent d33e78a2fa
commit a3470acdca
4 changed files with 20 additions and 18 deletions

View file

@ -15,13 +15,17 @@
& > tbody > tr > td
vertical-align: middle
.date
width: 20%
.column-date,
.column-event
width: 200px
.feedback
width: 15%
.column-feedback
width: 125px
.talk-type,
.event-location
display: block
margin-top: 1px
.talk-full .column-event
width: auto

View file

@ -7,5 +7,5 @@
{% set events = events|merge([event]) %}
{% endfor %}
{% include "talks-table" with { events: events } %}
{% include "talks-table" with { events: events, hide_talk: true } %}
</div>

View file

@ -2,16 +2,16 @@
<table class="talk-event-table table table-striped">
<thead>
<tr>
<th class="date">Date</th>
{% if show_talk %}<th>Talk</th>{% endif %}
<th>Event</th>
{% if show_feedback %}<th class="feedback">Feedback</th>{% endif %}
<th class="column-date">Date</th>
{% if not hide_talk %}<th>Talk</th>{% endif %}
<th class="column-event">Event</th>
{% if not hide_feedback %}<th class="column-feedback">Feedback</th>{% endif %}
</tr>
</thead>
<tbody>
{% for event in events %}
<tr>
<td class="date">
<td class="column-date">
{{ event.date|date('j F Y') }}
{% if event.time %}
@ -21,7 +21,7 @@
{% endif %}
</td>
{% if show_talk %}
{% if not hide_talk %}
<td>
<a href="{{ event.talk.url }}">
{{ event.talk.title }}
@ -35,7 +35,7 @@
</td>
{% endif %}
<td>
<td class="column-event">
{% if event.url %}<a href="{{ event.url }}">{% endif %}
{{ event.title }}
{% if event.url %}</a>{% endif %}
@ -47,8 +47,8 @@
{% endif %}
</td>
{% if show_feedback -%}
<td class="feedback">
{% if not hide_feedback -%}
<td class="column-feedback">
{% if event.talk.joindin %}
<a href="{{ event.talk.joindin }}" class="btn btn-primary" title="Read or leave feedback for this talk">
<i class="fa fa-comment-o"></i> joind.in

View file

@ -30,15 +30,13 @@ use: [talks, posts]
{% include "talks-table" with {
events: upcoming_events|sortbyfield('date'),
show_talk: true
hide_feedback: true,
} %}
<h2>Last 5 Talks</h2>
{% include "talks-table" with {
events: past_events|sortbyfield('date')|reverse[:5],
show_feedback: true,
show_talk: true
events: past_events|sortbyfield('date')|reverse[:5]
} %}
<p>You can view more talks in the <a href="/talks/archive">talks archive</a>.</p>