From b6d7f71551163ffd74f652e2f3c70a8bf05bae96 Mon Sep 17 00:00:00 2001 From: sunda <> Date: Mon, 30 May 2022 10:48:34 +0200 Subject: [PATCH] fixed menu mess --- _data/menu-variants.yml | 36 +++++++++---------- _includes/common/navigation.html | 10 +++--- .../fr/2022-05-27-announcing-rf2022.markdown | 2 +- _sass/includes/header.scss | 1 + _sass/pages/rf2020.scss | 4 +++ assets/js/index.js | 2 +- docker-compose.yml | 2 +- fr/index.html | 5 --- fr/rf2020/index.html | 2 +- package.json | 2 +- 10 files changed, 33 insertions(+), 33 deletions(-) diff --git a/_data/menu-variants.yml b/_data/menu-variants.yml index da31991..13efdc5 100644 --- a/_data/menu-variants.yml +++ b/_data/menu-variants.yml @@ -2,11 +2,11 @@ main: - rf2022: en: name: RF2022 - url: "/rf2022" + to: "/rf2022" fr: name: RF2022 - url: "/rf2022" + to: "/rf2022" - archive: en: @@ -17,10 +17,10 @@ main: - rf2020: en: name: RF2020 - url: "/rf2020" + to: "/rf2020" fr: name: RF2020 - url: /rf2020 + to: "/rf2020" - tpr: en: name: The Para-Real @@ -31,52 +31,52 @@ main: - donate: en: name: support us - url: "/donate" + to: "/donate" fr: name: faire un don - url: /donate + to: /donate watch: - program: en: name: program - url: "#program" + to: "#program" fr: name: programme - url: "#program" + to: "#program" - gallery: en: name: gallery - url: "/rf2020/gallery" + to: "/rf2020/gallery" fr: name: gallery - url: "/rf2020/gallery" + to: "/rf2020/gallery" - donate: en: name: donate - url: "/donate" + to: "/donate" fr: name: faire un don - url: "/donate" + to: "/donate" gallery: - watch: en: name: watch - url: "/rf2020/watch" + to: "/rf2020/watch" fr: name: watch - url: "/rf2020/watch" + to: "/rf2020/watch" - program: en: name: program - url: "/rf2020/program" + to: "/rf2020/program" fr: name: programme - url: /rf2020/programme + to: /rf2020/programme - donate: en: name: donate - url: "/donate" + to: "/donate" fr: name: faire un don - url: "/donate" \ No newline at end of file + to: "/donate" \ No newline at end of file diff --git a/_includes/common/navigation.html b/_includes/common/navigation.html index 24d8894..e3622dc 100644 --- a/_includes/common/navigation.html +++ b/_includes/common/navigation.html @@ -16,14 +16,14 @@ {% for item in menu %} {% if item.items %}
- {{ item[page.lang].name }} + {{ item[page.lang].name }} {% if item.items %}
{% 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 %}
@@ -32,11 +32,11 @@ {% 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/_posts/fr/2022-05-27-announcing-rf2022.markdown b/_posts/fr/2022-05-27-announcing-rf2022.markdown index 796c75d..2c791d2 100644 --- a/_posts/fr/2022-05-27-announcing-rf2022.markdown +++ b/_posts/fr/2022-05-27-announcing-rf2022.markdown @@ -6,7 +6,7 @@ ref: announcing-rf2022 date: 2022-05-23 09:30:00 +0200 lang: fr categories: fr -excerpt:

The ReclaimFutures team is very proud to announce ReclaimFutures 2022! Call for proposals now live!

+excerpt:

L'équipe de ReclaimFutures est fière d'annoncer le retour de l'événement pour 2022 ! L'appel à participation est en ligne !

--- L'équipe de ReclaimFutures est fière d'annoncer le retour de l'événement pour 2022 ! diff --git a/_sass/includes/header.scss b/_sass/includes/header.scss index a8eef94..689f66c 100644 --- a/_sass/includes/header.scss +++ b/_sass/includes/header.scss @@ -32,6 +32,7 @@ header.page-header { .nav-group { cursor: default; position: relative; + z-index: 1; .sub-nav-group { display: flex; diff --git a/_sass/pages/rf2020.scss b/_sass/pages/rf2020.scss index 22849c7..d403253 100644 --- a/_sass/pages/rf2020.scss +++ b/_sass/pages/rf2020.scss @@ -40,4 +40,8 @@ cursor: pointer; } } + + &.lang-fr .no-fr { + margin-bottom: 1em; + } } diff --git a/assets/js/index.js b/assets/js/index.js index 4564fe7..e58fd4b 100644 --- a/assets/js/index.js +++ b/assets/js/index.js @@ -4439,7 +4439,7 @@ var parent = module.bundle.parent; if ((!parent || !parent.isParcelRequire) && typeof WebSocket !== 'undefined') { var hostname = "" || location.hostname; var protocol = location.protocol === 'https:' ? 'wss' : 'ws'; - var ws = new WebSocket(protocol + '://' + hostname + ':' + "34073" + '/'); + var ws = new WebSocket(protocol + '://' + hostname + ':' + "41045" + '/'); ws.onmessage = function (event) { checkedAssets = {}; diff --git a/docker-compose.yml b/docker-compose.yml index 528bfee..fc46064 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,4 +8,4 @@ services: - 4000:4000 volumes: - .:/srv/jekyll:Z" - command: yarn build \ No newline at end of file + command: yarn start \ No newline at end of file diff --git a/fr/index.html b/fr/index.html index 8715222..64ded78 100644 --- a/fr/index.html +++ b/fr/index.html @@ -6,13 +6,8 @@ className: index ref: index --- -{% capture intro %} - {% include text/fr/intro.md %} -{% endcapture %} -
- {{ intro | markdownify }} {% include common/news.html %}
diff --git a/fr/rf2020/index.html b/fr/rf2020/index.html index 704e5d8..5b8c73f 100644 --- a/fr/rf2020/index.html +++ b/fr/rf2020/index.html @@ -9,7 +9,7 @@ className: rf2020
-

+

Version française non disponible

diff --git a/package.json b/package.json index 4ab2efe..b4ed53c 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "index.js", "scripts": { "start": "run-p start-jekyll start-parcel", - "build": "npm run build-jekyll && npm run build-parcel", + "build": "run-s build-jekyll build-parcel", "start-jekyll": "jekyll serve --livereload", "start-parcel": "parcel src/index.js -d assets/js", "build-jekyll": "JEKYLL_ENV=production jekyll build",