Merge branch gh-pages of carpentries/styles

Author: maxim-belkin

Makefile

@@ -6,7 +6,7 @@ export SHELL = /bin/bash
 
 # Settings
 MAKEFILES=Makefile $(wildcard *.mk)
-JEKYLL=bundle install --path .vendor/bundle && bundle update && bundle exec jekyll
+JEKYLL=bundle config --local set path .vendor/bundle && bundle install && bundle update && bundle exec jekyll
 PARSER=bin/markdown_ast.rb
 DST=_site
 

_includes/lesson_footer.html

@@ -6,7 +6,7 @@
 
 <footer>
   <div class="row">
-    <div class="col-md-6 copyright" align="left">
+    <div class="col-md-6 license" id="license-info" align="left">
 	{% if site.carpentry == "swc" %}
 	Licensed under <a href="{{ site.cc_by_human }}">CC-BY 4.0</a> 2018–{{ 'now' | date: "%Y" }}
 	by <a href="{{ site.carpentries_site }}">The Carpentries</a>

_layouts/base.html

@@ -16,6 +16,7 @@
     <link rel="stylesheet" type="text/css" href="{{ relative_root_path }}/assets/css/bootstrap-theme.css" />
     <link rel="stylesheet" type="text/css" href="{{ relative_root_path }}/assets/css/lesson.css" />
     <link rel="stylesheet" type="text/css" href="{{ relative_root_path }}/assets/css/syntax.css" />
+    <link rel="license" href="#license-info" />
 
     {% include favicons.html %}
 

assets/css/lesson.scss

@@ -227,7 +227,7 @@ article pre {
   text-align: center;
 }
 
-footer .copyright,
+footer .license,
 footer .help-links
 {
     font-size: inherit;

assets/js/lesson.js

@@ -4,8 +4,8 @@ $("table").addClass("table table-striped");
 
 // Handle foldable challenges and solutions (on click and at start).
 $(".solution").click(function(event) {
-    var trigger = $(event.target).has(".fold-unfold").size() > 0
-               || $(event.target).filter(".fold-unfold").size() > 0;
+    var trigger = $(event.target).has(".fold-unfold").length > 0
+               || $(event.target).filter(".fold-unfold").length > 0;
     if (trigger) {
         $(">*:not(h2)", this).toggle(400);
         $(">h2>span.fold-unfold", this).toggleClass("glyphicon-collapse-down glyphicon-collapse-up");

bin/boilerplate/_config.yml

@@ -32,7 +32,7 @@ repository: <USERNAME>/<PROJECT>
 email: "[email protected]"
 
 # Sites.
-amy_site: "https://amy.carpentries.org/workshops"
+amy_site: "https://amy.carpentries.org/"
 carpentries_github: "https://github.com/carpentries"
 carpentries_pages: "https://carpentries.github.io"
 carpentries_site: "https://carpentries.org/"