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.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
SkypLabs committed Mar 17, 2020
2 parents 5498005 + 7d4e42a commit 5e025cf
Show file tree
Hide file tree
Showing 21 changed files with 658 additions and 195 deletions.
14 changes: 7 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ GEM
colorator (1.1.0)
commonmarker (0.17.13)
ruby-enum (~> 0.5)
concurrent-ruby (1.1.5)
concurrent-ruby (1.1.6)
dnsruby (1.61.3)
addressable (~> 2.5)
em-websocket (0.5.1)
Expand Down Expand Up @@ -204,9 +204,9 @@ GEM
jekyll-seo-tag (~> 2.1)
minitest (5.14.0)
multipart-post (2.1.1)
nokogiri (1.10.8)
nokogiri (1.10.9)
mini_portile2 (~> 2.4.0)
octokit (4.16.0)
octokit (4.17.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
pathutil (0.16.2)
Expand All @@ -218,7 +218,7 @@ GEM
rouge (3.13.0)
ruby-enum (0.7.2)
i18n
rubyzip (2.2.0)
rubyzip (2.3.0)
safe_yaml (1.0.5)
sass (3.7.4)
sass-listen (~> 4.0.0)
Expand All @@ -235,8 +235,8 @@ GEM
ethon (>= 0.9.0)
tzinfo (1.2.6)
thread_safe (~> 0.1)
unicode-display_width (1.6.1)
zeitwerk (2.2.2)
unicode-display_width (1.7.0)
zeitwerk (2.3.0)

PLATFORMS
ruby
Expand All @@ -245,4 +245,4 @@ DEPENDENCIES
github-pages

BUNDLED WITH
1.17.3
2.1.4
37 changes: 13 additions & 24 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -1,37 +1,26 @@
# Site settings
title: Zero Waste Sud Grand Paris
email: [email protected]
description: >- # this means to ignore newlines until "baseurl:"
Groupe local de Zero Waste France opérant sur le bassin sud-ouest
du grand Paris (Malakoff, Vanves, Issy-Les-Moulineaux, Montrouge,
Chatillon, Clamart).
keywords: Zero Waste
baseurl: "" # the subpath of your site, e.g. /blog
url: "https://www.zerowastesgp.fr" # the base hostname & protocol for your site, e.g. http://example.com
github_username: zerowastesgp
facebook_username: ZeroWasteSudGrandParis
instagram_username: zerowaste_sudgrandparis
email: [email protected]
favicon_img_path: /assets/images/favicon.ico

avatar: yes
avatar_img_path: assets/images/main-logo.jpg

front_img: yes
front_img_path: assets/images/landing-page-landscape.jpg
# Plugins
plugins:
- jekyll-feed
- jekyll-sitemap

# Build settings
markdown: kramdown
theme: minima
plugins:
- jekyll-feed
excerpt_separator: "<!--more-->"

sass:
style: compressed

# Exclude from processing.
# The following items will not be processed, by default. Create a custom list
# to override the default setting.
# exclude:
# - Gemfile
# - Gemfile.lock
# - node_modules
# - vendor/bundle/
# - vendor/cache/
# - vendor/gems/
# - vendor/ruby/
# Outputting
permalink: :year/:month/:day/:title/
timezone: Europe/Paris
17 changes: 17 additions & 0 deletions _data/info.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
address:
- line: Maison de la vie associative
- line: 26 rue Victor Hugo
- line: 92240 Malakoff

# List of the available icons: https://fontawesome.com/v4.7.0/icons/
social:
- title: facebook
url: https://www.facebook.com/ZeroWasteSudGrandParis
- title: instagram
url: https://www.instagram.com/zerowaste_sudgrandparis
- title: github
url: https://github.com/zerowastesgp
- title: envelope-o
url: mailto:[email protected]

copyright: Zero Waste Sud Grand Paris
3 changes: 3 additions & 0 deletions _data/nav.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
name,link
Nous rejoindre,https://www.helloasso.com/associations/zero-waste-sud-grand-paris/adhesions/zero-waste-sgp-cotisations-2020
Nous soutenir,https://www.helloasso.com/associations/zero-waste-sud-grand-paris/formulaires/1
47 changes: 47 additions & 0 deletions _includes/footer.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<!-- 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>
</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>
10 changes: 6 additions & 4 deletions _includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="{{ site.description }}">
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
{% if site.favicon_img %}
{% if site.favicon_img_path %}
<link rel="shortcut icon" href="{{ site.favicon_img_path }}" />
{% endif %}
<link rel="stylesheet" href="{{ "assets/css/front.css" | prepend: site.baseurl }}">
<link href='https://fonts.googleapis.com/css?family=Open+Sans:400,700&subset=latin' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css" integrity="sha384-HSMxcRTRxnN+Bdg0JdbxYKrThecOKuH5zCYotlSAcp1+c8xmyTe9GYg1l9a69psu" 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">
<link href="https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic" rel="stylesheet" type="text/css">
14 changes: 14 additions & 0 deletions _includes/header.html
Original file line number Diff line number Diff line change
@@ -0,0 +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>
</div>
</header>
13 changes: 13 additions & 0 deletions _includes/js.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<!-- 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>

<!-- 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>
29 changes: 29 additions & 0 deletions _includes/nav.html
Original file line number Diff line number Diff line change
@@ -0,0 +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>

<!-- 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>
8 changes: 7 additions & 1 deletion _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,13 @@
<head>
{% include head.html %}
</head>
<body>
<body id="page-top" class="index">
{% include nav.html %}
{% include header.html %}

{{ content }}

{% include footer.html %}
{% include js.html %}
</body>
</html>
Loading

0 comments on commit 5e025cf

Please sign in to comment.