From 82d400ffcd09b6fa03a9029cfd91ff5ba69b6854 Mon Sep 17 00:00:00 2001 From: Benjamin Jones Date: Sun, 16 Aug 2020 18:03:53 +0200 Subject: [PATCH] many many style tweaks and changes on participant, event and program pages --- _data/menu.yml | 3 +- _data/rf2020/events.yml | 23 ++++---- _data/rf2020/participants.yml | 12 +++-- _data/social-links.yml | 3 +- _data/translations.yml | 5 +- _includes/common/footer.html | 5 +- _includes/common/head.html | 6 ++- _includes/common/lang-selector.html | 2 - _includes/common/navigation.html | 10 ++-- _includes/program/program-day.html | 4 +- _includes/program/program-item.html | 4 +- _includes/svg/social-icons/instagram.html | 7 +++ _layouts/event.html | 61 +++++++++++++++------- _layouts/participant.html | 10 ++-- _sass/includes/footer.scss | 1 + _sass/includes/header.scss | 10 ++-- _sass/layout.scss | 5 ++ _sass/layouts/event.scss | 17 ++++++ _sass/layouts/participant.scss | 13 +++++ _sass/layouts/post.scss | 8 +++ _sass/pages/rf2020.scss | 12 +++++ _sass/typography.scss | 3 +- _sass/utils/layout-utils.scss | 30 +++++++++-- _sass/utils/typo-utils.scss | 14 +++++ about/index.md | 2 +- assets/css/index.scss | 1 + assets/participants/caroline-sinders.png | Bin 0 -> 4459 bytes fr/rf2020/index.html | 15 ++++++ fr/rf2020/participants/index.html | 12 +++-- fr/rf2020/participants/index.html.old | 23 ++++++++ fr/rf2020/programme/index.html | 11 ++-- rf2020/index.html | 14 +++++ rf2020/participants/index.html | 8 +-- rf2020/program/index.html | 6 +-- 34 files changed, 272 insertions(+), 88 deletions(-) create mode 100644 _includes/svg/social-icons/instagram.html create mode 100644 _sass/pages/rf2020.scss create mode 100644 assets/participants/caroline-sinders.png create mode 100644 fr/rf2020/index.html create mode 100644 fr/rf2020/participants/index.html.old create mode 100644 rf2020/index.html diff --git a/_data/menu.yml b/_data/menu.yml index 91c05de..254a11c 100644 --- a/_data/menu.yml +++ b/_data/menu.yml @@ -25,10 +25,9 @@ name: participants url: "/rf2020/participants" fr: - name: participants + name: intervenants url: /rf2020/participants - donate: - colour: red en: name: donate url: "/donate" diff --git a/_data/rf2020/events.yml b/_data/rf2020/events.yml index 52b38a5..d7ed9a1 100644 --- a/_data/rf2020/events.yml +++ b/_data/rf2020/events.yml @@ -16,28 +16,31 @@ Or will we wake up and places bets on activities, provocation and cultural production that inspires imagination and multitudes of possible futures? (Turbo Mañana) A new sun rises. participants : [1] + - id: 2 title_: Shock Doctrine as a Service - ref: SDaaS + ref: shock-doctrine-as-a-service format: talk date: 2020-09-18 17:00 description: | The last fifteen years has seen a surge of interest in decentralised technology. From well-funded blockchain projects like IPFS to the emergence of large scale information networks such as Dat, Scuttlebutt and ActivityPub, this is renewed life in peer-to-peer technologies; a renaissance that enjoys widespread growth, driven by the desire for platform commons and community self-determination. These are goals that are fundamentally at odds with – and a response to – the incumbent platforms of social media, music and movie distribution and data storage. As we enter the 2020s, centralised power and decentralised communities are on the verge of outright conflict for the control of the digital public space. The resilience of centralised networks and the political organisation of their owners remains significantly underestimated by protocol activists. At the same time, the decentralised networks and the communities they serve have never been more vulnerable. The peer-to-peer community is dangerously unprepared for a crisis-fuelled future that has very suddenly arrived at their door. participants : [2] + - id: 3 - title_: Rebuild a data future between us + title_: Feminist Data Set format: talk - ref: rebuild-a-data-future + ref: feminist-data-set date: 2020-09-19 13:00 description: | - I am working on a series of projects examine the human’s relationship with data and AI in the future. I want to address the iteration of ourselves and the iteration of computing. In the iteration process, how might we design a space that is safe for everyone, and how should we detail with our personal privacy with Artificial Intelligence of Things (AIoT)? And, when we have the technology to understand and communicate with every object, what’s the relationship between humans? If we live in a fully virtual world, how might we sense and feel the reality? The projects includes a fiction story, a critical essay, a short film, and a speculative design solution. Through storytelling, I invite viewers to experience and rethink about the information revolution. For the talk, I want to discuss about my art and design research process, and how might us as artists, designers, and technologists to help build a positive future with data. I want to share my findings about our data culture, and how the current system might drive us to a world we don’t want to live in. These projects I am working on can’t be the solution for the data-driven world, but hopefully we can starting a conversation and some actions to protect our digital selves. - participants : [2] + What is feminist data inside of social networks, algorithms, and big data? How can we queer data, the archive, and the internet? How can a data set act as a form of protest, of a creation of bias mitigation? This talk looks at ways of intervention, from art, design, and technology that combat and challenge bias. How can we create data to be an act of protest against algorithms? Part of this talk will focus on Caroline's research and current art project, Feminist Data Set. Feminist Data Set acts as a means to combat bias and introduce the possibility of data collection as a feminist practice, aiming to produce a slice of data to intervene in larger civic and private networks. Exploring its potential to disrupt larger systems by generating new forms of agency, her work asks: can data collection itself function as an artwork? + participants : [3] + - id: 4 - title_: Testing testing - format: talk - ref: rebuild-a-data-testing + title_: Testing event with multiple participants + format: panel discussion + ref: rebuild-data date: 2020-09-20 13:00 description: | - I am working on a series of projects examine the human’s relationship with data and AI in the future. I want to address the iteration of ourselves and the iteration of computing. In the iteration process, how might we design a space that is safe for everyone, and how should we detail with our personal privacy with Artificial Intelligence of Things (AIoT)? And, when we have the technology to understand and communicate with every object, what’s the relationship between humans? If we live in a fully virtual world, how might we sense and feel the reality? The projects includes a fiction story, a critical essay, a short film, and a speculative design solution. Through storytelling, I invite viewers to experience and rethink about the information revolution. For the talk, I want to discuss about my art and design research process, and how might us as artists, designers, and technologists to help build a positive future with data. I want to share my findings about our data culture, and how the current system might drive us to a world we don’t want to live in. These projects I am working on can’t be the solution for the data-driven world, but hopefully we can starting a conversation and some actions to protect our digital selves. - participants : [1] \ No newline at end of file + Some kind of event (panel discussion?) with multiple participants + participants : [3, 2] \ No newline at end of file diff --git a/_data/rf2020/participants.yml b/_data/rf2020/participants.yml index 235ac2d..733d28e 100644 --- a/_data/rf2020/participants.yml +++ b/_data/rf2020/participants.yml @@ -5,16 +5,18 @@ location : Austin, Texas U.S.A links : ["https://www.are.na/andrew-van-hyfte", "https://www.hyperisland.com", "https://www.frogdesign.com"] bio : "Andrew is a designer and strategist currently working at frog; focusing on emerging markets and aesthetic futures in order to imagine brave new ventures. Previously a graduate of Scandinavia’s preeminent experimental design institution, Hyper Island, and investigator/collaborator of mythopoetic modes of teaching in partnership with Barcelona’s Internet Age Media’s 2020 IAM Weekend." - picture: /assets/participants/andrew-van-hyfte.jpg events: [1] - id : 2 fullname: Cade Diehm - title: Cade Diehm ref: cade-diehm pronouns : he/him location : Berlin, Germany links : ["https://twitter.com/helveticade", "https://newdesigncongress.org"] bio : "Cade is the founder of the New Design Congress, a research group developing a nuanced understanding of technology's role as a social, political and environmental accelerant. He spent ten years embedded in digital infrastructure and security projects in six countries. After his studies, he consulted with government and telecommunications clients with Deloitte Australia. He prototyped Signal, the secure messaging app, with Open Whisper Systems in 2014, led design and strategy at the early cryptocurrency fintech CoinJar and was Chief Creative Officer at SpiderOak, a Snowden-approved cloud storage company. Prior to founding the New Design Congress he led design and information security research at Tactical Tech, a Berlin-based NGO that works to raise awareness of issues of data, privacy and technology in societies." - picture : /assets/participants/cade2.png - - events: [2,3] +- id : 3 + fullname: Caroline Sinders + ref: caroline-sinders + pronouns : She/her + location : Berlin, Germany + links : ["https://twitter.com/carolinesinders", https://carolinesinders.com/] + bio : "Caroline Sinders is a machine-learning-design researcher and artist. For the past few years, she has been examining the intersections of natural language processing, artificial intelligence, abuse, online harassment, and politics in digital, conversational spaces. Sinders is the founder of Convocation Design + Research, an agency focusing on the intersections of machine learning, user research, designing for public good, and solving difficult communication problems. As a designer and researcher, she has worked with Amnesty International, Intel, IBM Watson, the Wikimedia Foundation, and others. Currently, she is a fellow with the Harvard Kennedy School exploring trust patterns designed to trick users in social networks, and a senior fellow with the Mozilla Foundation exploring AI, ethics, and society. Sinders has held fellowships with the Yerba Buena Center for the Arts, Eyebeam, STUDIO for Creative Inquiry, and the International Center of Photography. Her work has been featured in the Tate Exchange in Tate Modern, Victoria and Albert Museum, MoMA PS1, the Houston Center for Contemporary Craft, Slate, Quartz, and the Channels Festival as well as others. Sinders holds a Masters from New York University's Interactive Telecommunications Program." diff --git a/_data/social-links.yml b/_data/social-links.yml index 0733e70..5aa47f2 100644 --- a/_data/social-links.yml +++ b/_data/social-links.yml @@ -1,4 +1,5 @@ arena: https://are.na/reclaimfutures twitter: https://twitter.com/reclaim_futures email: mailto:info@reclaimfutures.org -substack: https://reclaimfutures.substack.com/ \ No newline at end of file +substack: https://reclaimfutures.substack.com/ +instagram: https://instagram.com/reclaimfutures \ No newline at end of file diff --git a/_data/translations.yml b/_data/translations.yml index 17d7c91..d4ce876 100644 --- a/_data/translations.yml +++ b/_data/translations.yml @@ -20,4 +20,7 @@ formats: fr: artwork program: en: Program - fr: Programme \ No newline at end of file + fr: Programme +participants: + en: Participants + fr: Intervenants \ No newline at end of file diff --git a/_includes/common/footer.html b/_includes/common/footer.html index 45fc4a5..fadcf47 100644 --- a/_includes/common/footer.html +++ b/_includes/common/footer.html @@ -3,8 +3,9 @@ {% include svg/social-icons/email.html size='17' %} {% include svg/social-icons/key.html size='17' %} {% include svg/social-icons/arena.html size='17' %} + {% include svg/social-icons/instagram.html size='18' %} + {% include svg/social-icons/twitter.html size='18' %} {% include svg/social-icons/substack.html size='17' %} - {% include svg/social-icons/rss.html size='17' %} - + \ No newline at end of file diff --git a/_includes/common/head.html b/_includes/common/head.html index e1218a3..ee8e7f8 100644 --- a/_includes/common/head.html +++ b/_includes/common/head.html @@ -1,5 +1,9 @@ {% capture title %} - {% if page.title %} + {% if page.title_ %} + {{ site.title | append: " \ "| append: page.title_ }} + {% elsif page.fullname %} + {{ site.title | append: " \ "| append: page.fullname }} + {% elsif page.title %} {{ site.title | append: " \ "| append: page.title }} {% else %} {{ site.title | escape }} diff --git a/_includes/common/lang-selector.html b/_includes/common/lang-selector.html index cd2cae8..6e8f3f6 100644 --- a/_includes/common/lang-selector.html +++ b/_includes/common/lang-selector.html @@ -29,10 +29,8 @@ {% elsif page.lang == 'en' %} {{ include.fr-text }} - {{ site.data.menu[page.ref]}} {% else %} {{ include.en-text }} - {{ site.data.menu[page.ref]}} {% endif %} diff --git a/_includes/common/navigation.html b/_includes/common/navigation.html index 68b4f8e..927b5cc 100644 --- a/_includes/common/navigation.html +++ b/_includes/common/navigation.html @@ -4,23 +4,23 @@ {% for item in site.data.menu %} {% if item.items %}
- {{ item[page.lang].name }} + {{ item[page.lang].name }} {% for sublink in item.items %} {% if page.lang == 'en' %} - {{ sublink[page.lang].name }} + {{ sublink[page.lang].name }} {% else %} - {{ sublink[page.lang].name }} + {{ sublink[page.lang].name }} {% endif %} {% endfor %}
{% else %} {% if page.lang == 'en' %}
- {{ item[page.lang].name }} + {{ item[page.lang].name }}
{% else %}
- {{ item[page.lang].name }} + {{ item[page.lang].name }}
{% endif %} {% endif %} diff --git a/_includes/program/program-day.html b/_includes/program/program-day.html index 855146e..87afc20 100644 --- a/_includes/program/program-day.html +++ b/_includes/program/program-day.html @@ -2,8 +2,8 @@ {% assign date = include.date | date: "%d.%m" %} {% assign weekday = include.weekday %} -
-

{{ site.data.date-locales[page.lang].full_weekday[weekday] }} - {{ date }}

+
+

{{ site.data.date-locales[page.lang].full_weekday[weekday] }} - {{ date }}

    {% for event in events %} {% assign eventDate = event.date | date: "%d.%m" %} diff --git a/_includes/program/program-item.html b/_includes/program/program-item.html index 8f01fcf..8075b85 100644 --- a/_includes/program/program-item.html +++ b/_includes/program/program-item.html @@ -2,12 +2,12 @@
  • - {{ event.title_ }} + {{ event.title_ }} → {% for eventParticipantId in event.participants %} {% for participant in site.data.rf2020.participants %} {% if participant.id == eventParticipantId %} - {{ participant.fullname }} + {{ participant.fullname }} {% endif %} {% endfor %} {% endfor %} diff --git a/_includes/svg/social-icons/instagram.html b/_includes/svg/social-icons/instagram.html new file mode 100644 index 0000000..a1302b4 --- /dev/null +++ b/_includes/svg/social-icons/instagram.html @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/_layouts/event.html b/_layouts/event.html index 7becadf..83ac425 100644 --- a/_layouts/event.html +++ b/_layouts/event.html @@ -3,36 +3,57 @@ layout: page lang: en --- -
    + +
    -

    {{ page.title_ }}

    -

    - [{{ page.format }}] -

    +

    + {{ page.title_ | strip }} + + [{{ page.format | strip }}] + +

    -
    - {% for id in page.participants %} - {% for participant in site.data.rf2020.participants %} - {% if participant.id == id %} -

    - {{ participant.fullname }} -

    - {% endif %} - {% endfor %} - {% endfor %} -
    + +
    - {% include common/separator.html %} -
    -

    +
    +

    {{ page.description | markdownify }}

    +
    +
    +

    + In this {{ page.format }}: +

    + {% for id in page.participants %} + {% for participant in site.data.rf2020.participants %} + {% if participant.id == id %} + + {{ participant.fullname }} + + {% endif %} + {% endfor %} + {% endfor %} +
    +
    +

    + Event date/time: +

    +

    + {{ page.date | date: "%d.%m.%y" }} +

    +
    +

    \ No newline at end of file diff --git a/_layouts/participant.html b/_layouts/participant.html index a706d6e..5e3ca15 100644 --- a/_layouts/participant.html +++ b/_layouts/participant.html @@ -4,7 +4,7 @@ lang: en ref: going-online --- -
    +

    {{ page.fullname }}

    @@ -27,10 +27,10 @@ ref: going-online

    {{ page.fullname }}'s Events:

    - {% for id in page.events %} - {% for event in site.data.rf2020.events %} - {% if event.id == id %} - {{ event.title_ }} + {% for event in site.data.rf2020.events %} + {% for id in event.participants %} + {% if page.id == id %} + {{ event.title_ }} {% endif %} {% endfor %} {% endfor %} diff --git a/_sass/includes/footer.scss b/_sass/includes/footer.scss index 967453a..44b4e87 100644 --- a/_sass/includes/footer.scss +++ b/_sass/includes/footer.scss @@ -30,6 +30,7 @@ footer.page-footer { a.social-link { margin: 0; + cursor: pointer; } .page-content { display: flex; diff --git a/_sass/includes/header.scss b/_sass/includes/header.scss index 42b5f82..af1a14e 100644 --- a/_sass/includes/header.scss +++ b/_sass/includes/header.scss @@ -1,6 +1,6 @@ header.page-header { - .lang, .nav-link, + .lang, .sub-nav-link { color: $text; background-color: white; @@ -8,11 +8,11 @@ header.page-header { transition: box-shadow 0.8s cubic-bezier(0.075, 0.82, 0.165, 1); z-index: 1; text-decoration: underline; + } - &:hover { - // box-shadow: 5px 5px 0 rgba($white, 0.5), 10px 10px 0 rgba($white, 0.4), 15px 15px 0 rgba($white, 0.3); - transition: box-shadow 0.2s cubic-bezier(0.075, 0.82, 0.165, 1); - } + .lang:hover { + box-shadow: 5px 5px 0 rgba($white, 0.5), 10px 10px 0 rgba($white, 0.4), 15px 15px 0 rgba($white, 0.3); + transition: box-shadow 0.2s cubic-bezier(0.075, 0.82, 0.165, 1); } .nav-group { diff --git a/_sass/layout.scss b/_sass/layout.scss index 65d9211..286bfbd 100644 --- a/_sass/layout.scss +++ b/_sass/layout.scss @@ -56,3 +56,8 @@ footer.page-footer { .textbox { @include textbox; } + +.textbox-sm { + @include textbox; + padding: $size-8 $size-16; +} diff --git a/_sass/layouts/event.scss b/_sass/layouts/event.scss index 48d0a57..2d55dda 100644 --- a/_sass/layouts/event.scss +++ b/_sass/layouts/event.scss @@ -4,5 +4,22 @@ a { margin: 0; } + h2 { + display: inline-block; + align-items: flex-start; + + small { + display: inline; + vertical-align: super; + font-size: $size-14; + white-space: nowrap; + } + } + } + + .post-content { + h3 { + font-weight: bold; + } } } diff --git a/_sass/layouts/participant.scss b/_sass/layouts/participant.scss index 99cccf7..ad98dc4 100644 --- a/_sass/layouts/participant.scss +++ b/_sass/layouts/participant.scss @@ -1,5 +1,18 @@ .participant { .post-header { align-items: flex-end; + position: relative; + + @include touch { + flex-direction: column-reverse; + h2 { + z-index: 1; + } + + img { + transform: translateY($size-24); + width: 100%; + } + } } } diff --git a/_sass/layouts/post.scss b/_sass/layouts/post.scss index 6ed65d2..f8cb3e3 100644 --- a/_sass/layouts/post.scss +++ b/_sass/layouts/post.scss @@ -52,6 +52,14 @@ font-style: normal; } } + + @include touch { + flex-wrap: wrap; + + h2 { + margin-bottom: 8px; + } + } } .post-content { diff --git a/_sass/pages/rf2020.scss b/_sass/pages/rf2020.scss new file mode 100644 index 0000000..4d0c901 --- /dev/null +++ b/_sass/pages/rf2020.scss @@ -0,0 +1,12 @@ +#page-rf2020 { + a { + display: block; + button { + -webkit-appearance: none; + border: none; + box-shadow: none; + font-size: $size-16; + cursor: pointer; + } + } +} diff --git a/_sass/typography.scss b/_sass/typography.scss index bcec5b4..97a6ca9 100644 --- a/_sass/typography.scss +++ b/_sass/typography.scss @@ -11,6 +11,7 @@ em, h6, li, label, +button, .separator { font-family: $font; color: $text; @@ -55,7 +56,7 @@ h2, h3, .h3 { - font-size: $size-16; + font-size: $size-24; } p, diff --git a/_sass/utils/layout-utils.scss b/_sass/utils/layout-utils.scss index 5cdae8c..daeb9c4 100644 --- a/_sass/utils/layout-utils.scss +++ b/_sass/utils/layout-utils.scss @@ -34,18 +34,38 @@ flex-direction: row; } +.margin-0 { + margin: 0px !important; +} + .margin-4-bottom { - margin-bottom: 4px; + margin-bottom: $size-base !important; } + .margin-8-bottom { - margin-bottom: 8px; + margin-bottom: $size-8 !important; } + .margin-16-bottom { - margin-bottom: 16px; + margin-bottom: $size-16 !important; } + .margin-24-bottom { - margin-bottom: 24px; + margin-bottom: $size-24 !important; } + .margin-32-bottom { - margin-bottom: 32px; + margin-bottom: $size-32 !important; +} + +.margin-64-bottom { + margin-bottom: $size-64 !important; +} + +.margin-128-bottom { + margin-bottom: $size-128 !important; +} + +.margin-16-left { + margin-left: $size-16 !important; } diff --git a/_sass/utils/typo-utils.scss b/_sass/utils/typo-utils.scss index b27d394..d77b792 100644 --- a/_sass/utils/typo-utils.scss +++ b/_sass/utils/typo-utils.scss @@ -17,3 +17,17 @@ background-color: $white; padding: $size-16 $size-32; } + +.text-right { + text-align: right; +} +.text-left { + text-align: left; +} +.text-center { + text-align: center; +} + +.colour-highlight { + color: $highlight !important; +} diff --git a/about/index.md b/about/index.md index 0b9413a..0b9a878 100644 --- a/about/index.md +++ b/about/index.md @@ -1,7 +1,7 @@ --- layout: text-page lang: en -title: about +title: About RF className: about ref: about --- diff --git a/assets/css/index.scss b/assets/css/index.scss index dd9b52d..1d2fb9d 100644 --- a/assets/css/index.scss +++ b/assets/css/index.scss @@ -24,3 +24,4 @@ @import 'pages/home'; @import 'pages/about'; @import 'pages/how-to-participate'; +@import 'pages/rf2020'; diff --git a/assets/participants/caroline-sinders.png b/assets/participants/caroline-sinders.png new file mode 100644 index 0000000000000000000000000000000000000000..7ecf66ff85eed6678a9a76ba64645a41343614e8 GIT binary patch literal 4459 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 +

    ReclaimFutures 2020

    + +
    \ No newline at end of file diff --git a/fr/rf2020/participants/index.html b/fr/rf2020/participants/index.html index d35f1b7..b166feb 100644 --- a/fr/rf2020/participants/index.html +++ b/fr/rf2020/participants/index.html @@ -1,20 +1,22 @@ --- layout: page -lang: fr +lang: en ref: 2020-participants --- {% assign participants = site.data.rf2020.participants | sort: "fullname" %} -
    +
    -

    Participants

    +

    {{ site.data.translations.participants[page.lang] }}

    -
    +
    diff --git a/fr/rf2020/participants/index.html.old b/fr/rf2020/participants/index.html.old new file mode 100644 index 0000000..a16c952 --- /dev/null +++ b/fr/rf2020/participants/index.html.old @@ -0,0 +1,23 @@ +--- +layout: page +lang: fr +ref: 2020-participants +--- + +{% assign participants = site.data.rf2020.participants | sort: "fullname" %} + + \ No newline at end of file diff --git a/fr/rf2020/programme/index.html b/fr/rf2020/programme/index.html index 21ad259..a76c1a2 100644 --- a/fr/rf2020/programme/index.html +++ b/fr/rf2020/programme/index.html @@ -5,10 +5,9 @@ ref: 2020-program --- -
    -
    -

    {{ site.data.translations.program[page.lang] }}

    -
    - {% include program/full-program.html %} - +
    +
    +

    {{ site.data.translations.program[page.lang] }} — 2020

    +
    + {% include program/full-program.html %}
    \ No newline at end of file diff --git a/rf2020/index.html b/rf2020/index.html new file mode 100644 index 0000000..f135a53 --- /dev/null +++ b/rf2020/index.html @@ -0,0 +1,14 @@ +--- +layout: page +lang: en +ref: 2020-mainpage +--- + + + \ No newline at end of file diff --git a/rf2020/participants/index.html b/rf2020/participants/index.html index d05638b..b166feb 100644 --- a/rf2020/participants/index.html +++ b/rf2020/participants/index.html @@ -6,16 +6,16 @@ ref: 2020-participants {% assign participants = site.data.rf2020.participants | sort: "fullname" %} -
    +
    -

    Participants

    +

    {{ site.data.translations.participants[page.lang] }}

    -
    +
    diff --git a/rf2020/program/index.html b/rf2020/program/index.html index 4463fbc..b0d11be 100644 --- a/rf2020/program/index.html +++ b/rf2020/program/index.html @@ -5,9 +5,9 @@ ref: 2020-program --- -
    -
    -

    {{ site.data.translations.program[page.lang] }}

    +
    +
    +

    {{ site.data.translations.program[page.lang] }} — 2020

    {% include program/full-program.html %}
    \ No newline at end of file