Fix footer and copyright notice
authorRaniere Silva <raniere@rgaiacs.com>
Wed, 15 Aug 2018 15:51:58 +0000 (16:51 +0100)
committerFrançois Michonneau <francois.michonneau@gmail.com>
Wed, 15 Aug 2018 17:55:46 +0000 (13:55 -0400)
Close carpentries/styles#325

_includes/lesson_footer.html
assets/css/lesson.scss
bin/boilerplate/_config.yml

index 7df84da7a3c790eca0546192322e372f6879a6fd..9be141815321a2b61bd242306de52d46a3122989 100644 (file)
@@ -5,23 +5,23 @@
   <div class="row">
     <div class="col-md-6 copyright" align="left">
        {% if site.carpentry == "swc" %}
-       Copyright &copy; 2018–{{ 'now' | date: "%Y" }}
-       <a href="{{ site.carpentries_site }}">The Carpentries</a>
+       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>
         <br>
-        Copyright &copy; 2016–2018
-       <a href="{{ site.swc_site }}">Software Carpentry Foundation</a>
+        Licensed under <a href="{{ site.cc_by_human }}">CC-BY 4.0</a> 2016–2018
+       by <a href="{{ site.swc_site }}">Software Carpentry Foundation</a>
        {% elsif site.carpentry == "dc" %}
-       Copyright &copy; 2018–{{ 'now' | date: "%Y" }}
-       <a href="{{ site.carpentries_site }}">The Carpentries</a>
+       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>
         <br>
-        Copyright &copy; 2016–2018
-       <a href="{{ site.dc_site }}">Data Carpentry</a>
+        Licensed under <a href="{{ site.cc_by_human }}">CC-BY 4.0</a> 2016–2018
+       by <a href="{{ site.dc_site }}">Data Carpentry</a>
        {% elsif site.carpentry == "lc" %}
-       Copyright &copy; 2016–{{ 'now' | date: "%Y" }}
-       <a href="{{ site.lc_site }}">Library Carpentry</a>
+       Licensed under <a href="{{ site.cc_by_human }}">CC-BY 4.0</a> 2016–{{ 'now' | date: "%Y" }}
+       by <a href="{{ site.lc_site }}">Library Carpentry</a>
        {% elsif site.carpentry == "cp" %}
-       Copyright &copy; 2018–{{ 'now' | date: "%Y" }}
-       <a href="{{ site.carpentries_site }}">The Carpentries</a>
+       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>
        {% endif %}
     </div>
     <div class="col-md-6 help-links" align="right">
index 0a2ecc6b0e4ebab683cbb10bd73b3c4afcf17208..2e1c291e526ff8ae788b081c6f758c6bd763b348 100644 (file)
@@ -163,7 +163,7 @@ img {
 footer .copyright,
 footer .help-links
 {
-    font-size: 18px;
+    font-size: inherit;
     margin-top: 10px;
     margin-bottom: 10px;
     font-weight: 500;
index 795a35c390ef52cffed2dc6bcc3c384eacde461f..5d6beb1d08c38eac79cb22a30237421c89164fff 100644 (file)
@@ -43,6 +43,7 @@ template_repo: "https://github.com/carpentries/styles"
 training_site: "https://carpentries.github.io/instructor-training"
 workshop_repo: "https://github.com/carpentries/workshop-template"
 workshop_site: "https://carpentries.github.io/workshop-template"
+cc_by_human: "https://creativecommons.org/licenses/by/4.0/"
 
 # Surveys.
 swc_pre_survey: "https://www.surveymonkey.com/r/swc_pre_workshop_v1?workshop_id="