From 26d65d499faa5df0e3a473c82e7da8538f42df0a Mon Sep 17 00:00:00 2001
From: pnu <6069449+pnu-s@users.noreply.github.com>
Date: Thu, 25 Jan 2024 23:17:27 +0100
Subject: [PATCH] Remove G1, old members and reorganize

---
 content/page/contribute.en.md | 18 ++----------------
 content/page/contribute.fr.md | 18 ++----------------
 content/page/who.en.md        | 28 +++++-----------------------
 content/page/who.fr.md        | 28 +++++-----------------------
 4 files changed, 14 insertions(+), 78 deletions(-)

diff --git a/content/page/contribute.en.md b/content/page/contribute.en.md
index 5f2e7a7..2383764 100644
--- a/content/page/contribute.en.md
+++ b/content/page/contribute.en.md
@@ -85,19 +85,6 @@ Membership is to be renewed every year. The membership fee remains free.
     </div>
 </div>
 
-<div class="row">
-    <div class="col-md-12 text-center">
-        <div class="card-body">
-            <h5>Ğ1</h5>
-            <a href="duniter:DegD5SFHyPDeVCjxG6v7DUqbJGipXoaS8rVQxMQHUZEy?label=exodus">
-                <samp class="small">DegD5SFHyPDeVCjxG6v7DUqbJGipXoaS8rVQxMQHUZEy</samp>
-                <br>
-                <img src="/media/page/contribute/duniter.png" width="120" alt="QR code and Duniter link" caption="QR code and Duniter link">
-            </a>
-        </div>
-    </div>
-</div>
-
 <div class="row">
     <div class="col-md-4 mb-4 text-center">
         <a href="https://liberapay.com/exodus/donate">
@@ -118,7 +105,8 @@ Membership is to be renewed every year. The membership fee remains free.
 
 ## And help us by spreading the word about us
 
-The main interest of Exodus Privacy is to <b>make people aware of the tracking done by mobile applications</b>. To do so, we animate 3 social network accounts and a video channel:
+The main interest of Exodus Privacy is to <b>make people aware of the tracking done by mobile applications</b>. To do so, we animate 2 social network accounts and a video channel:
+
 <div class="row justify-content-md-center">
     <div class="col-md-4 text-center">
         <i class="fab fa-3x fa-mastodon mt-2 ml-auto mr-auto text-primary"></i>
@@ -134,8 +122,6 @@ The main interest of Exodus Privacy is to <b>make people aware of the tracking d
             <a href="https://facebook.com/exodusprivacy" class="btn btn-primary">Follow us!</a>
         </div>
     </div>
-</div>
-<div class="row justify-content-md-center">
     <div class="col-md-4 text-center">
         <i class="fab fa-3x fa-youtube-square mt-2 ml-auto mr-auto text-primary"></i>
         <div class="card-body">
diff --git a/content/page/contribute.fr.md b/content/page/contribute.fr.md
index dd0e04f..0b24af6 100644
--- a/content/page/contribute.fr.md
+++ b/content/page/contribute.fr.md
@@ -85,19 +85,6 @@ L’adhésion est à renouveler tous les ans. La cotisation, elle, reste gratuit
     </div>
 </div>
 
-<div class="row">
-    <div class="col-md-12 text-center">
-        <div class="card-body">
-            <h5>Ğ1</h5>
-            <a href="duniter:DegD5SFHyPDeVCjxG6v7DUqbJGipXoaS8rVQxMQHUZEy?label=exodus">
-                <samp class="small">DegD5SFHyPDeVCjxG6v7DUqbJGipXoaS8rVQxMQHUZEy</samp>
-                <br>
-                <img src="/media/page/contribute/duniter.png" width="120" alt="QR code et lien Duniter" caption="QR code et lien Duniter">
-            </a>
-        </div>
-    </div>
-</div>
-
 <div class="row">
     <div class="col-md-4 mb-4 text-center">
         <a href="https://liberapay.com/exodus/donate">
@@ -118,7 +105,8 @@ L’adhésion est à renouveler tous les ans. La cotisation, elle, reste gratuit
 
 ## Nous aider à nous faire connaître
 
-Le but principal d’Exodus Privacy est d’<b>avertir les utilisateurs du pistage effectué par les applications mobiles</b>. Pour ce faire, nous animons 3 comptes sur les réseaux sociaux et une chaîne vidéo :
+Le but principal d’Exodus Privacy est d’<b>avertir les utilisateurs du pistage effectué par les applications mobiles</b>. Pour ce faire, nous animons 2 comptes sur les réseaux sociaux et une chaîne vidéo :
+
 <div class="row justify-content-md-center">
     <div class="col-md-4 text-center">
         <i class="fab fa-3x fa-mastodon mt-2 ml-auto mr-auto text-primary"></i>
@@ -134,8 +122,6 @@ Le but principal d’Exodus Privacy est d’<b>avertir les utilisateurs du pista
             <a href="https://facebook.com/exodusprivacy" class="btn btn-primary">Suivez-nous !</a>
         </div>
     </div>
-</div>
-<div class="row justify-content-md-center">
     <div class="col-md-4 text-center">
         <i class="fab fa-3x fa-youtube-square mt-2 ml-auto mr-auto text-primary"></i>
         <div class="card-body">
diff --git a/content/page/who.en.md b/content/page/who.en.md
index 1f65632..c1df1e8 100644
--- a/content/page/who.en.md
+++ b/content/page/who.en.md
@@ -11,16 +11,7 @@ Exodus Privacy is a French (1901 law) non-profit organization. This organization
 ## Main contributors
 
 <div class="row justify-content-md-center">
-    <div class="col-md-3 mt-3 text-center">
-        <img class="w-25 rounded-circle" src="/media/avatar/capslock.jpg">
-        <div class="card-body">
-            <h6 class="card-title"><code>CapsLock</code></h6>
-            <a rel="me" href="https://toot.aquilenet.fr/@CapsLock"><i class="fab fa-2x fa-mastodon"></i></a>
-            <a href="https://twitter.com/TheRealCapsLock"><i class="fab fa-2x fa-twitter"></i></a>
-            <a href="https://github.com/TheCapsLock"><i class="fab fa-github fa-2x"></i></a>
-        </div>
-    </div>
-    <div class="col-md-3 mt-3 text-center">
+    <div class="col-lg-4 col-sm-6 col-12 mt-3 text-center">
         <img class="w-25 rounded-circle" src="/media/avatar/codimp.jpg">
         <div class="card-body">
             <h6 class="card-title"><code>Codimp</code></h6>
@@ -30,7 +21,7 @@ Exodus Privacy is a French (1901 law) non-profit organization. This organization
             <p class="small">Guardian of εxodus's infrastructure, board member, Secretary</p>
         </div>
     </div>
-    <div class="col-md-3 mt-3 text-center">
+    <div class="col-lg-4 col-sm-6 col-12 mt-3 text-center">
         <img class="w-25 rounded-circle" src="/media/avatar/imriel.png">
         <div class="card-body">
             <h6 class="card-title"><code>Imriel</code></h6>
@@ -39,7 +30,7 @@ Exodus Privacy is a French (1901 law) non-profit organization. This organization
             <p class="small">Board member, account manager</p>
         </div>
     </div>
-    <div class="col-md-3 mt-3 text-center">
+    <div class="col-lg-4 col-sm-6 col-12 mt-3 text-center">
         <img class="w-25 rounded-circle" src="/media/avatar/lovis_ix.png">
         <div class="card-body">
             <h6 class="card-title"><code>Lovis_IX</code></h6>
@@ -48,16 +39,7 @@ Exodus Privacy is a French (1901 law) non-profit organization. This organization
             <p class="small">King of our servers and backups, board member, current President</p>
         </div>
     </div>
-    <div class="col-md-3 mt-3 text-center">
-        <img class="w-25 rounded-circle" src="/media/avatar/metal_pou.jpg">
-        <div class="card-body">
-            <h6 class="card-title"><code>MeTaL_PoU</code></h6>
-            <a rel="me" href="https://pouet.chapril.org/@JulieBrillet"><i class="fab fa-2x fa-mastodon"></i></a>
-            <a href="https://twitter.com/metal_pou"><i class="fab fa-2x fa-twitter"></i></a>
-            <p class="small">President of Exodus Privacy from 2018 to 2021 and creator of pedagogic contents</p>
-        </div>
-    </div>
-    <div class="col-md-3 mt-3 text-center">
+    <div class="col-lg-4 col-sm-6 col-12 mt-3 text-center">
         <img class="w-25 rounded-circle" src="/media/avatar/pnu.jpg">
         <div class="card-body">
             <h6 class="card-title"><code>pnu</code></h6>
@@ -67,7 +49,7 @@ Exodus Privacy is a French (1901 law) non-profit organization. This organization
             <p class="small">In charge of εxodus development, board member</p>
         </div>
     </div>
-    <div class="col-md-3 mt-3 text-center">
+    <div class="col-lg-4 col-sm-6 col-12 mt-3 text-center">
         <img class="w-25 rounded-circle" src="/media/avatar/u039b.jpg">
         <div class="card-body">
             <h6 class="card-title"><code>U039b</code></h6>
diff --git a/content/page/who.fr.md b/content/page/who.fr.md
index abb3e64..cff1c46 100644
--- a/content/page/who.fr.md
+++ b/content/page/who.fr.md
@@ -11,16 +11,7 @@ Exodus Privacy est une association française à but non-lucratif, régie par la
 ## Principaux contributeurs et principales contributrices
 
 <div class="row justify-content-md-center">
-    <div class="col-xl-3 col-lg-4 col-md-6 col-12 mt-3 text-center">
-        <img class="w-25 rounded-circle" src="/media/avatar/capslock.jpg">
-        <div class="card-body">
-            <h6 class="card-title"><code>CapsLock</code></h6>
-            <a rel="me" href="https://toot.aquilenet.fr/@CapsLock"><i class="fab fa-2x fa-mastodon"></i></a>
-            <a href="https://twitter.com/TheRealCapsLock"><i class="fab fa-2x fa-twitter"></i></a>
-            <a href="https://github.com/TheCapsLock"><i class="fab fa-github fa-2x"></i></a>
-        </div>
-    </div>
-    <div class="col-xl-3 col-lg-4 col-md-6 col-12 mt-3 text-center">
+    <div class="col-lg-4 col-sm-6 col-12 mt-3 text-center">
         <img class="w-25 rounded-circle" src="/media/avatar/codimp.jpg">
         <div class="card-body">
             <h6 class="card-title"><code>Codimp</code></h6>
@@ -30,7 +21,7 @@ Exodus Privacy est une association française à but non-lucratif, régie par la
             <p class="small">Gardien·ne de l’infrastructure d’εxodus, membre du bureau, secrétaire</p>
         </div>
     </div>
-    <div class="col-xl-3 col-lg-4 col-md-6 col-12 mt-3 text-center">
+    <div class="col-lg-4 col-sm-6 col-12 mt-3 text-center">
         <img class="w-25 rounded-circle" src="/media/avatar/imriel.png">
         <div class="card-body">
             <h6 class="card-title"><code>Imriel</code></h6>
@@ -39,7 +30,7 @@ Exodus Privacy est une association française à but non-lucratif, régie par la
             <p class="small">Membre du bureau, trésorier</p>
         </div>
     </div>
-    <div class="col-xl-3 col-lg-4 col-md-6 col-12 mt-3 text-center">
+    <div class="col-lg-4 col-sm-6 col-12 mt-3 text-center">
         <img class="w-25 rounded-circle" src="/media/avatar/lovis_ix.png">
         <div class="card-body">
             <h6 class="card-title"><code>Lovis_IX</code></h6>
@@ -48,16 +39,7 @@ Exodus Privacy est une association française à but non-lucratif, régie par la
             <p class="small">Roi des serveurs et des sauvegardes, membre du bureau, président en exercice</p>
         </div>
     </div>
-    <div class="col-xl-3 col-lg-4 col-md-6 col-12 mt-3 text-center">
-        <img class="w-25 rounded-circle" src="/media/avatar/metal_pou.jpg">
-        <div class="card-body">
-            <h6 class="card-title"><code>MeTaL_PoU</code></h6>
-            <a rel="me" href="https://pouet.chapril.org/@JulieBrillet"><i class="fab fa-2x fa-mastodon"></i></a>
-            <a href="https://twitter.com/metal_pou"><i class="fab fa-2x fa-twitter"></i></a>
-            <p class="small">Présidente d’Exodus Privacy de 2018 à 2021 et créatrice des contenus pédagogiques</p>
-        </div>
-    </div>
-    <div class="col-xl-3 col-lg-4 col-md-6 col-12 mt-3 text-center">
+    <div class="col-lg-4 col-sm-6 col-12 mt-3 text-center">
         <img class="w-25 rounded-circle" src="/media/avatar/pnu.jpg">
         <div class="card-body">
             <h6 class="card-title"><code>pnu</code></h6>
@@ -67,7 +49,7 @@ Exodus Privacy est une association française à but non-lucratif, régie par la
             <p class="small">En charge du dévelopement d’εxodus, membre du bureau</p>
         </div>
     </div>
-    <div class="col-xl-3 col-lg-4 col-md-6 col-12 mt-3 text-center">
+    <div class="col-lg-4 col-sm-6 col-12 mt-3 text-center">
         <img class="w-25 rounded-circle" src="/media/avatar/u039b.jpg">
         <div class="card-body">
             <h6 class="card-title"><code>U039b</code></h6>