small fixes etc

This commit is contained in:
Benjamin Jones 2020-09-11 11:43:26 +02:00
parent bc3f07b929
commit 038168863e
11 changed files with 67 additions and 56 deletions

View File

@ -1,5 +1,5 @@
<div id="full-banner"> <div id="full-banner">
<h1 class="countdown"> <h1 class="countdown">
Livestream event begins: <span class="cd-time" id="replace-me">10:45:00 18.09.2020 (CEST)</span> Livestream event begins: <span class="cd-time" id="replace-me">10:45:00 18.09.2020 CEST (UTC+2)</span>
</h1> </h1>
</div> </div>

View File

@ -4,7 +4,7 @@
{% if post.lang == page.lang %} {% if post.lang == page.lang %}
<li class="post-item"> <li class="post-item">
<header class="post-header"> <header class="post-header">
<h3 class="margin-16-bottom-m"><a href="{{ post.url }}">{{ post.title }}</a></h3> <h3 class="margin-16-bottom-m margin-8-right-d"><a href="{{ post.url }}">{{ post.title }}</a></h3>
<h3 class="titlecase"> <h3 class="titlecase">
{% include utils/translated-date.html date=post.date lang=page.lang %} {% include utils/translated-date.html date=post.date lang=page.lang %}
</h3> </h3>
@ -13,7 +13,7 @@
</header> </header>
<div class="post-content"> <div class="post-content">
<span class="post-excerpt">{{ post.excerpt }}</span> <span class="post-excerpt">{{ post.excerpt }}</span>
<a href="{{ post.url }}">{{ site.data.translations.readMore[page.lang]}} -></a> <a href="{{ post.url }}">{{ site.data.translations.readMore[page.lang] }} -></a>
</div> </div>
</li> </li>
{% endif %} {% endif %}

View File

@ -1,10 +1,11 @@
<div> <div>
<!-- <small class="textbox inline-block margin-32-bottom">{{ site.data.translations.event_time_soon[page.lang]}}</small> --> <small class="textbox inline-block margin-32-bottom">All times are CEST (UTC+2 Europe/Zurich)</small>
{% include program/program-day.html date="2020-09-18" weekday=5 %} {% include program/program-day.html date="2020-09-18" weekday=5 %}
{% include program/program-day.html date="2020-09-19" weekday=6 %} {% include program/program-day.html date="2020-09-19" weekday=6 %}
{% include program/program-day.html date="2020-09-20" weekday=0 %} {% include program/program-day.html date="2020-09-20" weekday=0 %}
<div class="content margin-64-bottom"> <div class="content margin-64-bottom">
<h3 class="textbox inline-block">The gallery:</h3> <h3 class="textbox inline-block">The gallery:</h3>
<ul class="prog-list margin-16-bottom block"> <ul class="prog-list margin-16-bottom block">
{% for event in events %} {% for event in events %}

View File

@ -3,7 +3,7 @@
{% assign weekday = include.weekday %} {% assign weekday = include.weekday %}
<div class="content margin-64-bottom {{ date }}"> <div class="content margin-64-bottom {{ date }}">
<h3 class="textbox inline-block">{{ site.data.date-locales[page.lang].full_weekday[weekday] }} - {{ date }}</h3> <h3 class="textbox inline-block ">{{ site.data.date-locales[page.lang].full_weekday[weekday] }} - {{ date }}</h3>
<ul class="prog-list margin-16-bottom block" > <ul class="prog-list margin-16-bottom block" >
{% for event in events %} {% for event in events %}
{% assign eventDate = event.date | date: "%d.%m" %} {% assign eventDate = event.date | date: "%d.%m" %}

View File

@ -13,9 +13,13 @@
<li class="margin-32-bottom flex flex-justify-space-between flex-align-center textbox event"> <li class="margin-32-bottom flex flex-justify-space-between flex-align-center textbox event">
<span class="flex-5 margin-0 text-lg"> <span class="flex-5 margin-0 text-lg">
<a href="/rf2020/events/{{ event.ref }}.html" class="margin-0">{{ event.title_ }}</a> {% if event.ref != "no-ref" %}
{% if event.format %} <a href="/rf2020/events/{{ event.ref }}.html" class="margin-0">{{ event.title_ }}</a>
<small class="prog-item--format sup flex-1 margin-0">[{{ event.format }}]</small> {% if event.format and event.format != 'misc' %}
<small class="prog-item--format sup flex-1 margin-0">[{{ event.format }}]</small>
{% endif %}
{% else %}
<p class="margin-0 bold">{{ event.title_ }}</p>
{% endif %} {% endif %}
</span> </span>

View File

@ -9,6 +9,14 @@ parentNameFr: programme
{% assign format=page.format | downcase %} {% assign format=page.format | downcase %}
{% capture regLink %}
{% if format == 'workshop' and page.registration-link %}
<div class="textbox margin-16-bottom">
<a class="with-url-arrow" href="{{ page. registration-link }}">register to participate in this workshop</a>
</div>
{% endif %}
{% endcapture %}
<article class="page-content margin-64-bottom event"> <article class="page-content margin-64-bottom event">
<div class="content post-item"> <div class="content post-item">
@ -24,6 +32,27 @@ parentNameFr: programme
<img src="{{ page.pic }}" alt="" class="participant-profile"> <img src="{{ page.pic }}" alt="" class="participant-profile">
</header> </header>
<div class="flex flex-row flex-justify-space-between flex-wrap-m margin-16-bottom">
<div class="textbox margin-16-bottom-m flex-1 hosts">
<h3>
Hosting this {{ format }}:
</h3>
{% for id in page.participants %}
{% for participant in site.data.rf2020.participants %}
{% if participant.id == id %}
<a class="block with-url-arrow" href="/rf2020/participants/{{ participant.ref }}.html">{{ participant.fullname }}</a>
{% endif %}
{% endfor %}
{% endfor %}
</div>
{% if format != 'artwork' %}
<div class="textbox">
<h3 class="text-right">{% include utils/translated-date.html date=page.date lang=page.lang %}</h3>
<h3 class="margin-0 text-right">{{ page.date | date: "%H:%M" }}<small class="sup">(CEST)</small></h3>
</div>
{% endif %}
</div>
<div class="post-content margin-16-bottom"> <div class="post-content margin-16-bottom">
{% if page.youtube %} {% if page.youtube %}
{% include embeds/youtube.html slug=page.youtube %} {% include embeds/youtube.html slug=page.youtube %}
@ -35,35 +64,8 @@ parentNameFr: programme
<a class="block with-url-arrow" href="{{ link }}">{{ link | remove_first: "https://" | remove_first: "http://" | remove_first: "www." }}</a> <a class="block with-url-arrow" href="{{ link }}">{{ link | remove_first: "https://" | remove_first: "http://" | remove_first: "www." }}</a>
{% endfor %} {% endfor %}
</div> </div>
<div class="details"> {{ regLink }}
<div class="flex flex-row flex-justify-space-between flex-wrap-m margin-16-bottom">
<div class="textbox margin-16-bottom-m flex-1">
<h3>
In this {{ format }}:
</h3>
{% for id in page.participants %}
{% for participant in site.data.rf2020.participants %}
{% if participant.id == id %}
<a class="block with-url-arrow" href="/rf2020/participants/{{ participant.ref }}.html">{{ participant.fullname }}</a>
{% endif %}
{% endfor %}
{% endfor %}
</div>
{% if format != 'artwork' %}
<div class="textbox inline-block margin-16-left-d">
<h3>
Event date/time<span class="sup">*</span>:
</h3>
<p>
{{ page.date | date: "%d.%m.%y" }}
</p>
</div>
{% endif %}
</div>
<div class="text-right-d flex flex-justify-start"><small class="textbox"><span class="sup">*</span>{{ site.data.translations.event_time_soon[page.lang]}}</small></div>
{% if format == 'workshop' %}
<div class="text-right-d flex flex-justify-start"><small class="textbox">{{ site.data.translations.registration_coming[page.lang]}}</small></div>
{% endif %}
</div>
</div> </div>
</article> </article>

View File

@ -79,7 +79,6 @@ header.page-header {
h1.logo { h1.logo {
font-family: var(--font-logo); font-family: var(--font-logo);
margin: var(--size-128) 0; margin: var(--size-128) 0;
// background-color: var(--colour-bg);
color: var(--colour-text, var(--colour-graphite)); color: var(--colour-text, var(--colour-graphite));
display: inline-block; display: inline-block;
filter: drop-shadow(0px 0px 8px var(--colour-grey-light)); filter: drop-shadow(0px 0px 8px var(--colour-grey-light));
@ -101,6 +100,17 @@ header.page-header {
font-size: var(--size-32); font-size: var(--size-32);
margin: var(--size-32) 0; margin: var(--size-32) 0;
} }
@include touch {
nav.page-content {
flex-direction: column;
margin-right: var(--size-16);
}
#rf-logo-wrapper {
margin-left: var(--size-16);
}
}
} }
} }

View File

@ -24,25 +24,11 @@
font-weight: bold; font-weight: bold;
} }
} }
.details { .hosts {
small { margin-right: var(--size-8);
color: rgba(var(--colour-graphite), 0.6);
}
p, a:last-of-type {
a {
margin-bottom: 0; margin-bottom: 0;
line-height: 1;
}
h3 {
font-weight: bold;
}
@include touch {
div::last-of-type {
margin: 0;
}
} }
} }
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 26 KiB

8
fr/watch/index.html Normal file
View File

@ -0,0 +1,8 @@
---
layout: watch
lang: fr
title: Watch ReclaimFutures
className: watch
ref: watch
---