Skip to content
This repository has been archived by the owner on Mar 5, 2022. It is now read-only.

Commit

Permalink
Merge branch 'release/0.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
SkypLabs committed Mar 29, 2020
2 parents 5e025cf + 82a3742 commit 08c2e59
Show file tree
Hide file tree
Showing 19 changed files with 404 additions and 277 deletions.
21 changes: 21 additions & 0 deletions _data/info.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
address:
- line: Zero Waste Sud Grand Paris
- line: Maison de la vie associative
- line: 26 rue Victor Hugo
- line: 92240 Malakoff
Expand All @@ -15,3 +16,23 @@ social:
url: mailto:[email protected]

copyright: Zero Waste Sud Grand Paris

volunteers:
- name: Alix Mennella
role: Présidente
picture: alix-mennella.jpg
- name: Marie Quément
role: Vice-présidente
picture: marie-quement.jpg
- name: Thomas Zimer
role: Trésorier
picture: thomas-zimer.jpg
- name: Rémi Degouys
role: Secrétaire général
picture:
- name: Paul-Emmanuel Raoul
role: Informatique
picture: paul-raoul.jpg
- name: Éloïse Aurat
role: Communication & Design
picture: eloise-aurat.jpg
91 changes: 48 additions & 43 deletions _includes/footer.html
Original file line number Diff line number Diff line change
@@ -1,47 +1,52 @@
<!-- Footer -->
<footer class="text-center">
<div class="footer-above">
<div class="container">
<div class="row">
<div class="footer-col col-md-4">
<h3>Adresse</h3>
<p>
{% for adress in site.data.info.address %}
{{ adress.line }} <br>
{% endfor %}
</p>
</div>
<div class="footer-col col-md-4">
<h3>Nos liens sociaux</h3>
<ul class="list-inline">
{% for network in site.data.info.social %}
<li>
<a href="{{ network.url }}" class="btn-social btn-outline"><i class="fa fa-fw fa-{{ network.title }}"></i></a>
</li>
{% endfor %}
</ul>
</div>
<div class="footer-col col-md-4">
<h3>{{ site.footer.credits }}</h3>
<p>{{ site.credits }}</p>
</div>
</div>
</div>
<!-- Footer -->
<footer class="text-center">
<div class="footer-above">
<div class="container">
<div class="row">
<div class="footer-col col-md-4">
<h3>Adresse</h3>
<p>
{% for adress in site.data.info.address %}
{{ adress.line }} <br>
{% endfor %}
</p>
</div>
<div class="footer-below">
<div class="container">
<div class="row">
<div class="col-lg-12">
Copyright &copy; {{ site.data.info.copyright }} 20{{ site.time | date: '%y' }}
</div>
</div>
</div>
<div class="footer-col col-md-4">
<h3>Nos liens sociaux</h3>
<ul class="list-inline">
{% for network in site.data.info.social %}
<li>
<a href="{{ network.url }}" class="btn-social btn-outline"><i class="fa fa-fw fa-{{ network.title }}"></i></a>
</li>
{% endfor %}
</ul>
</div>
</footer>
<div class="footer-col col-md-4">
<iframe id="haWidget" allowtransparency="true" src="https://www.helloasso.com/associations/zero-waste-sud-grand-paris/adhesions/zero-waste-sgp-cotisations-2020/widget-bouton" style="width:100%;height:70px;border:none;"></iframe>

<!-- Scroll to Top Button (Only visible on small and extra-small screen sizes) -->
<div class="scroll-top page-scroll visible-xs visible-sm">
<a class="btn btn-primary" href="#page-top">
<i class="fa fa-chevron-up"></i>
</a>
<iframe id="haWidget" allowtransparency="true" src="https://www.helloasso.com/associations/zero-waste-sud-grand-paris/formulaires/1/widget-bouton" style="width:100%;height:70px;border:none;"></iframe>

<div style="width:100%;text-align:center;">
Propulsé par <a href="https://www.helloasso.com" rel="nofollow">HelloAsso</a>
</div>
</div>
</div>
</div>
</div>
<div class="footer-below">
<div class="container">
<div class="row">
<div class="col-lg-12">
Copyright &copy; {{ site.data.info.copyright }} 20{{ site.time | date: '%y' }}
</div>
</div>
</div>
</div>
</footer>

<!-- Scroll to Top Button (Only visible on small and extra-small screen sizes) -->
<div class="scroll-top page-scroll visible-xs visible-sm">
<a class="btn btn-primary" href="#page-top">
<i class="fa fa-chevron-up"></i>
</a>
</div>
26 changes: 13 additions & 13 deletions _includes/header.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<!-- Header -->
<header>
<div class="container">
<div class="row">
<div class="col-lg-12">
<img class="main-logo" src="assets/images/main-logo.png" alt="">
<div class="intro-text">
<hr class="separator">
<span class="sub-text">{{ site.description }}</span>
</div>
</div>
</div>
<!-- Header -->
<header>
<div class="container">
<div class="row">
<div class="col-lg-12">
<img class="main-logo" src="assets/images/main-logo.png" alt="">
<div class="intro-text">
<hr class="separator-light">
<span class="sub-text">{{ site.description }}</span>
</div>
</header>
</div>
</div>
</div>
</header>
20 changes: 10 additions & 10 deletions _includes/js.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<!-- jQuery Version 1.11.0 -->
<script src="{{ "/assets/js/jquery-1.11.0.js" }}"></script>
<!-- jQuery Version 1.11.0 -->
<script src="{{ "/assets/js/jquery-1.11.0.js" }}"></script>

<!-- Bootstrap Core JavaScript -->
<script src="{{ "/assets/js/bootstrap.min.js" }}"></script>
<!-- Bootstrap Core JavaScript -->
<script src="{{ "/assets/js/bootstrap.min.js" }}"></script>

<!-- Plugin JavaScript -->
<script src="{{ "/assets/js/jquery.easing.min.js" }}"></script>
<script src="{{ "/assets/js/classie.js" }}"></script>
<script src="{{ "/assets/js/cbpAnimatedHeader.js" }}"></script>
<!-- Plugin JavaScript -->
<script src="{{ "/assets/js/jquery.easing.min.js" }}"></script>
<script src="{{ "/assets/js/classie.js" }}"></script>
<script src="{{ "/assets/js/cbpAnimatedHeader.js" }}"></script>

<!-- Custom Theme JavaScript -->
<script src="{{ "/assets/js/freelancer.js" }}"></script>
<!-- Custom Theme JavaScript -->
<script src="{{ "/assets/js/freelancer.js" }}"></script>
56 changes: 28 additions & 28 deletions _includes/nav.html
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
<!-- Navigation -->
<nav class="navbar navbar-default navbar-fixed-top">
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header page-scroll">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#page-top">{{ site.title }}</a>
</div>
<!-- Navigation -->
<nav class="navbar navbar-default navbar-fixed-top">
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header page-scroll">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#page-top">{{ site.title }}</a>
</div>

<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right">
<li class="hidden">
<a href="#page-top"></a>
</li>
{% for item in site.data.nav %}
<li class="page-scroll">
<a href="{{ item.link }}">{{ item.name}}</a>
</li>
{% endfor %}
</ul>
</div>
</div>
</nav>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right">
<li class="hidden">
<a href="#page-top"></a>
</li>
{% for item in site.data.nav %}
<li class="page-scroll">
<a href="{{ item.link }}">{{ item.name}}</a>
</li>
{% endfor %}
</ul>
</div>
</div>
</nav>
Loading

0 comments on commit 08c2e59

Please sign in to comment.