Merge branch 'gh-pages' into 237

diff --git a/_includes/lesson_footer.html b/_includes/lesson_footer.html
index 763463be868445275c6571a61fb4a4e553c6f568..c6934e04b6b09f9661f80ddd47182c62638766e4 100644 (file)
--- a/_includes/lesson_footer.html
+++ b/_includes/lesson_footer.html
@@ -4,7 +4,6 @@
 <footer>
   <div class="row">
     <div class="col-md-6" align="left">
-      <h4>
        {% if site.carpentry == "swc" %}
        Copyright &copy; 2018–{{ 'now' | date: "%Y" }}
        <a href="{{ site.carpentries_site }}">The Carpentries</a>
@@ -21,10 +20,8 @@
        Copyright &copy; 2016–{{ 'now' | date: "%Y" }}
        <a href="{{ site.lc_site }}">Library Carpentry</a>
        {% endif %}
-      </h4>
     </div>
     <div class="col-md-6" align="right">
-      <h4>
        {% if page.source %}
        {% if page.source == "Rmd" %}
        <a href="{{site.github.repository_url}}/edit/gh-pages/{{page.path|replace: "_episodes", "_episodes_rmd" | replace: ".md", ".Rmd"}}">Edit on GitHub</a>
@@ -40,7 +37,6 @@
        <a href="{{ site.github.repository_url }}/blob/gh-pages/CITATION">Cite</a>
        /
        <a href="mailto:{{ site.email }}">Contact</a>
-      </h4>
     </div>
   </div>
 </footer>

diff --git a/_layouts/base.html b/_layouts/base.html
index a188a7146f90d1a349748a4b3884a564a4e129e0..4eee9dcdaa6b1b6e994b9ae39188f48c863221ab 100644 (file)
--- a/_layouts/base.html
+++ b/_layouts/base.html
@@ -8,17 +8,17 @@
     <meta http-equiv="last-modified" content="{{ site.time }}">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <!-- meta "search-domain" used for google site search function google_search() -->
-    <meta name="search-domain" value="{{ site.github.html_url }}">
+    <meta name="search-domain" value="{{ site.github.url }}">
     <link rel="stylesheet" type="text/css" href="{{ page.root }}/assets/css/bootstrap.css" />
     <link rel="stylesheet" type="text/css" href="{{ page.root }}/assets/css/bootstrap-theme.css" />
     <link rel="stylesheet" type="text/css" href="{{ page.root }}/assets/css/lesson.css" />
     <link rel="stylesheet" type="text/css" href="{{ page.root }}/assets/css/syntax.css" />
     {% if site.carpentry == "swc" %}
-    <link rel="shortcut icon" type="image/x-icon" href="/favicon-swc.ico" />
+    <link rel="shortcut icon" type="image/x-icon" href="{{ page.root }}/assets/img/favicon-swc.ico" />
     {% elsif site.carpentry == "dc" %}
-    <link rel="shortcut icon" type="image/x-icon" href="/favicon-dc.ico" />
+    <link rel="shortcut icon" type="image/x-icon" href="{{ page.root }}/assets/img/favicon-dc.ico" />
     {% elsif site.carpentry == "lc" %}
-    <link rel="shortcut icon" type="image/x-icon" href="/favicon-lc.ico" />
+    <link rel="shortcut icon" type="image/x-icon" href="{{ page.root }}/assets/img/favicon-lc.ico" />
     {% endif %}
     <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->

diff --git a/assets/css/lesson.scss b/assets/css/lesson.scss
index d2a2f29f6b21d7afccb07ffff29988ab24d481ec..4c8c7ccddb05f993cd3230ebc4e6c2ac480fb9ed 100644 (file)
--- a/assets/css/lesson.scss
+++ b/assets/css/lesson.scss
@@ -140,6 +140,14 @@ img {
   text-align: center;
 }
 
+footer {
+    font-size: 18px;
+    margin-top: 10px;
+    margin-bottom: 10px;
+    font-weight: 500;
+    line-height: 1.1;
+}
+
 img.navbar-logo {
   height: 40px; // synchronize with height of navbar
   padding-top: 5px;