diff --git a/_data/rf2020/donors.yml b/_data/rf2020/donors.yml new file mode 100644 index 0000000..9b9f552 --- /dev/null +++ b/_data/rf2020/donors.yml @@ -0,0 +1,13 @@ +- + name: Pro Helvetia + amount: CHF 2'000 + url: https://prohelvetia.ch/en/ +- + name: Catherine Touillet + amount: €50 +- + name: Camille Donzé + amount: €20 +- + name: Michael A Redman + amount: €10 diff --git a/_data/rf2020/events.yml b/_data/rf2020/events.yml index 6b86e22..80e44c7 100644 --- a/_data/rf2020/events.yml +++ b/_data/rf2020/events.yml @@ -13,7 +13,7 @@ In this participatory workshop, we'll explore the major contributors to the internet's carbon emissions as well as build upon and dream of positive steps towards a more sustainable internet. participants: [0] - archive: 4db36fd0-c08b-447d-b613-dd8285288f97 + peertube-id: 4db36fd0-c08b-447d-b613-dd8285288f97 - id : 1 title_ : Peek- creating games for understanding futures diff --git a/_includes/archive/archive-item.html b/_includes/archive/archive-item.html index af72913..570f9c4 100644 --- a/_includes/archive/archive-item.html +++ b/_includes/archive/archive-item.html @@ -1,4 +1,5 @@ {% assign event = include.event %} + {% capture inner %}
{% if event.short_title %} @@ -11,11 +12,11 @@

{% endif %} -
+
{% for eventParticipantId in event.participants %} {% for participant in site.data.rf2020.participants %} {% if participant.id == eventParticipantId %} - — {{ participant.fullname }} + — {{ participant.fullname }} {% endif %} {% endfor %} {% endfor %} @@ -32,6 +33,11 @@ {{ inner }}
{% endif %} + {% if event.format %} +
+ [{{ event.format }}] +
+ {% endif %} {{ inner }} diff --git a/_includes/common/donors.html b/_includes/common/donors.html new file mode 100644 index 0000000..27d9127 --- /dev/null +++ b/_includes/common/donors.html @@ -0,0 +1,15 @@ +{% assign donors = site.data.rf2020.donors %} + + + \ No newline at end of file diff --git a/_includes/common/logo.html b/_includes/common/logo.html index bbada8a..332c79e 100644 --- a/_includes/common/logo.html +++ b/_includes/common/logo.html @@ -1,8 +1,15 @@ +{% assign pathstub = page.path | split: "/" | first %} + + {% if include.size == 'small' %}

Reclaim Futures 2020

{% else %}

- Reclaim
Futures + Reclaim
+ Futures + {% if pathstub == 'rf2020' %} +
2020 + {% endif %}

{% endif %} \ No newline at end of file diff --git a/_includes/embeds/peertube.html b/_includes/embeds/peertube.html new file mode 100644 index 0000000..1a1c0b9 --- /dev/null +++ b/_includes/embeds/peertube.html @@ -0,0 +1 @@ + diff --git a/_layouts/default.html b/_layouts/default.html index 0edfaa8..0532877 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -1,7 +1,7 @@ {% include common/head.html %} - + {{ content }} diff --git a/_layouts/event.html b/_layouts/event.html index cbeb473..2435570 100644 --- a/_layouts/event.html +++ b/_layouts/event.html @@ -1,10 +1,10 @@ --- layout: page lang: en -parentEn: /rf2020/program -parentFr: /fr/rf2020/programme -parentNameEn: program -parentNameFr: programme +parentEn: /rf2020/archive +parentFr: /fr/rf2020/archive +parentNameEn: rf2020/archive +parentNameFr: rf2020/archive --- {% assign format=page.format | downcase %} @@ -23,6 +23,8 @@ parentNameFr: programme {% endcapture %} + +
diff --git a/_layouts/page.html b/_layouts/page.html index 58494f1..8f584d0 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -5,7 +5,7 @@ layout: default {% include common/header.html collapsed=false %} -
+
{{ content }}
diff --git a/_sass/includes/archive.scss b/_sass/includes/archive.scss index 557b5e5..5670851 100644 --- a/_sass/includes/archive.scss +++ b/_sass/includes/archive.scss @@ -4,6 +4,14 @@ grid-auto-rows: minmax(calc(920px / 3 - var(--size-16)), max-content); column-gap: var(--size-16); + @include touch { + grid-template-columns: 1fr 1fr; + } + + @include mobile { + grid-template-columns: 1fr; + } + .event a { display: flex; flex-direction: column; @@ -52,10 +60,20 @@ line-height: 0.8; padding: 2px 0 0 2px; background-color: var(--colour-white); + z-index: 6; + font-weight: normal; } - .participant-name { + .participants { font-weight: normal; + + span { + margin: 0; + + &:last-of-type { + margin-bottom: var(--size-24); + } + } } &:hover .bg-img, diff --git a/_sass/includes/donors-list.scss b/_sass/includes/donors-list.scss new file mode 100644 index 0000000..ea89ab6 --- /dev/null +++ b/_sass/includes/donors-list.scss @@ -0,0 +1,8 @@ +ul.donors { + margin: 0; + padding-bottom: 0; + + li { + list-style: none; + } +} diff --git a/_sass/layouts/text-page.scss b/_sass/layouts/text-page.scss index 45c5870..93cd526 100644 --- a/_sass/layouts/text-page.scss +++ b/_sass/layouts/text-page.scss @@ -47,3 +47,7 @@ text-align: center; } } + +.buymusic-club { + max-height: calc(var(--size-512) + var(--size-128)); +} diff --git a/_sass/pages/credits.scss b/_sass/pages/credits.scss new file mode 100644 index 0000000..532bebf --- /dev/null +++ b/_sass/pages/credits.scss @@ -0,0 +1,5 @@ +#page-credits { + ul { + // background-color: rebeccapurple !important; + } +} diff --git a/assets/css/index.scss b/assets/css/index.scss index 6e51c5e..4593846 100644 --- a/assets/css/index.scss +++ b/assets/css/index.scss @@ -27,6 +27,7 @@ @import 'includes/watch-panel'; @import 'includes/clock'; @import 'includes/archive'; +@import 'includes/donors-list'; @import 'pages/home'; @import 'pages/about'; @import 'pages/how-to-participate'; @@ -34,3 +35,4 @@ @import 'pages/donate'; @import 'pages/gallery'; @import 'pages/watch'; +@import 'pages/credits'; diff --git a/rf2020/credits/index.md b/rf2020/credits/index.md new file mode 100644 index 0000000..3e9da73 --- /dev/null +++ b/rf2020/credits/index.md @@ -0,0 +1,34 @@ +--- +layout: text-page +author: ReclaimFutures +title: Credits & Thanks +className: credits +ref: credits +lang: en + +--- +
+

Credits & Thanks

+
+ +ReclaimFutures 2020 would not have been possible without community effort, financial donations and ___ for which we are extremely grateful. + +### Donations & Finacial support + +We thank the following donors for their kind support: + +{% include common/donors.html %} + +The sum of this amount is being Donations are still open and all donations made via [this link](https://opencollective.com/reclaimfutures/contribute/rf2020-20496/checkout) will be passed on to RF2020 participants. + +### Music + +All music heard in the live-stream during the weekend was used with permission from the artist / label. Go buy music by these artists: + + + +### Website and Typography + +The ReclaimFutures website was made by Benjamin Jones and Clément Charollais using [Jekyll](https://jekyllrb.com/) and is hosted at (100% renewable-powered) [Data Center Light](https://datacenterlight.ch/). + +The typefaces used by ReclaimFutures are [Space Mono by Colophon Foundry](https://www.colophon-foundry.org/custom/spacemono/) and [GlyphWorld Mountain by Leah Maldonado](https://leahmaldonado.com/GlyphWorld). \ No newline at end of file diff --git a/rf2020/watch/index.html b/rf2020/watch/index.html index 7eb5f51..6520337 100644 --- a/rf2020/watch/index.html +++ b/rf2020/watch/index.html @@ -7,7 +7,7 @@ ref: watch menu-variant: watch --- -
+
{% include common/watch-panel.html %}