lightli/rf-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed menu mess

Browse Source
This commit is contained in:
sunda 2022-05-30 10:48:34 +02:00
parent 3dde4cc16b
commit b6d7f71551
10 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
_data/menu-variants.yml
View File

@ -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"
to: "/donate"

10
_includes/common/navigation.html
View File

@ -16,14 +16,14 @@
{% for item in menu %}
{% if item.items %}
<div class="nav-group" tabindex="0">
<a href="{{ item[page.lang].url | default: '#'}}" class="nav-link colour-{{ item[page.lang].colour | default: 'black' }} {{ item.case }}">{{ item[page.lang].name }}</a>
<a href="{% if item[page.lang].to %}{{- item[page.lang].to -}}{% elsif item[page.lang].url %}{{- item[page.lang].url | default: '#' -}}{% endif %}" class="nav-link colour-{{ item[page.lang].colour | default: 'black' }} {{ item.case }}">{{ item[page.lang].name }}</a>
{% if item.items %}
<div class="sub-nav-group">
{% for sublink in item.items %}
{% if page.lang == 'en' %}
<a class="sub-nav-link colour-{{ sublink[page.lang].colour | default: 'black' }} {{ sublink.case }}" href="{{ site.baseurl | append: sublink[page.lang].url }}">{{ sublink[page.lang].name }}</a>
<a class="sub-nav-link colour-{{ sublink[page.lang].colour | default: 'black' }} {{ sublink.case }}" href="{% if sublink[page.lang].to %}{{- sublink[page.lang].to -}}{% elsif sublink[page.lang].url %}{{- sublink[page.lang].url -}}{% endif %}">{{ sublink[page.lang].name }}</a>
{% else %}
<a class="sub-nav-link colour-{{ sublink[page.lang].colour | default: 'black' }} {{ sublink.case }}" href="{{ site.baseurl }}/{{ page.lang | append: sublink[page.lang].url }}">{{ sublink[page.lang].name }}</a>
<a class="sub-nav-link colour-{{ sublink[page.lang].colour | default: 'black' }} {{ sublink.case }}" href="{% if sublink[page.lang].to %}/{{- page.lang | append: sublink[page.lang].to -}}{% elsif sublink[page.lang].url %} {{- sublink[page.lang].url -}}{% endif %}">{{ sublink[page.lang].name }}</a>
{% endif %}
{% endfor %}
</div>
@ -32,11 +32,11 @@
{% else %}
{% if page.lang == 'en' %}
<div class="nav-group">
<a class="nav-link colour-{{ item[page.lang].colour | default: 'black' }} {{ item.case }}" href="{{ site.baseurl | append: item[page.lang].url }}">{{ item[page.lang].name }}</a>
<a class="nav-link colour-{{ item[page.lang].colour | default: 'black' }} {{ item.case }}" href="{% if item[page.lang].to %}{{- item[page.lang].to -}}{% elsif item[page.lang].url %}{{- item[page.lang].url | default: '#' -}}{% endif %}">{{ item[page.lang].name }}</a>
</div>
{% else %}
<div class="nav-group">
<a class="nav-link colour-{{ item[page.lang].colour | default: 'black' }} {{ item.case }}" href="{{ site.baseurl }}/{{ page.lang | append: item[page.lang].url }}">{{ item[page.lang].name }}</a>
<a class="nav-link colour-{{ item[page.lang].colour | default: 'black' }} {{ item.case }}" href="{% if item[page.lang].to %}/{{- page.lang | append: item[page.lang].to -}}{% elsif item[page.lang].url %}{{- item[page.lang].url | default: '#' -}}{% endif %}">{{ item[page.lang].name }}</a>
</div>
{% endif %}
{% endif %}

2
_posts/fr/2022-05-27-announcing-rf2022.markdown
View File

@ -6,7 +6,7 @@ ref: announcing-rf2022
date: 2022-05-23 09:30:00 +0200
lang: fr
categories: fr
excerpt: <p>The ReclaimFutures team is very proud to announce ReclaimFutures 2022! Call for proposals now live!</p>
excerpt: <p>L'équipe de ReclaimFutures est fière d'annoncer le retour de l'événement pour 2022 ! L'appel à participation est <em>en ligne !</em></p>
---
L'équipe de ReclaimFutures est fière d'annoncer le retour de l'événement pour 2022 !

1
_sass/includes/header.scss
View File

@ -32,6 +32,7 @@ header.page-header {
.nav-group {
cursor: default;
position: relative;
z-index: 1;
.sub-nav-group {
display: flex;

4
_sass/pages/rf2020.scss
View File

@ -40,4 +40,8 @@
cursor: pointer;
}
}
&.lang-fr .no-fr {
margin-bottom: 1em;
}
}

2
assets/js/index.js
View File

@ -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 = {};

2
docker-compose.yml
View File

@ -8,4 +8,4 @@ services:
- 4000:4000
volumes:
- .:/srv/jekyll:Z"
command: yarn build
command: yarn start

5
fr/index.html
View File

@ -6,13 +6,8 @@ className: index
ref: index
---
{% capture intro %}
{% include text/fr/intro.md %}
{% endcapture %}
<div>
<span class="intro">{{ intro | markdownify }}</span>
{% include common/news.html %}
</div>

2
fr/rf2020/index.html
View File

@ -9,7 +9,7 @@ className: rf2020
<article class="page-content margin-128-bottom">
<div>
<p class="textbox italic inline-block">
<p class="textbox italic inline-block no-fr">
Version française non disponible
</p>
</div>

2
package.json
View File

@ -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",