diff --git a/.gitattributes b/.gitattributes index b96fa93ea68d984b8ff4c07ef220696a24c7ca4e..1fbedfa23257b9ec66205f7051bb8fa511711e4f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,4 +4,4 @@ assets/js/lunr/* linguist-vendored assets/js/plugins/* linguist-vendored assets/js/vendor/* linguist-vendored _sass/minimal-mistakes/vendor/* linguist-vendored -assets/images/*.* filter=lfs diff=lfs merge=lfs -text +assets/images/*/*.* filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore index ba34728c204bbc1ec7a8986da117a7d0d551960d..27202a8140e354699b563617b15873f242c382ae 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,6 @@ vendor/bundle # Local Netlify folder .netlify Gemfile.lock + +# minimal mistakes examples docs +docs/ diff --git a/_data/menus.yml b/_data/menus.yml deleted file mode 100644 index a277a6558be9d91b02de02cbcf45cbd93f464e76..0000000000000000000000000000000000000000 --- a/_data/menus.yml +++ /dev/null @@ -1,42 +0,0 @@ ---- -footer: -- title: À propos de Luminy.org - url: about.md - weight: 1 -- title: Poèmes - url: poemes/ - weight: 1 - -ccl: - - title: "Activités" - url: "/ccl/activites/" - identifier: ccl-activites - - title: "L'association" - url: "/ccl/" - identifier: ccl-l-asso - - # - title: "Concerts et festivals" - # url: /ccl/activites/concerts/ - # - title: "Toukouleur" - # url: /ccl/activites/toukouleur/ - # - title: "Les jeudis du CCL" - # url: /ccl/activites/jeudis/ - # - title: "Campus propre" - # url: /ccl/activites/campus-propre/ - # - title: "Projections" - # url: /ccl/activites/projections/ - # - title: "Ateliers et animation" - # url: /ccl/activites/ateliers/ - # - title: "Projets" - # url: /ccl/activites/projets/ -# - title: "L'association" - # url: "/ccl/" - # children: - # - title: "Qui sommes-nous ?" - # url: /ccl/l-asso/presentation-longue/ - # - title: "Adhérer" - # url: /ccl/l-asso/adherer/ - # - title: "Statuts" - # url: /ccl/l-asso/statuts/ - # - title: "Contacts" - # url: /ccl/l-asso/contacts/ diff --git a/_includes/author-profile.html b/_includes/author-profile.html index 884f2627755585b0ae6790acd89809c20171dfd1..9ef529cef00d1ae321f54fb12f9e2521f77c6501 100644 --- a/_includes/author-profile.html +++ b/_includes/author-profile.html @@ -1,9 +1,5 @@ <!-- {% assign author = page.author | default: page.authors[0] | default: site.author %} --> -{% unless page.author %} - {% assign author = page.url | split: "/" %} - {% assign author = author[1] %} -{% endunless %} -{% assign author = site.data.authors.authors | where: "prefix", author | first %} +{% assign author = site.data.authors.authors | where: "prefix", site.author | first %} <div itemscope itemtype="https://schema.org/Person"> diff --git a/_includes/nav_list b/_includes/nav_list index 55d8c7deafae568dbd1e9deb3d6d4e37ead08b76..940c90ca8437e221606a0bb3a6f45663c942d903 100644 --- a/_includes/nav_list +++ b/_includes/nav_list @@ -1,4 +1,4 @@ -{% assign navigation = site.data.navigation.navs | where: "name", include.nav | map: "nav" | first %} +{% assign navigation = site.data.navigation.nav %} <nav class="nav__list"> {% if page.sidebar.title %}<h3 class="nav__title" style="padding-left: 0;">{{ page.sidebar.title }}</h3>{% endif %} diff --git a/_includes/seo.html b/_includes/seo.html index f4415d3730cbd7f1822c0b368ef8f41e5b274be9..5e6e147de6f8b012a5315f0f3170e7c95db7fec6 100644 --- a/_includes/seo.html +++ b/_includes/seo.html @@ -26,9 +26,7 @@ {%- endif -%} <!-- don't use page.author even if it is set, find author based on url --> -{% assign author = page.url | split: "/" %} -{% assign author = author[1] %} -{% assign author = site.data.authors.authors | where: "prefix", author | first %} +{% assign author = site.data.authors.authors | where: "prefix", site.author | first %} {%- if author.twitter -%} {%- assign author_twitter = author.twitter | replace: "@", "" -%} diff --git a/_layouts/single.html b/_layouts/single.html index 81915e93dea637c87ba3686e94d6d5f3f044d037..f6a9d8728e32b6f2449e8861fe9b327da440de10 100644 --- a/_layouts/single.html +++ b/_layouts/single.html @@ -2,11 +2,7 @@ layout: default --- -{% unless page.author %} - {% assign author = page.url | split: "/" %} - {% assign author = author[1] %} -{% endunless %} -{% assign author = site.data.authors.authors | where: "prefix", author | first %} +{% assign author = site.data.authors.authors | where: "prefix", site.author | first %} {% if page.has_header %} {% include page__hero.html %} diff --git a/_layouts/splash.html b/_layouts/splash.html index 60567c656b7382c4e141cac3910cc314bbb45029..2116502402a3eab777a3bb3e925166a1ffb883dd 100644 --- a/_layouts/splash.html +++ b/_layouts/splash.html @@ -2,7 +2,7 @@ layout: default --- -{% if page.header.overlay_color or page.overlay_image or page.header.image %} +{% if page.header.overlay_color or page.header.overlay_image or page.header.image %} {% include page__hero.html %} {% elsif page.header.video.id and page.header.video.provider %} {% include page__hero_video.html %} diff --git a/_pages/index.md b/_pages/index.md index 6679fda8509caa9edfefe78b4cd1fc4248027dd0..86a92ab7e64b206e798bd099f29256c5ef82d9f9 100644 --- a/_pages/index.md +++ b/_pages/index.md @@ -1,19 +1,10 @@ --- layout: splash -title: Centre Culturel de Luminy +title: Accueil has_header: true -overlay_image: assets/images/puget-fleuri.png header: - type: default - overlay_image: assets/images/banniere-ccl-intime.png - actions: - - label: "<i class='fas fa-users'></i> Adhérez" - url: "/ccl/adherer/" - - label: "<i class='fab fa-fw fa-facebook-square'></i> Suivez-nous" - url: "https://www.facebook.com/CCLuminy/" - - label: "<i class='fas fa-fw fa-calendar-alt'></i> Agenda" - url: "/agenda/" - show_overlay_excerpt: true + type: overlay + overlay_image: assets/images/puget-fleuri.png description: > Le CCL porte de nombreuses initiatives et se propose d'aider à en monter de nouvelles ! Son but : remettre les notions de créativité, de connaissance, de collectivité, de partage et d'entraide au coeur de la vie de notre campus universitaire en proposant à toutes les bonnes volontés de participer à construire leur lieu d'étude, de travail ou encore de vie. feature_row: @@ -84,9 +75,3 @@ feature_row: </script> {% include feature_row %} - -<div id="fb-root"></div> -<script async defer crossorigin="anonymous" src="https://connect.facebook.net/fr_FR/sdk.js#xfbml=1&version=v5.0"></script> - -<div class="fb-page" data-href="https://www.facebook.com/CCLuminy/" data-tabs="timeline" data-width="" data-height="" data-small-header="false" data-adapt-container-width="true" data-hide-cover="false" data-show-facepile="true"><blockquote cite="https://www.facebook.com/CCLuminy/" class="fb-xfbml-parse-ignore"><a href="https://www.facebook.com/CCLuminy/">Centre Culturel de Luminy - CCL</a></blockquote></div> - diff --git a/_pages/jardin/paniers.md b/_pages/jardin/paniers.md index 9b6561805198073cec9aaad164d14bf2c019c2ea..242a2f3b737aeaa4d630dca95cacada602ea68db 100644 --- a/_pages/jardin/paniers.md +++ b/_pages/jardin/paniers.md @@ -14,24 +14,3 @@ Tous les jeudis, les paniers marseillais proposent des produits bio en direct de La distribution se fait tout les jeudis (sauf exceptions, par exemple en période de vacances scolaires) de 16h45 à 19h sur le terrain du jardin, juste à droite. \# Distribution paniers bio [Cagette.net]({{ site.data.extlinks.cagette }}) -header - -plop - -* {% for item in site.menus.header %} -* [{{ item.title }}]({{ item.url }} "Go to {{ item.title }}") {% if item.children %} - * {% for item in item.children %} {{ item.identifier | inspect }} - * [{{ item.title }}]({{ item.url }} "Go to {{ item.title }}"){: .menu-item-{{ loop.index }}} - * {% endfor %} - {: .sub-menu} {% endif %}{: .menu-item-{{ loop.index }}} -* {% endfor %} - -jardin - -* {% for item in site.menus.jardin %} -* [{{ item.title }}]({{ item.url }} "Go to {{ item.title }}") {% if item.children %} - * {% for item in item.children %} {{ item.identifier | inspect }} - * [{{ item.title }}]({{ item.url }} "Go to {{ item.title }}"){: .menu-item-{{ loop.index }}} - * {% endfor %} - {: .sub-menu} {% endif %}{: .menu-item-{{ loop.index }}} -* {% endfor %} \ No newline at end of file diff --git a/assets/images/authors-logo/allie.png b/assets/images/authors-logo/allie.png index b552fe821e18338173ee3afa33b8355cb0534377..b1e0f49d5d306ec062bc53a00ddd71c83257ed97 100644 Binary files a/assets/images/authors-logo/allie.png and b/assets/images/authors-logo/allie.png differ diff --git a/assets/images/authors-logo/cafe-des-langues.png b/assets/images/authors-logo/cafe-des-langues.png index 874070db229e3df99d1a8f45737f0cd78a2d352a..44c3b2c26c9a64ca40b907ec3dcdc4ad7c5a7c62 100644 Binary files a/assets/images/authors-logo/cafe-des-langues.png and b/assets/images/authors-logo/cafe-des-langues.png differ diff --git a/assets/images/authors-logo/fse-transparent.png b/assets/images/authors-logo/fse-transparent.png index dd7dc60eaf6c4886618ce3297f305052e389eaa1..cd72aeed9ebc3db0ba1e4e1178ff22987a2c0feb 100644 Binary files a/assets/images/authors-logo/fse-transparent.png and b/assets/images/authors-logo/fse-transparent.png differ diff --git a/assets/images/authors-logo/indien-petit.png b/assets/images/authors-logo/indien-petit.png index 8c82856cf602da3d90ef1b7d3ac537edf6301b18..38f0ba168270847b9fc06d5b8d2cd7970ca7ebc5 100644 Binary files a/assets/images/authors-logo/indien-petit.png and b/assets/images/authors-logo/indien-petit.png differ diff --git a/assets/images/authors-logo/logo-club-sciences.jpeg b/assets/images/authors-logo/logo-club-sciences.jpeg index 1d8143350f59ad66bc50690ae56dc13229c16665..643c744fe9ff53d7e14d86c243336c7d2e3cf84a 100644 Binary files a/assets/images/authors-logo/logo-club-sciences.jpeg and b/assets/images/authors-logo/logo-club-sciences.jpeg differ diff --git a/assets/images/authors-logo/logo-com.png b/assets/images/authors-logo/logo-com.png index 19a4f39c14fb01c5affd174cb7513349bc6192b2..9c57c8afc7d81a672aa21e2c1178f39685554d2a 100644 Binary files a/assets/images/authors-logo/logo-com.png and b/assets/images/authors-logo/logo-com.png differ diff --git a/assets/images/authors-logo/logo-jardin.png b/assets/images/authors-logo/logo-jardin.png index 64bead2292e01d77edcc414ae7e1fe9e3c3c6312..aa7eb146cbe4d63419ff320f09a0a90acd12c4da 100644 Binary files a/assets/images/authors-logo/logo-jardin.png and b/assets/images/authors-logo/logo-jardin.png differ diff --git a/assets/images/authors-logo/remi.png b/assets/images/authors-logo/remi.png index 5213f62621ee30d1bf0b9c5208048068bcd072c3..8e4c5205e99c84175b4d145c82475588b26ac8f9 100644 Binary files a/assets/images/authors-logo/remi.png and b/assets/images/authors-logo/remi.png differ