opdavies/oliverdavies.uk
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Adjust column widths

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

12
assets/sass/components/content-types/_talk.sass
View file

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

2
source/_partials/talk/events.twig
View file

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

18
source/_partials/talks-table.twig
View file

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

6
source/talks.twig
View file

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