Merge branch 'develop'

_data/authors.yml

@@ -43,7 +43,7 @@ authors:
   og_image: ''
 - name: FSE Luminy
   prefix: fse
-  avatar: "/assets/images/authors-logo/fse-transparent.png"
+  avatar: "/assets/images/authors-logo/fse.png"
   bio: INFORMER les étudiants, DÉFENDRE leurs droits, et créer la SOLIDARITÉ sur nos
     campus !
   location: Cité U & Hexagone

_layouts/splash.html

@@ -15,8 +15,6 @@ layout: default
     {% if page.date %}<meta itemprop="datePublished" content="{{ page.date | date_to_xmlschema }}">{% endif %}
     {% if page.last_modified_at %}<meta itemprop="dateModified" content="{{ page.last_modified_at | date_to_xmlschema }}">{% endif %}
 
-    <section class="page__content" itemprop="text">
       {{ content }}
-    </section>
   </article>
 </div>

_pages/index.md

@@ -5,7 +5,7 @@ has_header: true
 header:
   type: image
   overlay_image: assets/images/puget-fleuri.png
-  fixed_image: "/assets/images/banniere-puget-orange.jpg"
+  fixed_image: "/assets/images/banniere-hexagone.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
@@ -28,132 +28,136 @@ last_modified_at: 2019-12-01 00:00:00 +0100
   }
 </script>
 
-
-<style type="text/css" media="screen">
-/* Add style rules here */
-.cards-list {
-  z-index: 0;
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-  flex-wrap: wrap;
-}
-
-.card {
-  margin: 30px auto;
-  width: 300px;
-  height: 300px;
-  border-radius: 40px;
-  box-shadow: 5px 5px 30px 7px rgba(0,0,0,0.25), -5px -5px 30px 7px rgba(0,0,0,0.22);
-  cursor: pointer;
-  transition: 0.4s;
-}
-
-.card .card_image {
-  width: inherit;
-  height: inherit;
-  border-radius: 40px;
-}
-
-.card .card_image img {
-  width: inherit;
-  height: inherit;
-  border-radius: 40px;
-  object-fit: cover;
-}
-
-.card .card_title {
-  text-align: center;
-  border-radius: 0px 0px 40px 40px;
-  font-family: sans-serif;
-  font-weight: bold;
-  font-size: 30px;
-  margin-top: -80px;
-  height: 40px;
-}
-
-.card:hover {
-  transform: scale(0.9, 0.9);
-  box-shadow: 5px 5px 30px 15px rgba(0,0,0,0.25), 
-    -5px -5px 30px 15px rgba(0,0,0,0.22);
-}
-
-.title-white {
-  color: white;
-}
-
-.title-black {
-  color: black;
-}
-
-@media all and (max-width: 500px) {
-  .card-list {
-    /* On small screens, we are no longer using row direction but column */
-    flex-direction: column;
+<style type="text/css">
+html {
+  background-color: #ebebe0;
 }
+.greedy-nav {
+  background-color: #ebebe0;
 }
 </style>
 
-<div class="cards-list">
 
-<a href="https://ccl.test.luminy.org">
+<div class="cards">
+
+  <div class="cards_item">
     <div class="card">
-    <div class="card_image"><img src="assets/images/authors-logo/logo-ccl-nb.png" /></div>
+      <div class="card_image">
+        <img src="assets/images/authors-logo/logoCCL.png">
+      </div>
+      <div class="card_content">
+        <h2 class="card_title">
+          Centre Culturel
+        </h2>
+        <div class="card_text">
+          Propose différentes initiatives et se propose d'aider à en monter de nouvelles !
+        </div>
+        <a href="https://ccl.test.luminy.org/" class="card_btn">Plus d'infos</a>
+      </div>
+    </div>
   </div>
-</a>
 
-<a href="jardin">
+  <div class="cards_item">
     <div class="card">
       <div class="card_image">
-      <img src="assets/images/authors-logo/logo-jardin.png" />
+        <img src="assets/images/authors-logo/mouton-millepattes.png">
+      </div>
+      <div class="card_content">
+        <h2 class="card_title">
+          ALLIÉ
+        </h2>
+        <div class="card_text">
+          Association Luminyenne de Lutte et d'Information des Étudiants
+        </div>
+        <a href="allie/" class="card_btn">Plus d'infos</a>
       </div>
-    <div class="card_title title-black">
-      <p>Jardin Universitaire</p>
     </div>
   </div>
-</a>
 
-<a href="club-science">
+  <div class="cards_item">
     <div class="card">
       <div class="card_image">
-      <img src="assets/images/authors-logo/logo-club-sciences.jpeg" />
+        <img src="assets/images/authors-logo/logo-jardin.png">
+      </div>
+      <div class="card_content">
+        <h2 class="card_title">
+          Jardin Universitaire
+        </h2>
+        <div class="card_text">
+          Le JUDL est un jardin partagé chaleureux et ouvert à tous !
+        </div>
+        <a href="jardin/" class="card_btn">Plus d'infos</a>
       </div>
-    <div class="card_title title-white">
-      <p>Club de Science</p>
     </div>
   </div>
-</a>
 
-<a href="allie">
+  <div class="cards_item">
     <div class="card">
       <div class="card_image">
-      <img src="assets/images/authors-logo/allie.png" />
+        <img src="assets/images/authors-logo/comnsea.png">
+      </div>
+      <div class="card_content">
+        <h2 class="card_title">
+          Com & Sea
+        </h2>
+        <div class="card_text">
+            Association étudiante d'Océanologie.
+            Dynamise la vie étudiante et créé un réseau entre les étudiants, anciens étudiants et professionnels du monde de la mer.
+        </div>
+        <a href="comnsea/" class="card_btn">Plus d'infos</a>
+      </div>
     </div>
   </div>
-</a>
 
-<a href="fse">
+  <div class="cards_item">
     <div class="card">
       <div class="card_image">
-      <img src="assets/images/authors-logo/fse-transparent.png" />
+        <img src="assets/images/authors-logo/logo-club-sciences.png">
+      </div>
+      <div class="card_content">
+        <h2 class="card_title">
+          Club de Science
+        </h2>
+        <div class="card_text">
+          Organisation de conférences, de cours d'histoire et de philosophie des sciences, du tutorat...
+        </div>
+        <a href="club-science/" class="card_btn">Plus d'infos</a>
+      </div>
     </div>
   </div>
-</a>
 
-<a href="comnsea">
+  <div class="cards_item">
     <div class="card">
       <div class="card_image">
-      <img src="assets/images/authors-logo/logo-com.png" />
+        <img src="assets/images/authors-logo/fse.png">
+      </div>
+      <div class="card_content">
+        <h2 class="card_title">
+          FSE
+        </h2>
+        <div class="card_text">
+          INFORMER les étudiants, DÉFENDRE leurs droits, et créer la SOLIDARITÉ sur nos campus !
+        </div>
+        <a href="fse/" class="card_btn">Plus d'infos</a>
+      </div>
     </div>
   </div>
-</a>
 
-<a href="cafe-des-langues">
+  <div class="cards_item">
     <div class="card">
       <div class="card_image">
-      <img src="assets/images/authors-logo/cafe-des-langues.png" />
+        <img src="assets/images/authors-logo/cafe-des-langues.png">
+      </div>
+      <div class="card_content">
+        <h2 class="card_title">
+          Café des Langues
+        </h2>
+        <div class="card_text">
+          Venez converser autour d’un bon café et dans une ambiance très conviviale !
+        </div>
+        <a href="cafe-des-langues/" class="card_btn">Plus d'infos</a>
+      </div>
     </div>
   </div>
-</a>
 
 </div>

_sass/minimal-mistakes.scss

@@ -39,6 +39,7 @@
 @import "minimal-mistakes/sidebar";
 @import "minimal-mistakes/print";
 
+@import "minimal-mistakes/cards";
 
 @font-face {
   font-family: "Tempus Sans ITC";

_sass/minimal-mistakes/_cards.scss

+/* Font */
+
+a.card_btn {
+  color: #000000;
+  text-decoration: none;
+  text-align: center;
+  padding: 0.8rem;
+  font-size: 15px;
+  text-transform: uppercase;
+  border-radius: 8px;
+  font-weight: 400;
+  display: block;
+  width: 100%;
+  cursor: pointer;
+  border: 2px solid rgba(0.2, 0.2, 0.2, 0.2);
+  background: transparent;
+  margin-top: auto;
+}
+
+a.card_btn:hover {
+  background-color: rgba(255, 255, 255, 0.45);
+}
+
+.cards {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: center;
+  margin: 0;
+  padding: 0;
+}
+
+.cards_item {
+  display: flex;
+  padding: 1rem;
+}
+
+@media (min-width: 40rem) {
+  .cards_item {
+    width: 50%;
+  }
+}
+
+@media (min-width: 56rem) {
+  .cards_item {
+    width: 33.3333%;
+  }
+}
+
+.card {
+  background-color: #cdcdb1;
+  border-radius: 0.3rem;
+  box-shadow: 0 20px 40px -14px rgba(0, 0, 0, 0.25);
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+}
+
+.card_image {
+  height: 15rem;
+  padding: 4%;
+  border-radius: 0.3rem;
+  overflow: hidden;
+  justify-content: center;
+  align-items: center;
+  img {
+    object-fit: cover;
+    min-height: 100%;
+    min-width: 100%;
+    max-height: 100%;
+    max-width: 100%;
+  }
+}
+
+.card_content {
+  display: flex;
+  flex-direction: column;
+  flex-grow: 1;
+  padding: 1rem;
+  background-color: #cdcdb1
+  // background: linear-gradient(to bottom left, #EF8D9C 40%, #FFC39E 100%);
+}
+
+.card_title {
+  font-size: 1.1rem;
+  font-weight: 700;
+  padding-bottom: 0.5em;
+  border-bottom: 1px solid $border-color;
+  letter-spacing: 1px;
+  text-transform: capitalize;
+  margin: 0px;
+}
+
+.card_text {
+  font-size: 0.875rem;
+  line-height: 1.5;
+  margin-top: 1rem;
+  margin-bottom: 1.25rem;
+  font-weight: 400;
+}

assets/images/authors-logo/allie.png

 version https://git-lfs.github.com/spec/v1
-oid sha256:2dd830d69745a0b9461cc738eb0348d1e76976f14921580a85716c779b6fa052
-size 69106
+oid sha256:cb2c9ed62687d917de699a67e9caed15254c4fef23de338478b2827da2fc68c7
+size 67430

assets/images/authors-logo/cafe-des-langues.png

 version https://git-lfs.github.com/spec/v1
-oid sha256:b1164d02d0d30522ac8d4dda7750922071a7b8f179aefefddefb0cd7abe2a9a9
-size 301671
+oid sha256:08b8b1f105299e221673234daf2c1073d7cb1948ae4f4e506adcbaf98da4f167
+size 297121

assets/images/authors-logo/fse-transparent.png → assets/images/authors-logo/comnsea.png

 version https://git-lfs.github.com/spec/v1
-oid sha256:135209d828aede4c8c82b7f940fb970d0f2038fbea963c831f4417e50ce800fc
-size 107381
+oid sha256:c6441fcf10872ff87ece180670635c7ecf70cf91688e4b7a9693bec1a9a7b1e6
+size 546744

assets/images/authors-logo/fse.png

+version https://git-lfs.github.com/spec/v1
+oid sha256:45772f485c217a4cf28c39aa45c84a5e36a91ae3331857e90136a8dc377f74cd
+size 105158

assets/images/authors-logo/logo-ccl.png

 version https://git-lfs.github.com/spec/v1
-oid sha256:86edc4898bad93fbef6189db7056b58f1ef65d210c8bc4b4fa87121ac1641c27
-size 446747
+oid sha256:ad254198d1ef871c477d2a711269b486e65e8cf4d40554d1b231a25a12786f77
+size 449205

assets/images/authors-logo/logo-club-sciences.jpeg

 version https://git-lfs.github.com/spec/v1
-oid sha256:3d9109d3b7eb9739685a445a3976addc7c53cf8552fed7a4a85e3c451f1d608e
-size 51540
+oid sha256:f76964a15aca888c461776011e7e3599e467f01421701ac37f5cbb8449848975
+size 41222

assets/images/authors-logo/logo-club-sciences.png

+version https://git-lfs.github.com/spec/v1
+oid sha256:f3661b7f97d4c615c7f91cb57f39f2f185e3591d97f514c5a0b79898ed276c80
+size 232869

assets/images/authors-logo/logo-ccl-nb.png → assets/images/authors-logo/logoCCL.png

 version https://git-lfs.github.com/spec/v1
-oid sha256:5451dee5884e0d1149754a6646b0a3fe70675b12fa1ec17d7e41c9dd1c3e5295
-size 43212
+oid sha256:da3ef5c0d70827b985140a79794d4f984fc957953ddbf54ba6ef5dc47541cdaa
+size 45112

assets/images/authors-logo/logo-com.png → assets/images/authors-logo/mouton-ecrivain.jpg

 version https://git-lfs.github.com/spec/v1
-oid sha256:b810582b91d3c510b0f99179c42458e9b8f2bf31e0bd65fb366cb252fff2ff71
-size 60137
+oid sha256:e4e4b2fa68e766d1090222059feffe35df9f2b22845227d54ae435dd44b98dd5
+size 26220

assets/images/authors-logo/mouton-millepattes.jpg

+version https://git-lfs.github.com/spec/v1
+oid sha256:89a00b3b3e3bc7b43f84030028da5ca3801d89ba365db312922cf7e4c991167d
+size 238752

assets/images/authors-logo/mouton-millepattes.png

+version https://git-lfs.github.com/spec/v1
+oid sha256:77d4358c0fee410ba22e2e569536b3b9eead7685edd075c200299268c10634ba
+size 355331