diff --git a/_config.yml b/_config.yml
index bea927f13a77bc80c99b88f628bb6495582a4e27..748bafb782eaba6dbc5087bccbcd31c98d7e9188 100644
--- a/_config.yml
+++ b/_config.yml
@@ -120,29 +120,6 @@ footer:
url: "/contribute/"
- label: "Contact webmaster"
url: "/contact/"
- # - label: "Twitter"
- # icon: "fa fa-twitter"
- # url:
- # - label: "Facebook"
- # icon: "fa fa-facebook"
- # url: "https://facebook.com/CCLuminy"
- # - label: "HelloAsso"
- # icon: "fa fa-users"
- # url: "https://www.helloasso.com/associations/centre-culturel-de-luminy"
- # - label: "GitHub"
- # icon: "fa fa-github"
- # url: "https://github.com/CCLuminy/CCL-site"
- # - label: "À propos"
- # url: "/contacts/#fonctionnement-associatif"
- # - label: "GitLab"
- # icon: "fa fa-gitlab"
- # url:
- # - label: "Bitbucket"
- # icon: "fa fa-bitbucket"
- # url:
- # - label: "Instagram"
- # icon: "fa fa-instagram"
- # url:
# Reading Files
diff --git a/_data/authors.yml b/_data/authors.yml
index 7d42e919d7ee6cd990d9557b9f8cacbad05b9fd1..88f666314b709025f25ca943a6fdeea780e58632 100644
--- a/_data/authors.yml
+++ b/_data/authors.yml
@@ -10,18 +10,20 @@ authors:
email: ''
facebook: ''
helloasso: ''
+
- name: Centre Culturel de Luminy
prefix: ccl
avatar: "/assets/images/authors-logo/remi.png"
og_image: "/assets/images/authors-logo/logo-ccl.png"
banner: "/assets/images/banniere-ccl-intime.png"
bio: Animer, partager, avancer, s'améliorer, s'amuser
- # location: Luminy
+ location: Luminy
email: centre-culturel@luminy.org
facebook: CCLuminy
instagram: centrecultureldeluminy
twitter: CCLuminy
helloasso: centre-culturel-de-luminy
+
- name: Jardin Universitaire
prefix: jardin
avatar: "/assets/images/authors-logo/logo-jardin.png"
@@ -33,6 +35,7 @@ authors:
helloasso: jardin-universitaire-de-luminy
links:
og_image: ''
+
- name: Club de Science Luminy
prefix: club-science
avatar: "/assets/images/authors-logo/logo-club-sciences.jpeg"
@@ -43,6 +46,7 @@ authors:
banner: ''
helloasso: ''
og_image: ''
+
- name: FSE Luminy
prefix: fse
avatar: "/assets/images/authors-logo/fse-transparent.png"
@@ -54,6 +58,7 @@ authors:
email: ''
helloasso: ''
og_image: ''
+
- name: Café des Langues
prefix: cafe-des-langues
avatar: "/assets/images/authors-logo/cafe-des-langues.png"
@@ -66,6 +71,7 @@ authors:
banner: ''
helloasso: ''
og_image: ''
+
- name: ALLIÉ
prefix: allie
avatar: "/assets/images/authors-logo/allie.png"
@@ -78,6 +84,7 @@ authors:
banner: ''
helloasso: ''
og_image: ''
+
- name: Com&Sea
prefix: comnsea
avatar: "/assets/images/authors-logo/logo-com.png"
diff --git a/_data/navigation.yml b/_data/navigation.yml
index ee54453801277d76b8226d69412166e11a71157e..011094a5e70d152391a7ea5274ad0f805bacc551 100644
--- a/_data/navigation.yml
+++ b/_data/navigation.yml
@@ -12,8 +12,8 @@ nav:
- title: Activités
url: "/activites/"
children:
- - title: Concerts et festivals
- url: "/activites/concerts/"
+ - title: Distributions de pain
+ url: "/activites/distrib/"
- title: Toukouleur
url: "/activites/toukouleur/"
- title: Les jeudis du CCL
diff --git a/_includes/footer/author-profile.html b/_includes/footer/author-profile.html
new file mode 100644
index 0000000000000000000000000000000000000000..5f5a1991b97d6ef467c65e25455a6df45700a839
--- /dev/null
+++ b/_includes/footer/author-profile.html
@@ -0,0 +1,111 @@
+<!-- {% assign author = page.author | default: page.authors[0] | default: site.author %} -->
+{% assign author = site.data.authors.authors | where: "prefix", site.author | first %}
+
+<div itemscope itemtype="https://schema.org/Person">
+
+ {% if author.avatar %}
+ <div class="footers-logo">
+ {% if author.avatar contains "://" %}
+ {% assign author_src = author.avatar %}
+ {% else %}
+ {% assign author_src = author.avatar | relative_url %}
+ {% endif %}
+
+ {% if author.home %}
+ {% if author.home contains "://" %}
+ {% assign author_link = author.home %}
+ {% else %}
+ {% assign author_link = author.home | relative_url %}
+ {% endif %}
+ <a href="{{ author_link }}">
+ <img src="{{ author_src }}" alt="{{ author.name }}" itemprop="image">
+ </a>
+ {% else %}
+ <img src="{{ author_src }}" alt="{{ author.name }}" itemprop="image">
+ {% endif %}
+ </div>
+ {% endif %}
+
+ <div class="footers-info mt-3">
+ <h3 style="display: none" itemprop="name">{{ author.name }}</h3>
+ {% if author.bio %}
+ <div class="author__bio" itemprop="description">
+ {{ author.bio | markdownify }}
+ </div>
+ {% endif %}
+ </div>
+
+ <ul class="social">
+ {% if author.location %}
+ <li style="display: none" itemprop="homeLocation" itemscope itemtype="https://schema.org/Place">
+ <i class="fa fa-map-marker-alt fa-fw" aria-hidden="true"></i> <span itemprop="name">{{ author.location }}</span>
+ </li>
+ {% endif %}
+
+ {% if author.facebook %}
+ <li>
+ <a href="https://www.facebook.com/{{ author.facebook }}" itemprop="sameAs" rel="nofollow noopener noreferrer">
+ <i class="fa fa-facebook-square fa-fw" aria-hidden="true"></i>
+ </a>
+ </li>
+ {% endif %}
+
+ {% if author.linkedin %}
+ <li>
+ <a href="https://www.linkedin.com/in/{{ author.linkedin }}" itemprop="sameAs" rel="nofollow noopener noreferrer">
+ <i class="fa fa-linkedin fa-fw" aria-hidden="true"></i>
+ </a>
+ </li>
+ {% endif %}
+
+ {% if author.instagram %}
+ <li>
+ <a href="https://instagram.com/{{ author.instagram }}" itemprop="sameAs" rel="nofollow noopener noreferrer">
+ <i class="fa fa-instagram fa-fw" aria-hidden="true"></i>
+ </a>
+ </li>
+ {% endif %}
+
+ {% if author.twitter %}
+ <li>
+ <a href="https://twitter.com/{{ author.twitter }}" itemprop="sameAs" rel="nofollow noopener noreferrer">
+ <i class="fa fa-twitter fa-fw" aria-hidden="true"></i>
+ </a>
+ </li>
+ {% endif %}
+
+ {% if author.helloasso %}
+ <li>
+ <a href="https://www.helloasso.com/associations/{{ author.helloasso }}" itemprop="sameAs" rel="nofollow noopener noreferrer">
+ <i class="fa fa-users fa-fw" aria-hidden="true"></i>
+ </a>
+ </li>
+ {% endif %}
+
+ {% if author.email %}
+ <li>
+ <a href="mailto:{{ author.email }}">
+ <meta itemprop="email" content="{{ author.email }}" />
+ <i class="fa fa-envelope fa-fw" aria-hidden="true"></i>
+ </a>
+ </li>
+ {% endif %}
+
+ {% if author.pinterest %}
+ <li>
+ <a href="https://www.pinterest.com/{{ author.pinterest }}" itemprop="sameAs" rel="nofollow noopener noreferrer">
+ <i class="fa fa-pinterest fa-fw" aria-hidden="true"></i>
+ </a>
+ </li>
+ {% endif %}
+
+ {% if author.soundcloud %}
+ <li>
+ <a href="https://soundcloud.com/{{ author.soundcloud }}" itemprop="sameAs" rel="nofollow noopener noreferrer">
+ <i class="fa fa-soundcloud fa-fw" aria-hidden="true"></i>
+ </a>
+ </li>
+ {% endif %}
+
+ </ul>
+</div>
diff --git a/_includes/footer/custom.html b/_includes/footer/custom.html
index 8ca92cad68a8f37b7d2e473c46d8fbb559c76331..34a0076a6834499ede7c12712244493380b87810 100644
--- a/_includes/footer/custom.html
+++ b/_includes/footer/custom.html
@@ -1,3 +1,86 @@
-<!-- start custom footer snippets -->
+<!-- A large size static footer example -->
+<!-- https://www.jquery-az.com/bootstrap4/demo.php?ex=77.0_3 -->
-<!-- end custom footer snippets -->
+<footer>
+ <div class="footer" id="footer">
+ <div class="container">
+ <div class="row">
+
+
+ <div class="col-xs-12 col-sm-6 col-md-4 footers-one">
+ {% include footer/author-profile.html %}
+ </div>
+
+ {% assign navigation = site.data.navigation.nav %}
+ {% for nav in navigation %}
+ <div class="col-lg-2 col-md-3 col-sm-4 col-xs-6">
+ {% if nav.url %}
+ {% if nav.url contains "://" %}
+ {% assign nav_url = nav.url %}
+ {% else %}
+ {% assign nav_url = nav.url | relative_url %}
+ {% endif %}
+
+ <!-- <h3><a href="{{ nav_url }}">{{ nav.title }}</a></h3> -->
+ <h3>{{ nav.title }}</h3>
+ {% else %}
+ <h3>{{ nav.title }}</h3>
+ {% endif %}
+
+ {% if nav.children != null %}
+ <ul>
+ {% for child in nav.children %}
+ {% if child.url contains "://" %}
+ {% assign child_url = child.url %}
+ {% else %}
+ {% assign child_url = child.url | relative_url %}
+ {% endif %}
+
+ <li><a href="{{ child_url }}">{{ child.title }}</a></li>
+ {% endfor %}
+ </ul>
+ {% endif %}
+ </div>
+ {% endfor %}
+
+ <div class="col-lg-2 col-md-3 col-sm-4 col-xs-6">
+ <h3> About </h3>
+ <ul>
+ <li> <a href="#"> Our Company </a> </li>
+ <li> <a href="#"> About Us </a> </li>
+ <li> <a href="#"> Terms of Services </a> </li>
+ <li> <a href="#"> Our Team </a> </li>
+ </ul>
+ </div>
+ <div class="col-lg-2 col-md-3 col-sm-4 col-xs-6">
+ <h3> Contact </h3>
+ <ul>
+ <li> <a href="#"> Contact Marketing </a> </li>
+ <li> <a href="#"> Contact Sales </a> </li>
+ <li> <a href="#"> Contact HR </a> </li>
+ <li> <a href="#"> Contact Admin </a> </li>
+ </ul>
+ </div>
+
+ <div class="col-lg-4 col-md-6 col-sm-8 col-xs-12 ">
+ <h3> Suivez-nous </h3>
+ <ul>
+ <li>Inscrivez votre mail pour nous suivre</li>
+ <li>
+ <div class="input-group">
+ <input type="text" class="form-control" placeholder="Email ">
+ <div class="input-group-append">
+ <button class="btn btn-inverse" type="button"> <i class="fa fa-save fa-fw fa-lg"> </i></button>
+ </div>
+ </div>
+ </li>
+ </ul>
+ </div>
+ </div>
+ <!--/.row-->
+ </div>
+ <!--/.container-->
+ </div>
+ <!--/.footer-->
+
+</footer>
diff --git a/_layouts/default.html b/_layouts/default.html
index 34c4e3f7c98f2cb4507181923b982b035b563578..1ceb1178708c1d90c4e46339c7a74aa541c0dff2 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -30,10 +30,8 @@
{% endif %}
<div id="footer" class="page__footer">
- <footer>
{% include footer/custom.html %}
{% include_cached footer.html %}
- </footer>
</div>
{% include scripts.html %}
diff --git a/_pages/activites/campus-propre.md b/_pages/activites/campus-propre.md
new file mode 100644
index 0000000000000000000000000000000000000000..ae83ca104bdbc5e782446a66540cc1cd586e9f71
--- /dev/null
+++ b/_pages/activites/campus-propre.md
@@ -0,0 +1,6 @@
+---
+title: Campus Propre
+author_profile: true
+---
+
+Viens nettoyer!
diff --git a/_pages/activites/jeudis.md b/_pages/activites/jeudis.md
new file mode 100644
index 0000000000000000000000000000000000000000..93b9d2e0a397bc3349d018921e8d5036d3fe959b
--- /dev/null
+++ b/_pages/activites/jeudis.md
@@ -0,0 +1,12 @@
+---
+title: Jeudis du CCL
+author_profile: true
+---
+
+# Gros son
+
+# Jongle
+
+# Paniers bio
+
+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, ...
diff --git a/_pages/activites/projections.md b/_pages/activites/projections.md
new file mode 100644
index 0000000000000000000000000000000000000000..53ea9621e486ffbc1dcbed63de122fe03f5525b9
--- /dev/null
+++ b/_pages/activites/projections.md
@@ -0,0 +1,9 @@
+---
+title: Projections
+author_profile: true
+---
+
+# des docus
+
+# des films
+ (shh...)
diff --git a/_pages/activites/projets.md b/_pages/activites/projets.md
new file mode 100644
index 0000000000000000000000000000000000000000..0b9942f30a000033a8f4204f24cd5bb04c3ebabc
--- /dev/null
+++ b/_pages/activites/projets.md
@@ -0,0 +1,11 @@
+---
+title: Projets en cours
+author_profile: true
+---
+
+# Studio de musique
+
+...
+
+# Skatepark
+
diff --git a/_pages/l-asso/adherer.md b/_pages/l-asso/adherer.md
index 2e38fb91100063356ad63d6a8464144d42f50c4c..5f64308afdc792bb9d2a69dcc1cfa7e57f2c598d 100644
--- a/_pages/l-asso/adherer.md
+++ b/_pages/l-asso/adherer.md
@@ -3,7 +3,7 @@ title: Adhésion et soutiens
toc: true
share: true
overlay_image: assets/images/banniere-bulles.png
-og_image: assets/images/logo-ccl-grand.png
+og_image: assets/images/logo-ccl.png
---
# Adhérez à l'asso du CCL
diff --git a/_sass/minimal-mistakes.scss b/_sass/minimal-mistakes.scss
index 5412b892f3267564ceb8b1053c18cd90ac24d84b..7ef43c4acd8402d7e3ab94bfa2f263455d2010e0 100644
--- a/_sass/minimal-mistakes.scss
+++ b/_sass/minimal-mistakes.scss
@@ -29,6 +29,7 @@
@import "minimal-mistakes/masthead";
@import "minimal-mistakes/navigation";
@import "minimal-mistakes/footer";
+@import "minimal-mistakes/custom-footer";
@import "minimal-mistakes/search";
@import "minimal-mistakes/syntax";
@@ -41,6 +42,7 @@
@import "minimal-mistakes/sidebar";
@import "minimal-mistakes/print";
+@import url(https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css);
@font-face {
font-family: "Tempus Sans ITC";
diff --git a/_sass/minimal-mistakes/_custom-footer.scss b/_sass/minimal-mistakes/_custom-footer.scss
new file mode 100644
index 0000000000000000000000000000000000000000..3da39e3fb56fafe1fb43c2f6681b4cacf8418fad
--- /dev/null
+++ b/_sass/minimal-mistakes/_custom-footer.scss
@@ -0,0 +1,105 @@
+
+
+.full {
+ width: 100%;
+}
+
+.footer {
+ height: auto;
+ padding-bottom: 30px;
+ position: relative;
+ width: 100%;
+ color:#000;
+ border-bottom: 1px solid #CCCCCC;
+ border-top: 1px solid #DDDDDD;
+ background: $footer-background-color;
+ // background: -webkit-linear-gradient(to right, #31BDE6, #00003E);
+ // background: linear-gradient(to right, #31BDE6, #00003E);
+}
+
+
+.footer h3 {
+ font-family: "Tempus Sans ITC";
+ border-bottom: 1px solid #BAC1C8;
+ color:#000;
+ font-size: 18px;
+ font-weight: 600;
+ line-height: 27px;
+ padding: 40px 0 10px;
+ text-transform: uppercase;
+}
+.footer ul {
+ font-size: 13px;
+ list-style-type: none;
+ margin-left: 0;
+ padding-left: 0;
+ margin-top: 15px;
+ color: #7F8C8D;
+}
+.footer ul li a {
+ padding: 0 0 5px 0;
+ display: block;
+}
+.footer a {
+ color: #78828D;
+ color:#000;
+}
+.supportLi h4 {
+ font-size: 20px;
+ font-weight: lighter;
+ line-height: normal;
+ margin-bottom: 0 !important;
+ padding-bottom: 0;
+}
+
+.social li {
+ border: 2px solid #B5B5B5;
+ -webkit-border-radius: 20%;
+ -moz-border-radius: 20%;
+ -o-border-radius: 20%;
+ -ms-border-radius: 20%;
+ border-radius: 20%;
+ float: left;
+ height: 36px;
+ line-height: 36px;
+ margin: 0 10px 10px 0;
+ padding: 0;
+ text-align: center;
+ width: 36px;
+ transition: all 0.5s ease 0s;
+ -moz-transition: all 0.5s ease 0s;
+ -webkit-transition: all 0.5s ease 0s;
+ -ms-transition: all 0.5s ease 0s;
+ -o-transition: all 0.5s ease 0s;
+}
+
+.social li a {
+ color: #EDEFF1;
+}
+.social li:hover {
+ border: 2px solid #2c3e50;
+ background: #2c3e50;
+}
+.social li a i {
+ font-size: 16px;
+ // margin: 0 0 0 5px;
+ color: #000 !important;
+ // color: #EDEFF1 !important;
+}
+
+// .footer-bottom {
+// background: #40E0D0;
+// background: -webkit-linear-gradient(to right, #FF0080, #FF8C00, #40E0D0);
+// background: linear-gradient(to right, #FF0080, #FF8C00, #40E0D0);
+// border-top: 1px solid #DDDDDD;
+// padding-top: 20px;
+// padding-bottom: 40px;
+// color:#000;
+// }
+// .footer-bottom p.pull-left {
+// padding-top: 6px;
+// }
+// .payments {
+// font-size: 1.5em;
+// }
+
diff --git a/assets/images/authors-logo/logo-ccl-grand.png b/assets/images/authors-logo/logo-ccl-grand.png
deleted file mode 100644
index b715cb47f8b0073d5d1b2e282210177a2e8281c6..0000000000000000000000000000000000000000
--- a/assets/images/authors-logo/logo-ccl-grand.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1be3b9c38132c3947791e25b4134ec2555403c0df5721ec9a3a7ef10cd625730
-size 448408
diff --git a/assets/images/authors-logo/logo-ccl-nb.png b/assets/images/authors-logo/logo-ccl-nb.png
index 4c7a5e76eb43296cbf465fd5efe7e3d2778be820..c36a2ae63d602a9776bb67ad3a18b57a212e0796 100644
--- a/assets/images/authors-logo/logo-ccl-nb.png
+++ b/assets/images/authors-logo/logo-ccl-nb.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:5451dee5884e0d1149754a6646b0a3fe70675b12fa1ec17d7e41c9dd1c3e5295
-size 43212
+oid sha256:8397d2904547c0dd4e793d3c78c18f2de3371dbefe9d4476cd9cbfb6950b11b7
+size 45611
diff --git a/assets/images/authors-logo/logo-ccl.png b/assets/images/authors-logo/logo-ccl.png
index eec142bc840c3cb3d6fd9e2c10360d6bcc2545d4..b715cb47f8b0073d5d1b2e282210177a2e8281c6 100644
--- a/assets/images/authors-logo/logo-ccl.png
+++ b/assets/images/authors-logo/logo-ccl.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:86edc4898bad93fbef6189db7056b58f1ef65d210c8bc4b4fa87121ac1641c27
-size 446747
+oid sha256:1be3b9c38132c3947791e25b4134ec2555403c0df5721ec9a3a7ef10cd625730
+size 448408