From 05a8ae2f6e090dc16953683fe4456d46206b3caf Mon Sep 17 00:00:00 2001 From: Benjamin Jones Date: Sat, 25 Apr 2020 11:36:07 +0200 Subject: [PATCH] moved main text into the call-for-participants page --- _includes/text/coming-soon-fr.md | 6 -- _includes/text/coming-soon.md | 4 -- .../{intro-text-en.md => en/main-text.md} | 19 +----- _includes/text/fr/intro.md | 1 + .../{intro-text-fr.md => fr/main-text.md} | 14 +--- _includes/utils/translated-date.html | 57 ++++++++++++++++ _layouts/content-page.html | 8 +++ _layouts/text-page.html | 8 +++ _sass/includes/footer.scss | 7 +- _sass/layouts/default.scss | 68 ++----------------- _sass/layouts/text-page.scss | 49 +++++++++++++ _sass/pages/about.scss | 5 ++ _sass/pages/home.scss | 12 ++++ _sass/typography.scss | 19 ++++-- _sass/utils/typo-utils.scss | 5 ++ about/index.md | 20 ++++++ assets/css/index.scss | 5 +- assets/js/index.js | 5 +- fr/index.markdown | 12 ---- 19 files changed, 200 insertions(+), 124 deletions(-) delete mode 100644 _includes/text/coming-soon-fr.md delete mode 100644 _includes/text/coming-soon.md rename _includes/text/{intro-text-en.md => en/main-text.md} (74%) create mode 100644 _includes/text/fr/intro.md rename _includes/text/{intro-text-fr.md => fr/main-text.md} (76%) create mode 100644 _includes/utils/translated-date.html create mode 100644 _layouts/content-page.html create mode 100644 _layouts/text-page.html create mode 100644 _sass/layouts/text-page.scss create mode 100644 _sass/pages/about.scss create mode 100644 about/index.md delete mode 100644 fr/index.markdown diff --git a/_includes/text/coming-soon-fr.md b/_includes/text/coming-soon-fr.md deleted file mode 100644 index f1ecebf..0000000 --- a/_includes/text/coming-soon-fr.md +++ /dev/null @@ -1,6 +0,0 @@ - -__ReclaimFutures est une conférence sur la technologie et la culture qui abordent les grands thèmes comme les désirs postcapitalistes, les rêves utopiques et l’informatique durable.__ - - - -Plus d'informations à venir :) \ No newline at end of file diff --git a/_includes/text/coming-soon.md b/_includes/text/coming-soon.md deleted file mode 100644 index 222aa7b..0000000 --- a/_includes/text/coming-soon.md +++ /dev/null @@ -1,4 +0,0 @@ - -__ReclaimFutures is a technology and culture conference around the broad subjects of post-capitalist desire, utopian expoloration and the real sustainable computing.__ - -More details coming soon :) \ No newline at end of file diff --git a/_includes/text/intro-text-en.md b/_includes/text/en/main-text.md similarity index 74% rename from _includes/text/intro-text-en.md rename to _includes/text/en/main-text.md index a4eb5ac..75acbd4 100644 --- a/_includes/text/intro-text-en.md +++ b/_includes/text/en/main-text.md @@ -1,8 +1,3 @@ - -__ReclaimFutures is a technology and culture conference around the broad subjects of post-capitalist desire, utopian exploration, ecology and alternative computing.__ - - - As networks of algorithms drive hyper-consumption and bolster deeply questionable political agendas, the once radical utopian vision of the future offered by the internet is rapidly fading into a nostalgic throwback. How can we reclaim these narratives for non-capitalistic aims? Perhaps through radical acts of creativity, resistance and collective action it may be possible to once again to imagine a plurality of futures other than those offered by tech’s big four. @@ -28,16 +23,8 @@ All participants will be paid a stipend in accordance to the ticket sales of the If you're looking for inspiration we've assembled a list of [hypothetical talk titles and subjects](https://www.are.na/reclaimfutures/hypothetical-subjects) which you can take as a starting point, fully adopt, use to get an impression, or of course completely disregard it. -To submit a proposal please add an issue on our Gitea repository using our proposal template. Please note that proposals which don't follow the template may not be considered. To do so: - -- Go to our Gitea instance and [create an account](https://git.reclaimfutures.org/user/sign_up). -- Create a new issue on the ReclaimFutures repository by [clicking here](https://git.reclaimfutures.org/ReclaimFutures/rf-web/issues/new). -- Fill in the blanks between the [brackets]. -- Press the "Create Issue" button. Congrats, you're done! We'll be in touch sometime after the application deadline. - -If you wish for your proposal to remain private you may send it by email to [info@reclaimfutures.org](mailto:info@reclaimfutures.org). The proposal template can be found [here](/issue_template.md) and our public key is [here](/publickey.asc). - -**Application deadline**: 10th May 2020 00:00 ([AoE time](https://www.worldtimeserver.com/time-zones/aoe/)) +{:.link-to-submit} +**To submit a proposal go over to the [submissions page](/how-to-participate)** [1] Including but not limited to POCs, LGBTQIA+, non-binary folx, womxn, people with disabilities, working class, persons with no fixed address, immigrants, the undocumented and first-time speakers. -[2] If you are concerned financial factors would limit your ability to partake in the conference, please get in touch and we will do all we can to help. \ No newline at end of file +[2] If you are concerned financial factors would limit your ability to partake in the conference, please get in touch and we will do all we can to help. diff --git a/_includes/text/fr/intro.md b/_includes/text/fr/intro.md new file mode 100644 index 0000000..1a88a6a --- /dev/null +++ b/_includes/text/fr/intro.md @@ -0,0 +1 @@ +__ReclaimFutures est une conférence sur la technologie et la culture qui aborde les grands thèmes comme les désirs post-capitalistes, les explorations utopiques, l'écologie et l’informatique alternative.__ diff --git a/_includes/text/intro-text-fr.md b/_includes/text/fr/main-text.md similarity index 76% rename from _includes/text/intro-text-fr.md rename to _includes/text/fr/main-text.md index a6a0db8..2db064f 100644 --- a/_includes/text/intro-text-fr.md +++ b/_includes/text/fr/main-text.md @@ -1,5 +1,4 @@ -__ReclaimFutures est une conférence sur la technologie et la culture qui aborde les grands thèmes comme les désirs post-capitalistes, les explorations utopiques, l'écologie et l’informatique alternative.__ Les réseaux d'algorithmes de plus en plus opaques conduisent à l'hyperconsommation et aux renforcements d’idéologies politiques profondément discutables. La vision utopique des technologies numériques, autrefois radicale, s'éteint progressivement en une nostalgie de ces temps prometteurs. Comment pourrait-on reconquérir ces idées et ces récits à des fins non capitalistes ? @@ -26,16 +25,7 @@ Cependant, tous les participant·x·e·s recevront une allocation en fonction de Afin de vous aider dans la formulation de votre proposition, nous avons assemblé une liste de [titres et sujets de conférences hypothétiques](https://www.are.na/reclaimfutures/hypothetical-subjects) que vous pouvez adopter, adapter, utiliser pour vous inspirer ou, bien sûr, ignorer complètement. -## - Soumettre une proposition - -Pour soumettre une proposition, vous pouvez créer une issue sur notre dépôt Gitea en utilisant notre modèle de proposition. Veuillez noter que les propositions qui ne suivent pas le modèle pourraient ne pas être prises en considération. Pour ce faire : - -- Aller sur notre instance Gitea et [créer un compte](https://git.reclaimfutures.org/user/sign_up). -- Crée un Issue sur ReclaimFutures "repository" en cliquant [ici](https://git.reclaimfutures.org/ReclaimFutures/rf-web/issues/new). -- Appuyez sur "create issue", Bravo vous avez fini ! Nous vous contacterons peu de temps après la date de rendu d'inscription. - -Si vous souhaitez que votre proposition reste confidentielle, vous pouvez l'envoyer par email à [info@reclaimfutures.org](mailto:info@reclaimfutures.org). Le modèle pour soumettre une proposition se trouve [ici](/issue_template.md)(en) et notre clé publique se trouve [là](/publickey.asc). - -**Date limite d'inscription**: 10 mai 2020, 24:00 ([heure AoE](https://time.is/fr/Anywhere%20on%20Earth)) +{:.link-to-submit} +**Pour nous envoyer votre proposition, rendez vous sur [« soumettre une proposition »](/fr/participer/)** [1] Si vous craignez que des facteurs financiers limitent votre participation à la conférence, veuillez communiquer avec nous et nous ferons tout notre possible pour vous aider. \ No newline at end of file diff --git a/_includes/utils/translated-date.html b/_includes/utils/translated-date.html new file mode 100644 index 0000000..2dda48e --- /dev/null +++ b/_includes/utils/translated-date.html @@ -0,0 +1,57 @@ +{% comment %} +This include allows to translate the days and months in the date by using strings in _data/date-locales/[lang].yml +This include can be called with three parameters: + - include.date: the date to be processed + - include.format: the date format. (If empty a default format will be used) + - include.lang: lang to use for translation. +{% endcomment %} + +{% comment %} +If the parameter date format is empty the default format set in _config.yml is used. +If there is no default in _config, "%b %-d, %Y" is used. +{% endcomment %} + +{% assign date_format_to_be_translated = include.format | default: site.date_format | default: "%b %-d, %Y" %} + +{% comment %} +Init to have the indice of the day in the week (num_day) and the indice of the month in the year (num_mont) +Init the lang parameter depending if it's set in the include call, in the page or in the site settings +{% endcomment %} + +{% assign num_day = include.date | date: "%w" | plus: 0 %} +{% assign num_month = include.date | date: "%-m" | plus: -1 %} +{% assign lang = include.lang | default: page.lang | default: site.lang %} + +{% comment %} +Use translated abbreviated weekday if "%a" is used in the format and the translation is available in _data/date-locales/[lang].yml +{% endcomment %} + +{% if site.data.date-locales[lang].abbreviated_weekday[num_day] %} + {% assign date_format_to_be_translated = date_format_to_be_translated | replace: "%a", site.data.date-locales[lang].abbreviated_weekday[num_day] %} +{% endif %} + +{% comment %} +Use translated full weekday if "%A" is used in the format and the translation is available in _data/date-locales/[lang].yml +{% endcomment %} + +{% if site.data.date-locales[lang].full_weekday[num_day] %} + {% assign date_format_to_be_translated = date_format_to_be_translated | replace: "%A", site.data.date-locales[lang].full_weekday[num_day] %} +{% endif %} + +{% comment %} +Use translated abbreviated month if "%b" is used in the format and the translation is available in _data/date-locales/[lang].yml +{% endcomment %} + +{% if site.data.date-locales[lang].abbreviated_month[num_month] %} + {% assign date_format_to_be_translated = date_format_to_be_translated | replace: "%b", site.data.date-locales[lang].abbreviated_month[num_month] %} +{% endif %} + +{% comment %} +Use translated abbreviated weekday if "%B" is used in the format and the translation is available in _data/date-locales/[lang].yml +{% endcomment %} + +{% if site.data.date-locales[lang].full_month[num_month] %} + {% assign date_format_to_be_translated = date_format_to_be_translated | replace: "%B", site.data.date-locales[lang].full_month[num_month] %} +{% endif %} + +{{ include.date | date: date_format_to_be_translated | strip }} \ No newline at end of file diff --git a/_layouts/content-page.html b/_layouts/content-page.html new file mode 100644 index 0000000..497b798 --- /dev/null +++ b/_layouts/content-page.html @@ -0,0 +1,8 @@ +--- +layout: page +--- +
+
+ {{ content }} +
+
\ No newline at end of file diff --git a/_layouts/text-page.html b/_layouts/text-page.html new file mode 100644 index 0000000..6956545 --- /dev/null +++ b/_layouts/text-page.html @@ -0,0 +1,8 @@ +--- +layout: page +--- +
+
+ {{ content }} +
+
\ No newline at end of file diff --git a/_sass/includes/footer.scss b/_sass/includes/footer.scss index 9d445c4..498757b 100644 --- a/_sass/includes/footer.scss +++ b/_sass/includes/footer.scss @@ -10,16 +10,17 @@ footer.page-footer { display: inline-flex; justify-content: center; align-items: center; - transition: all 0.3s ease-in-out; + transition: all 0.2s ease-in-out; svg { - transition: all 0.3s ease-in-out; + transition: all 0.2s ease-in-out; } &:hover { // box-shadow: 5px 5px 0 rgba($white, 0.5), 10px 10px 0 rgba($white, 0.4), 15px 15px 0 rgba($white, 0.3); + background-color: $black; svg { - fill: $true-blue; + fill: $bg; } } } diff --git a/_sass/layouts/default.scss b/_sass/layouts/default.scss index 50859a6..9fa5bd2 100644 --- a/_sass/layouts/default.scss +++ b/_sass/layouts/default.scss @@ -1,66 +1,9 @@ -.text-container { - p:first-of-type { - margin-bottom: $size-64; - } - - p:last-of-type { - margin-top: $size-24; - } - - .intro { - margin-bottom: $size-64; - } - - p, - h1, - h2, - h3, - ul { - max-width: $size-512 + $size-128; - background-color: $white; - padding: $size-16 $size-32; +.intro { + display: block; + margin-bottom: $size-64; + p { + @include textbox; margin: 0; - - &:last-of-type:not(ul) { - margin-bottom: $size-32; - } - - @include touch { - padding: $size-16; - } - } - - h2 { - display: inline-block; - margin-top: $size-64; - margin-bottom: $size-32; - } - - ul { - font-size: $size-14; - - li { - list-style: inside; - @include padding-horizontal($size-12); - line-height: $size-24; - - &:last-of-type { - margin-bottom: 0; - } - } - } - - sup a { - text-decoration: none; - // color: $turquoise; - } - - a { - color: $turquoise; - - &:visited { - color: $highlight-darker; - } } } @@ -86,6 +29,7 @@ h2 { width: 100vh; bottom: 0; text-align: center; + z-index: 0; &.side-title--left { transform: rotate(270deg); diff --git a/_sass/layouts/text-page.scss b/_sass/layouts/text-page.scss new file mode 100644 index 0000000..a0d1a99 --- /dev/null +++ b/_sass/layouts/text-page.scss @@ -0,0 +1,49 @@ +.text-page { + p, + h1, + h2, + h3, + ul { + margin: 0; + @include textbox; + + &:last-of-type:not(ul) { + margin-bottom: $size-32; + } + + @include touch { + padding: $size-16; + } + } + + h2, + h3 { + display: inline-block; + margin-top: $size-64; + margin-bottom: $size-32; + } + + ul { + font-size: $size-14; + padding-top: 0; + + li { + list-style: inside; + @include padding-horizontal($size-12); + line-height: $size-24; + + &:last-of-type { + margin-bottom: 0; + } + } + } + + sup a { + text-decoration: none; + // color: $turquoise; + } + + .link-to-submit { + text-align: center; + } +} diff --git a/_sass/pages/about.scss b/_sass/pages/about.scss new file mode 100644 index 0000000..6937f72 --- /dev/null +++ b/_sass/pages/about.scss @@ -0,0 +1,5 @@ +#page-about { + .content p:last-of-type { + margin-top: 24px; + } +} diff --git a/_sass/pages/home.scss b/_sass/pages/home.scss index e69de29..4297675 100644 --- a/_sass/pages/home.scss +++ b/_sass/pages/home.scss @@ -0,0 +1,12 @@ +#page-index { + h2 { + margin-bottom: $size-32; + } + + h2, + h3 { + @include textbox; + display: inline-block; + margin-top: 0; + } +} diff --git a/_sass/typography.scss b/_sass/typography.scss index 721ace7..1c6d88e 100644 --- a/_sass/typography.scss +++ b/_sass/typography.scss @@ -10,15 +10,11 @@ strong, em, h6, li, +label, .separator { font-family: $font; color: $text; margin-bottom: $size-16; - - &::selection { - background-color: $highlight; - color: $white; - } } strong { @@ -100,3 +96,16 @@ a { } } } + +a { + color: $turquoise; + + &:visited { + color: $highlight-darker; + } +} + +::selection { + background-color: $highlight; + color: $white; +} diff --git a/_sass/utils/typo-utils.scss b/_sass/utils/typo-utils.scss index 749996b..b27d394 100644 --- a/_sass/utils/typo-utils.scss +++ b/_sass/utils/typo-utils.scss @@ -12,3 +12,8 @@ .capitalize { text-transform: capitalize; } + +@mixin textbox { + background-color: $white; + padding: $size-16 $size-32; +} diff --git a/about/index.md b/about/index.md new file mode 100644 index 0000000..0b9413a --- /dev/null +++ b/about/index.md @@ -0,0 +1,20 @@ +--- +layout: text-page +lang: en +title: about +className: about +ref: about +--- + +{% capture intro %} + {% include text/en/intro.md %} +{% endcapture %} + +{% capture maintext %} + {% include text/en/main-text.md %} +{% endcapture %} + +
+ {{ intro | markdownify }} + {{ maintext | markdownify }} +
\ No newline at end of file diff --git a/assets/css/index.scss b/assets/css/index.scss index 2800bb3..dfb776c 100644 --- a/assets/css/index.scss +++ b/assets/css/index.scss @@ -10,9 +10,12 @@ @import 'typography'; @import 'layout'; @import 'layouts/default'; -@import 'layouts/page-with-header'; +@import 'layouts/text-page'; @import 'layouts/404'; +@import 'layouts/post'; @import 'includes/scrollbar'; @import 'includes/header'; @import 'includes/footer'; @import 'pages/home'; +@import 'pages/about'; +@import 'pages/how-to-participate'; diff --git a/assets/js/index.js b/assets/js/index.js index 0e3a883..5f6bef9 100644 --- a/assets/js/index.js +++ b/assets/js/index.js @@ -1,13 +1,12 @@ -/* eslint-disable */ "use strict"; (function () { if (window && document) { var sideTitles = document.querySelectorAll('.side-title'); - if(window.navigator && window.navigator.language === 'en' && window.location) { + // if(window.navigator && window.navigator.language === 'fr' && window.location) { // window.location.replace('/fr') - } + // } var handleScroll = function handleScroll() { var logo = document.querySelector('#rf-logo'); diff --git a/fr/index.markdown b/fr/index.markdown deleted file mode 100644 index 93145d2..0000000 --- a/fr/index.markdown +++ /dev/null @@ -1,12 +0,0 @@ ---- -layout: page-with-header -lang: fr ---- - -{% capture maintext %} - {% include text/intro-text-fr.md %} -{% endcapture %} - -
- {{ maintext | markdownify }} -
\ No newline at end of file