diff --git a/_config.yml b/_config.yml index 21d85c65e020da1a591b9c8cc098219bcd9a5e50..24e72257f7c9c8dd3f75b237b26f3306f4f7eb77 100644 --- a/_config.yml +++ b/_config.yml @@ -26,6 +26,7 @@ baseurl : # the subpath of your site, e.g. "/blog" repository : # GitHub username/repo-name e.g. "mmistakes/minimal-mistakes" teaser : # path of fallback teaser image, e.g. "/assets/images/500x300.png" logo : &logo "/assets/images/authors-logo/indien-petit.png" +banner : "/assets/images/puget-fleuri.png" masthead_title : # overrides the website title displayed in the masthead, use " " for no title breadcrumbs : true # true, false (default) words_per_minute : 200 diff --git a/_includes/page__hero.html b/_includes/page__hero.html index 13e200afbdc23ee53fcab88fea8e8ade36e0ddf2..3ae27d14a3c186ac0e8c9ca36fb22c43276e4c7f 100644 --- a/_includes/page__hero.html +++ b/_includes/page__hero.html @@ -3,7 +3,7 @@ {% capture overlay_title %}true{% endcapture %} {% capture overlay_text %}{{ page.header.description }}{% endcapture %} {% capture overlay_actions %}false{% endcapture %} - {% capture img_path %}{{ author.banner }}{% endcapture %} + {% capture img_path %}{{ author.banner | default: site.banner }}{% endcapture %} {% else %} {% capture header_type %}{{ page.header.type }}{% endcapture %} @@ -64,7 +64,7 @@ {% if page.header.color %} background-color: {{ page.header.color | default: 'transparent' }}; {% endif %} - {% if page.header.overlay_image %} + {% if img_path %} background-image: {% if overlay_filter %} linear-gradient({{ overlay_filter }}, diff --git a/_layouts/single.html b/_layouts/single.html index 8179a015b550c08dd754c29bdd99b7ff5393d048..d623425a0c5bf126e32c7a4e6c8265ac4c52cc62 100644 --- a/_layouts/single.html +++ b/_layouts/single.html @@ -26,7 +26,7 @@ layout: default {% if page.last_modified_at %}<meta itemprop="dateModified" content="{{ page.last_modified_at | date: "%B %d, %Y" }}">{% endif %} <div class="page__inner-wrap"> - {% unless page.has_header %} + {% unless page.header.type == 'overlay' or page.header.type == 'default' %} <header> {% if page.title %}<h1 id="page-title" class="page__title" itemprop="headline">{{ page.title | markdownify | remove: "<p>" | remove: "</p>" }}</h1>{% endif %} {% if page.read_time %} diff --git a/_pages/agenda.md b/_pages/agenda.md index 158a7fbdd74955da32a049f8d2242d1136518891..d060a0bd4b28e12a6b121a3984b95034dc9ea6a7 100644 --- a/_pages/agenda.md +++ b/_pages/agenda.md @@ -1,6 +1,9 @@ --- title: Agenda description: Agenda commun luminy.org +has_header: false +header: + type: default --- <iframe diff --git a/_pages/ccl/activites/lorem-ipsum.md b/_pages/ccl/activites/lorem-ipsum.md index a0b94947370b3553d63ac3b29c2b5d7bac715b74..8f5fb36d66c3bc68287f0cedd860015bb95b7535 100644 --- a/_pages/ccl/activites/lorem-ipsum.md +++ b/_pages/ccl/activites/lorem-ipsum.md @@ -3,7 +3,7 @@ last_modified_at: 2019-11-24T19:12:07.000+00:00 toc: true has_header: true header: - type: overlay + type: default overlay_title: true show_text: description color: "#AC6B6B" diff --git a/_pages/ccl/index.md b/_pages/ccl/index.md index aa0f2aa193d6d2db4c8ea00070642d7590502139..fb8b90a2161de3353eed15ae9c2f1adca47c70f4 100644 --- a/_pages/ccl/index.md +++ b/_pages/ccl/index.md @@ -1,8 +1,9 @@ --- title: Le CCL -no_title: true +has_header: true header: - image: assets/images/banniere-ccl-intime.png + type: image + fixed_image: assets/images/banniere-ccl-intime.png --- ## Le CCL, c'est nous ! C'est vous ! C'est tous ceux qui ont envie de faire, de partager et de proposer pour que bouge ce campus ! diff --git a/_pages/jardin/index.md b/_pages/jardin/index.md index 21a913a28ad7f2def922b23980ca1dedae30eea4..de09941163f448aca927d803b9a781d580a3fb50 100644 --- a/_pages/jardin/index.md +++ b/_pages/jardin/index.md @@ -1,11 +1,9 @@ --- title: Jardin Universitaire de Luminy -menu: - header: - title: Les pages du jardin - weight: 1 - identifier: jardin - +has_header: true +toc: true +header: + type: default --- # c'est le jardin diff --git a/_pages/jardin/paniers.md b/_pages/jardin/paniers.md index 3cee68c55b20d2b261c9d1a34dc639a4967f2e77..1bc78b15bd8fe32154455260a15927f40226b240 100644 --- a/_pages/jardin/paniers.md +++ b/_pages/jardin/paniers.md @@ -1,15 +1,9 @@ --- title: Les paniers bio ! last_modified_at: 2019-11-18T14:16:10.453Z -overlay_image: assets/images/banniere-bulles.png -classes: wide -menu: - footer: - weight: 3 - title: Les paniers bio - jardin: - weight: 1 - +has_header: true +header: + type: default --- Tous les jeudis, les paniers marseillais proposent des produits bio en direct de chez les producteurs ; légumes, fruits, œufs, pain, jus, vin, huile, olives, fruits secs, vinaigre, viande, fromages, ...