Skip to content

Commit

Permalink
Merge branch 'gh-pages' into gh-pages-23-new-library-page
Browse files Browse the repository at this point in the history
  • Loading branch information
tmtmtmtm authored Sep 15, 2016
2 parents 0fda4e2 + dd3abbb commit 47ef82f
Show file tree
Hide file tree
Showing 20 changed files with 386 additions and 136 deletions.
107 changes: 58 additions & 49 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
RedCloth (4.2.9)
activesupport (4.2.6)
activesupport (4.2.7)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
Expand All @@ -13,45 +12,46 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.10.0)
colorator (0.1)
colorator (1.1.0)
colored (1.2)
ethon (0.8.1)
ethon (0.9.0)
ffi (>= 1.3.0)
execjs (2.6.0)
execjs (2.7.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.10)
ffi (1.9.14)
forwardable-extended (2.6.0)
gemoji (2.1.0)
github-pages (58)
RedCloth (= 4.2.9)
github-pages-health-check (= 1.1.0)
jekyll (= 3.0.3)
github-pages (96)
activesupport (= 4.2.7)
github-pages-health-check (= 1.2.0)
jekyll (= 3.2.1)
jekyll-coffeescript (= 1.0.1)
jekyll-feed (= 0.4.0)
jekyll-feed (= 0.5.1)
jekyll-gist (= 1.4.0)
jekyll-mentions (= 1.0.1)
jekyll-github-metadata (= 2.0.2)
jekyll-mentions (= 1.2.0)
jekyll-paginate (= 1.1.0)
jekyll-redirect-from (= 0.9.1)
jekyll-redirect-from (= 0.11.0)
jekyll-sass-converter (= 1.3.0)
jekyll-seo-tag (= 1.3.2)
jekyll-seo-tag (= 2.0.0)
jekyll-sitemap (= 0.10.0)
jekyll-textile-converter (= 0.1.0)
jemoji (= 0.5.1)
kramdown (= 1.10.0)
jemoji (= 0.7.0)
kramdown (= 1.11.1)
liquid (= 3.0.6)
listen (= 3.0.6)
mercenary (~> 0.3)
rdiscount (= 2.1.8)
redcarpet (= 3.3.3)
rouge (= 1.10.1)
minima (= 1.2.0)
rouge (= 1.11.1)
terminal-table (~> 1.4)
github-pages-health-check (1.1.0)
github-pages-health-check (1.2.0)
addressable (~> 2.3)
net-dns (~> 0.8)
octokit (~> 4.0)
public_suffix (~> 1.4)
typhoeus (~> 0.7)
html-pipeline (2.3.0)
activesupport (>= 2, < 5)
html-pipeline (2.4.2)
activesupport (>= 2)
nokogiri (>= 1.4)
html-proofer (2.6.1)
activesupport (~> 4.2)
Expand All @@ -63,82 +63,91 @@ GEM
typhoeus (~> 0.7)
yell (~> 2.0)
i18n (0.7.0)
jekyll (3.0.3)
colorator (~> 0.1)
jekyll (3.2.1)
colorator (~> 1.0)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 1.1)
kramdown (~> 1.3)
liquid (~> 3.0)
mercenary (~> 0.3.3)
pathutil (~> 0.9)
rouge (~> 1.7)
safe_yaml (~> 1.0)
jekyll-coffeescript (1.0.1)
coffee-script (~> 2.2)
jekyll-feed (0.4.0)
jekyll-feed (0.5.1)
jekyll-gist (1.4.0)
octokit (~> 4.2)
jekyll-mentions (1.0.1)
jekyll-github-metadata (2.0.2)
jekyll (~> 3.1)
octokit (~> 4.0)
jekyll-mentions (1.2.0)
activesupport (~> 4.0)
html-pipeline (~> 2.3)
jekyll (~> 3.0)
jekyll-paginate (1.1.0)
jekyll-redirect-from (0.9.1)
jekyll-redirect-from (0.11.0)
jekyll (>= 2.0)
jekyll-sass-converter (1.3.0)
sass (~> 3.2)
jekyll-seo-tag (1.3.2)
jekyll (~> 3.0)
jekyll-seo-tag (2.0.0)
jekyll (~> 3.1)
jekyll-sitemap (0.10.0)
jekyll-textile-converter (0.1.0)
RedCloth (~> 4.0)
jekyll-watch (1.3.1)
listen (~> 3.0)
jemoji (0.5.1)
jekyll-watch (1.5.0)
listen (~> 3.0, < 3.1)
jemoji (0.7.0)
activesupport (~> 4.0)
gemoji (~> 2.0)
html-pipeline (~> 2.2)
jekyll (>= 2.0)
jekyll (>= 3.0)
json (1.8.3)
kramdown (1.10.0)
kramdown (1.11.1)
liquid (3.0.6)
listen (3.0.6)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9.7)
mercenary (0.3.5)
mini_portile2 (2.0.0)
minitest (5.8.4)
mercenary (0.3.6)
mini_portile2 (2.1.0)
minima (1.2.0)
minitest (5.9.0)
multipart-post (2.0.0)
net-dns (0.8.0)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
nokogiri (1.6.8)
mini_portile2 (~> 2.1.0)
pkg-config (~> 1.1.7)
octokit (4.3.0)
sawyer (~> 0.7.0, >= 0.5.3)
parallel (1.6.1)
pathutil (0.14.0)
forwardable-extended (~> 2.6)
pkg-config (1.1.7)
public_suffix (1.5.3)
rb-fsevent (0.9.7)
rb-inotify (0.9.7)
ffi (>= 0.5.0)
rdiscount (2.1.8)
redcarpet (3.3.3)
rouge (1.10.1)
rouge (1.11.1)
safe_yaml (1.0.4)
sass (3.4.21)
sass (3.4.22)
sawyer (0.7.0)
addressable (>= 2.3.5, < 2.5)
faraday (~> 0.8, < 0.10)
terminal-table (1.5.2)
terminal-table (1.7.2)
unicode-display_width (~> 1.1.1)
thread_safe (0.3.5)
typhoeus (0.8.0)
ethon (>= 0.8.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
unicode-display_width (1.1.1)
yell (2.0.5)

PLATFORMS
ruby

DEPENDENCIES
github-pages (= 58)
github-pages (= 96)
html-proofer
json

BUNDLED WITH
1.11.2
1.12.5
74 changes: 62 additions & 12 deletions _includes/footer.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,63 @@
<footer class="site-footer ms-footer">
<div class="container">
<div class="column-five-twelfths">
<div class="footer__about">
<h2 class="ms-footer__logo"><a href="http://www.mysociety.org">mySociety</a></h2>
<p>EveryPolitician is another democracy-boosting project from mySociety and Poplus.</p>
<p>You might also enjoy <a href="http://mapit.poplus.org/">MapIt</a>, for matching geographic points to administrative areas, and <a href="http://sayit.poplus.org/">SayIt</a>, a beautiful interface for organising, reading, and searching speeches and debates.</p>
</div>
<div class="mysoc-footer" role="contentinfo">
<div class="container">
<div class="row">

<div class="column-five-twelfths">
<h2 class="mysoc-footer__site-name">EveryPolitician</h2>
<div class="mysoc-footer__site-description">
<p>A simple but ambitious project to collect and share data about every politician in every country in the world, in a consistent, open format that anyone can use.</p>
</div>
</div>

<div class="column-one-third">
<nav class="mysoc-footer__links">
<ul>
<li role="presentation"><a href="http://everypolitician.org/">Home</a></li>
<li role="presentation"><a href="http://everypolitician.org/countries">Data</a></li>
<li role="presentation"><a href="http://docs.everypolitician.org/">About</a></li>
</ul>
<ul>
<li role="presentation"><a href="http://docs.everypolitician.org/contribute.html">Contribute data</a></li>
<li role="presentation"><a href="http://docs.everypolitician.org/use_the_data.html">For developers</a></li>
<li role="presentation"><a href="http://docs.everypolitician.org/bot.html">Bot &amp; blog</a></li>
</ul>
</nav>
</div>

<div class="column-one-quarter">
<div class="mysoc-footer__donate">
<p>Your donations keep this site and others like it running</p>
<a href="https://www.mysociety.org/donate?utm_source=everypolitician.org&utm_content=donate+now&utm_medium=link&utm_campaign=mysoc_footer" class="mysoc-footer__donate__button">Donate now</a>
</div>
</div>

</div>
<hr class="mysoc-footer__divider" role="presentation">
<div class="row">

<div class="column-five-twelfths">
<div class="mysoc-footer__orgs">
<p class="mysoc-footer__org">
Built by
<a href="https://www.mysociety.org?utm_source=everypolitician.org&utm_content=logo&utm_medium=link&utm_campaign=mysoc_footer" class="mysoc-footer__org__logo mysoc-footer__org__logo--mysociety">mySociety</a>
</p>
</div>
</div>

<div class="column-one-third">
<div class="mysoc-footer__legal">
<p>mySociety Limited is a project of UK Citizens Online Democracy, a registered charity in England and Wales. For full details visit <a href="https://www.mysociety.org?utm_source=everypolitician.org&utm_content=full+logo+details&utm_medium=link&utm_campaign=mysoc_footer">mysociety.org</a>.</p>
</div>
</div>

<div class="column-one-quarter">
<ul class="mysoc-footer__badges">
<li role="presentation"><a href="https://github.com/everypolitician" class="mysoc-footer__badge mysoc-footer__badge--github">Github</a></li>
<li role="presentation"><a href="https://twitter.com/mysociety" class="mysoc-footer__badge mysoc-footer__badge--twitter">Twitter</a></li>
<li role="presentation"><a href="https://www.facebook.com/mySociety" class="mysoc-footer__badge mysoc-footer__badge--facebook">Facebook</a></li>
</ul>
</div>

</div>
</div>
<div class="column-seven-twelfths">
</div>
</div>
</footer>
</div>
9 changes: 9 additions & 0 deletions _plugins/gemfile_lock_check.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
if `git status -s`.include?('Gemfile.lock')
abort <<-COMMIT_CHANGES
#################################################
# #
# Please commit the changes to Gemfile.lock #
# #
#################################################
COMMIT_CHANGES
end
Loading

0 comments on commit 47ef82f

Please sign in to comment.