{{ page.title_ }}
-- [{{ page.format }}] -
++ {{ page.title_ | strip }} + + [{{ page.format | strip }}] + +
- {{ participant.fullname }} -
- {% endif %} - {% endfor %} - {% endfor %} -
+
+
{{ 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" }}
+
+
+
{{ 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" }} +
+{{ 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 0000000..7ecf66f Binary files /dev/null and b/assets/participants/caroline-sinders.png differ diff --git a/fr/rf2020/index.html b/fr/rf2020/index.html new file mode 100644 index 0000000..007ee06 --- /dev/null +++ b/fr/rf2020/index.html @@ -0,0 +1,15 @@ +--- +layout: page +lang: fr +className: rf2020 +ref: 2020-mainpage +--- + + +ReclaimFutures 2020
+ +Participants
+{{ site.data.translations.participants[page.lang] }}
-
{% for participant in participants %}
-
- {{ participant.fullname }} +
- + {{ participant.fullname }} + {% endfor %}
Participants
+-
+ {% for participant in participants %}
+
- {{ participant.fullname }} + {% endfor %} +
{{ site.data.translations.program[page.lang] }}
-{{ site.data.translations.program[page.lang] }} — 2020
+ReclaimFutures 2020
+ +Participants
+{{ site.data.translations.participants[page.lang] }}
-
{% for participant in participants %}
- - {{ participant.fullname }} + {{ participant.fullname }} {% endfor %}