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.5.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@SkypLabs
SkypLabs committed Feb 18, 2021
2 parents bcb9993 + fd629d2 commit 6ba81df
Show file tree
Hide file tree
Showing 31 changed files with 181 additions and 404 deletions.
3 changes: 3 additions & 0 deletions .well-known/security.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Contact: https://blog.skyplabs.net/contact
Encryption: https://keybase.io/skyplabs/pgp_keys.asc
Preferred-Languages: en, fr
4 changes: 2 additions & 2 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ gem 'nokogiri', '>= 1.10.8'
group :production do
# Latest version available:
# https://pages.github.com/versions/
gem 'github-pages', '~> 207', group: :jekyll_plugins
gem 'github-pages', '~> 211', group: :jekyll_plugins
end

group :development do
gem 'rake', group: :test
end

group :test do
gem 'html-proofer', '~> 3.15'
gem 'html-proofer', '~> 3.18'
end
91 changes: 49 additions & 42 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (6.0.3.2)
activesupport (6.0.3.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
Expand All @@ -16,46 +16,49 @@ GEM
colorator (1.1.0)
commonmarker (0.17.13)
ruby-enum (~> 0.5)
concurrent-ruby (1.1.7)
dnsruby (1.61.4)
concurrent-ruby (1.1.8)
dnsruby (1.61.5)
simpleidn (~> 0.1)
em-websocket (0.5.1)
em-websocket (0.5.2)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
ethon (0.12.0)
ffi (>= 1.3.0)
eventmachine (1.2.7)
execjs (2.7.0)
faraday (1.0.1)
faraday (1.3.0)
faraday-net_http (~> 1.0)
multipart-post (>= 1.2, < 3)
ffi (1.13.1)
ruby2_keywords
faraday-net_http (1.0.1)
ffi (1.14.2)
forwardable-extended (2.6.0)
gemoji (3.0.1)
github-pages (207)
github-pages (211)
github-pages-health-check (= 1.16.1)
jekyll (= 3.9.0)
jekyll-avatar (= 0.7.0)
jekyll-coffeescript (= 1.1.1)
jekyll-commonmark-ghpages (= 0.1.6)
jekyll-default-layout (= 0.1.4)
jekyll-feed (= 0.13.0)
jekyll-feed (= 0.15.1)
jekyll-gist (= 1.5.0)
jekyll-github-metadata (= 2.13.0)
jekyll-mentions (= 1.5.1)
jekyll-mentions (= 1.6.0)
jekyll-optional-front-matter (= 0.3.2)
jekyll-paginate (= 1.1.0)
jekyll-readme-index (= 0.3.0)
jekyll-redirect-from (= 0.15.0)
jekyll-redirect-from (= 0.16.0)
jekyll-relative-links (= 0.6.1)
jekyll-remote-theme (= 0.4.1)
jekyll-remote-theme (= 0.4.2)
jekyll-sass-converter (= 1.5.2)
jekyll-seo-tag (= 2.6.1)
jekyll-seo-tag (= 2.7.1)
jekyll-sitemap (= 1.4.0)
jekyll-swiss (= 1.0.0)
jekyll-theme-architect (= 0.1.1)
jekyll-theme-cayman (= 0.1.1)
jekyll-theme-dinky (= 0.1.1)
jekyll-theme-hacker (= 0.1.1)
jekyll-theme-hacker (= 0.1.2)
jekyll-theme-leap-day (= 0.1.1)
jekyll-theme-merlot (= 0.1.1)
jekyll-theme-midnight (= 0.1.1)
Expand All @@ -66,14 +69,14 @@ GEM
jekyll-theme-tactile (= 0.1.1)
jekyll-theme-time-machine (= 0.1.1)
jekyll-titles-from-headings (= 0.5.3)
jemoji (= 0.11.1)
jemoji (= 0.12.0)
kramdown (= 2.3.0)
kramdown-parser-gfm (= 1.1.0)
liquid (= 4.0.3)
mercenary (~> 0.3)
minima (= 2.5.1)
nokogiri (>= 1.10.4, < 2.0)
rouge (= 3.19.0)
rouge (= 3.26.0)
terminal-table (~> 1.4)
github-pages-health-check (1.16.1)
addressable (~> 2.3)
Expand All @@ -84,7 +87,7 @@ GEM
html-pipeline (2.14.0)
activesupport (>= 2)
nokogiri (>= 1.4)
html-proofer (3.15.3)
html-proofer (3.18.5)
addressable (~> 2.3)
mercenary (~> 0.3)
nokogumbo (~> 2.0)
Expand Down Expand Up @@ -122,33 +125,34 @@ GEM
rouge (>= 2.0, < 4.0)
jekyll-default-layout (0.1.4)
jekyll (~> 3.0)
jekyll-feed (0.13.0)
jekyll-feed (0.15.1)
jekyll (>= 3.7, < 5.0)
jekyll-gist (1.5.0)
octokit (~> 4.2)
jekyll-github-metadata (2.13.0)
jekyll (>= 3.4, < 5.0)
octokit (~> 4.0, != 4.4.0)
jekyll-mentions (1.5.1)
jekyll-mentions (1.6.0)
html-pipeline (~> 2.3)
jekyll (>= 3.7, < 5.0)
jekyll-optional-front-matter (0.3.2)
jekyll (>= 3.0, < 5.0)
jekyll-paginate (1.1.0)
jekyll-readme-index (0.3.0)
jekyll (>= 3.0, < 5.0)
jekyll-redirect-from (0.15.0)
jekyll-redirect-from (0.16.0)
jekyll (>= 3.3, < 5.0)
jekyll-relative-links (0.6.1)
jekyll (>= 3.3, < 5.0)
jekyll-remote-theme (0.4.1)
jekyll-remote-theme (0.4.2)
addressable (~> 2.0)
jekyll (>= 3.5, < 5.0)
rubyzip (>= 1.3.0)
jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0)
rubyzip (>= 1.3.0, < 3.0)
jekyll-sass-converter (1.5.2)
sass (~> 3.4)
jekyll-seo-tag (2.6.1)
jekyll (>= 3.3, < 5.0)
jekyll-seo-tag (2.7.1)
jekyll (>= 3.8, < 5.0)
jekyll-sitemap (1.4.0)
jekyll (>= 3.7, < 5.0)
jekyll-swiss (1.0.0)
Expand All @@ -161,8 +165,8 @@ GEM
jekyll-theme-dinky (0.1.1)
jekyll (~> 3.5)
jekyll-seo-tag (~> 2.0)
jekyll-theme-hacker (0.1.1)
jekyll (~> 3.5)
jekyll-theme-hacker (0.1.2)
jekyll (> 3.5, < 5.0)
jekyll-seo-tag (~> 2.0)
jekyll-theme-leap-day (0.1.1)
jekyll (~> 3.5)
Expand Down Expand Up @@ -196,7 +200,7 @@ GEM
jekyll (>= 3.3, < 5.0)
jekyll-watch (2.2.1)
listen (~> 3.0)
jemoji (0.11.1)
jemoji (0.12.0)
gemoji (~> 3.0)
html-pipeline (~> 2.2)
jekyll (>= 3.0, < 5.0)
Expand All @@ -205,37 +209,40 @@ GEM
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.3)
listen (3.2.1)
listen (3.4.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.3.6)
mini_portile2 (2.4.0)
mini_portile2 (2.5.0)
minima (2.5.1)
jekyll (>= 3.5, < 5.0)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
minitest (5.14.1)
minitest (5.14.3)
multipart-post (2.1.1)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
nokogumbo (2.0.2)
nokogiri (1.11.1)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
nokogumbo (2.0.4)
nokogiri (~> 1.8, >= 1.8.4)
octokit (4.18.0)
octokit (4.20.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
parallel (1.19.2)
parallel (1.20.1)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (3.1.1)
racc (1.5.2)
rainbow (3.0.0)
rake (13.0.1)
rake (13.0.3)
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.4)
rouge (3.19.0)
ruby-enum (0.8.0)
rouge (3.26.0)
ruby-enum (0.9.0)
i18n
ruby2_keywords (0.0.4)
rubyzip (2.3.0)
safe_yaml (1.0.5)
sass (3.7.4)
Expand All @@ -246,28 +253,28 @@ GEM
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
simpleidn (0.1.1)
simpleidn (0.2.1)
unf (~> 0.1.4)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
thread_safe (0.3.6)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (1.2.7)
tzinfo (1.2.9)
thread_safe (~> 0.1)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.7)
unicode-display_width (1.7.0)
yell (2.2.2)
zeitwerk (2.4.0)
zeitwerk (2.4.2)

PLATFORMS
ruby

DEPENDENCIES
github-pages (~> 207)
html-proofer (~> 3.15)
github-pages (~> 211)
html-proofer (~> 3.18)
nokogiri (>= 1.10.8)
rake

Expand Down
2 changes: 1 addition & 1 deletion NOTICE
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
www.zerowastesgp.fr
Copyright 2020 Zero Waste Sud Grand Paris
Copyright 2021 Zero Waste Sud Grand Paris
1 change: 1 addition & 0 deletions _config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ excerpt_separator: "<!--more-->"

include:
- _pages
- .well-known

sass:
style: compressed
Expand Down
22 changes: 11 additions & 11 deletions _data/info.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,21 @@ social:
copyright: Zero Waste Sud Grand Paris

volunteers:
- name: Alix Mennella
- name: Alix
role: Présidente
picture: alix-mennella.jpg
- name: Marie Quément
picture: alix.jpg
- name: Marie
role: Vice-présidente
picture: marie-quement.jpg
- name: Thomas Zimmer
picture: marie.jpg
- name: Thomas
role: Trésorier
picture: thomas-zimmer.jpg
- name: Rémi Degouys
picture: thomas.jpg
- name: Rémi
role: Secrétaire général
picture:
- name: Paul-Emmanuel Raoul
- name: Paul
role: Informatique
picture: paul-raoul.jpg
- name: Eloïse Aubrat
picture: paul.jpg
- name: Eloïse
role: Communication & Design
picture: eloise-aubrat.jpg
picture: eloise.jpg
40 changes: 24 additions & 16 deletions _includes/footer.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,39 @@
<div class="footer-above">
<div class="container">
<div class="row">
<div class="footer-col col-md-4">
<div class="col footer-col">
<h3>Adresse</h3>
<p>
{% for adress in site.data.info.address %}
{{ adress.line }} <br>
{% endfor %}
</p>
</div>
<div class="footer-col col-md-4">
<div class="col footer-col">
<h3>Nos liens sociaux</h3>
<ul class="list-inline">
<div class="row">
{% 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>
<div class="col">
<p><a href="{{ network.url }}" class="btn-social btn-outline"><i class="fa fa-fw fa-{{ network.title }}"></i></a></p>
</div>
{% endfor %}
</ul>
</div>
</div>
<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>

<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 class="col footer-col">
<div class="row">
<div class="col">
<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>
</div>
</div>
<div class="row">
<div class="col">
<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>
</div>
<div class="row">
<div class="col text-center">
<p>Propulsé par <a href="https://www.helloasso.com" rel="nofollow">HelloAsso</a></p>
</div>
</div>
</div>
</div>
Expand All @@ -36,7 +44,7 @@ <h3>Nos liens sociaux</h3>
<div class="footer-below">
<div class="container">
<div class="row">
<div class="col-lg-12">
<div class="col">
Copyright &copy; {{ site.data.info.copyright }} 20{{ site.time | date: '%y' }}
</div>
</div>
Expand All @@ -45,7 +53,7 @@ <h3>Nos liens sociaux</h3>
</footer>

<!-- Scroll to Top Button (Only visible on small and extra-small screen sizes) -->
<div class="scroll-top page-scroll visible-xs visible-sm">
<div class="scroll-top page-scroll d-block d-md-none">
<a class="btn btn-primary" href="#page-top">
<i class="fa fa-chevron-up"></i>
</a>
Expand Down
2 changes: 1 addition & 1 deletion _includes/head.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{% if site.favicon_img_path %}
<link rel="shortcut icon" href="{{ site.favicon_img_path }}" />
{% endif %}
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css" integrity="sha384-HSMxcRTRxnN+Bdg0JdbxYKrThecOKuH5zCYotlSAcp1+c8xmyTe9GYg1l9a69psu" crossorigin="anonymous">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" integrity="sha384-JcKb8q3iqJ61gNV9KGb8thSsNjpSL0n8PARn9HuZOnIxN0hoP+VmmDGMN5t9UJ0Z" crossorigin="anonymous">
<link href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
<link rel="stylesheet" href="{{ "/assets/css/main.css" | prepend: site.baseurl }}">
<link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
Expand Down
2 changes: 1 addition & 1 deletion _includes/header.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<header>
<div class="container">
<div class="row">
<div class="col-lg-12">
<div class="col">
<img class="main-logo" src="/assets/images/main-logo.png" alt="Logo de Zero Waste Sud Grand Paris">
<div class="intro-text">
<hr class="separator-light">
Expand Down
Loading

0 comments on commit 6ba81df

Please sign in to comment.