From d3396ce232c054f879619fd36ab24f79bed9e69e Mon Sep 17 00:00:00 2001
From: Yves Gatesoupe <yves@ygat.es>
Date: Wed, 15 Jul 2020 00:14:56 +0200
Subject: [PATCH] Contact navigation link on every pages Member list minor fix
 Moved member template to layouts folder

---
 src/_data/navigation.json                              |  2 +-
 .../{partials/components => layouts}/member.njk        |  5 +++--
 src/_includes/partials/components/contact-form.njk     |  2 +-
 src/_includes/partials/components/member-list.njk      |  4 ++--
 src/scss/components/_member-list.scss                  | 10 +++++-----
 5 files changed, 12 insertions(+), 11 deletions(-)
 rename src/_includes/{partials/components => layouts}/member.njk (90%)

diff --git a/src/_data/navigation.json b/src/_data/navigation.json
index 1504cff..2e0ef6b 100644
--- a/src/_data/navigation.json
+++ b/src/_data/navigation.json
@@ -22,7 +22,7 @@
     },
     {
       "text": "Nous contacter",
-      "url": "/nous-contacter",
+      "url": "#contact-form",
       "external": false
     }
   ]
diff --git a/src/_includes/partials/components/member.njk b/src/_includes/layouts/member.njk
similarity index 90%
rename from src/_includes/partials/components/member.njk
rename to src/_includes/layouts/member.njk
index eac2cd1..f3c1612 100644
--- a/src/_includes/partials/components/member.njk
+++ b/src/_includes/layouts/member.njk
@@ -4,7 +4,7 @@
 
 {% block content %}
   <main id="main-content" tabindex="-1">
-    <div class="[ wrapper member ]">
+    <section class="[ wrapper member ]">
       <article class="[ member__wrapper ]">
         <div>
           <h1>{{ name }}</h1>
@@ -31,6 +31,7 @@
         </div>
       </article>
       <a class="return-link" href="/equipe">Voir tous les membres</a>
-    </div>
+    </section>
+    {% include "partials/components/contact-form.njk" %}
   </main>
 {% endblock %}
diff --git a/src/_includes/partials/components/contact-form.njk b/src/_includes/partials/components/contact-form.njk
index 01dcccc..6b506a0 100644
--- a/src/_includes/partials/components/contact-form.njk
+++ b/src/_includes/partials/components/contact-form.njk
@@ -3,7 +3,7 @@
 <section class="[ form-container ]">
   <svg aria-hidden="true" viewBox="0 0 1440 131" width="auto" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill="#fff" d="M0 0h1440v131H0z"/><path d="M0 4.643l40-2.326c40-2.5 120-6.888 200 11.67 80 18.735 160 60.854 240 74.894 80 14.04 160 0 240-16.365 80-16.54 160-34.968 240-28.08 80 7.152 160 39.619 240 39.75 80-.131 160-32.598 200-49.139l40-16.365V131H0V4.643z" fill="#D6F253"/></svg>
   <div class="[ inner-wrapper ]">
-    <h2 class="[ contact-heading ]">Nous contacter</h2>
+    <h2 id="contact-form" class="[ contact-heading ]">Nous contacter</h2>
     <form name="contact" method="POST" data-netlify="true" action="/form/contact-form-handler.php">
       <ol class="[ field-list ]">
         {# <li class="[ field-list__field-group ]">
diff --git a/src/_includes/partials/components/member-list.njk b/src/_includes/partials/components/member-list.njk
index aa1038c..08e90a1 100644
--- a/src/_includes/partials/components/member-list.njk
+++ b/src/_includes/partials/components/member-list.njk
@@ -20,8 +20,8 @@
         {% endfor %}
         <li class="member-list__item info">
           <p>Vous êtes porteur d’un projet entrepreneurial en numérique et nouvelles technologies ?</p>
-          <a role="button" href="/nous-rejoindre" class="btn btn-primary">Rejoignez-nous
-            <svg width="18" height="14" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M17.602 5.823L12.05.376a1.357 1.357 0 00-1.875 0 1.295 1.295 0 000 1.84l3.278 3.235H1.326C.587 5.451 0 6.027 0 6.752s.587 1.302 1.326 1.302h12.127l-3.278 3.215a1.295 1.295 0 000 1.84 1.349 1.349 0 001.894 0l5.533-5.427c.246-.242.398-.576.398-.93 0-.353-.133-.687-.398-.93z" fill="#111"/></svg>
+          <a role="button" href="/nous-rejoindre" class="btn btn-secondary">Rejoignez-nous
+            <svg width="18" height="14" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M17.602 5.823L12.05.376a1.357 1.357 0 00-1.875 0 1.295 1.295 0 000 1.84l3.278 3.235H1.326C.587 5.451 0 6.027 0 6.752s.587 1.302 1.326 1.302h12.127l-3.278 3.215a1.295 1.295 0 000 1.84 1.349 1.349 0 001.894 0l5.533-5.427c.246-.242.398-.576.398-.93 0-.353-.133-.687-.398-.93z" fill="#fff"/></svg>
           </a>
         </li>
       </ol>
diff --git a/src/scss/components/_member-list.scss b/src/scss/components/_member-list.scss
index 7aea974..9dd52f6 100644
--- a/src/scss/components/_member-list.scss
+++ b/src/scss/components/_member-list.scss
@@ -20,11 +20,11 @@
     align-items: center;
     color: var(--color-dark);
     
-    a,
-    a:visited {
-      text-decoration: none;
-      color: var(--color-dark);
-    }
+    // a,
+    // a:visited {
+    //   text-decoration: none;
+    //   color: var(--color-dark);
+    // }
 
     img {
       border-radius: 50%;