Merging changes from other branches

diff --git a/_includes/carpentries.html b/_includes/carpentries.html
index c42bfcf2feef253fd63a7dab23ed521458fa8510..a0e0181fc7bf984d7b95a9c0b70e1230d6e350a4 100644 (file)
--- a/_includes/carpentries.html
+++ b/_includes/carpentries.html
@@ -26,3 +26,19 @@
     building on learners' existing knowledge to enable them to quickly apply skills learned to their own research.
   </div>
 </div>
+<br/>
+<div class="row">
+  <div class="col-md-2" align="center">
+    <a href="{{ site.lc_site }}"><img src="{{ page.root }}/assets/img/lc-icon-black.svg" alt="Library Carpentry logo" /></a>
+  </div>
+  <div class="col-md-8">
+    Library Carpentry is made by librarians to help librarians
+    automate repetitive, boring, error-prone tasks;
+    create, maintain and analyse sustainable and reusable data;
+    work effectively with IT and systems colleagues;
+    better understand the use of software in research;
+    and much more.
+    Library Carpentry was the winner of the 2016
+    <a href="http://labs.bl.uk/British+Library+Labs+Awards">British Library Labs Teaching and Learning Award</a>.
+  </div>
+</div>

diff --git a/_includes/workshop_footer.html b/_includes/workshop_footer.html
index c618999e70a63557e1e9f0ae482b7f47061f0937..3ae63e6dc8f48dd341532e0fd95582e72e50c6e5 100644 (file)
--- a/_includes/workshop_footer.html
+++ b/_includes/workshop_footer.html
@@ -3,11 +3,14 @@
 {% endcomment %}
 <footer>
   <div class="row">
-    <div class="col-md-6" align="left">
+    <div class="col-md-4" align="left">
       <h4><a href="{{ site.swc_site }}">Software Carpentry</a></h4>
     </div>
-    <div class="col-md-6" align="right">
+    <div class="col-md-4" align="right">
       <h4><a href="{{ site.dc_site }}">Data Carpentry</a></h4>
     </div>
+    <div class="col-md-4" align="right">
+      <h4><a href="{{ site.lc_site }}">Library Carpentry</a></h4>
+    </div>
   </div>
 </footer>