upgrade to bootstrap 4, complete rewrite of template (#629)

2020-05-02 02:10:20 -04:00 · 2020-05-02 02:10:20 -04:00 · 54ca402373
commit 54ca402373
parent 67bd8058c7
41 changed files with 642 additions and 10358 deletions
--- a/_includes/disqus.html
+++ b/_includes/disqus.html
@ -1,19 +1,19 @@
 {%- if site.disqus -%}
 <div class="disqus-comments">
-<div class="comments">
+  <div class="comments">
    <div id="disqus_thread"></div>
    <script type="text/javascript">
-        var disqus_shortname = '{{ site.disqus }}';
-        /* ensure that pages with query string get the same discussion */
-            var url_parts = window.location.href.split("?");
-            var disqus_url = url_parts[0];
-        (function() {
-            var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-            dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
-            (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-        })();
+	  var disqus_shortname = '{{ site.disqus }}';
+	  /* ensure that pages with query string get the same discussion */
+	  var url_parts = window.location.href.split("?");
+	  var disqus_url = url_parts[0];
+	  (function() {
+		var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+		dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
+		(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+	  })();
    </script>
    <noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
-</div>
+  </div>
 </div>
 {%- endif -%}
--- a/_includes/ext-css.html
+++ b/_includes/ext-css.html
@ -1,7 +1,7 @@
 {% if include.css.sri %}
  <link href="{{ include.css.href }}" rel="stylesheet" integrity="{{ include.css.sri }}" crossorigin="anonymous">
 {% elsif include.css.href %}
-  <link rel="stylesheet" href="{{ include.css.href }}" />
+  <link rel="stylesheet" href="{{ include.css.href }}">
 {% else %}
-  <link rel="stylesheet" href="{{ include.css }}" />
+  <link rel="stylesheet" href="{{ include.css }}">
 {% endif %}
--- a/_includes/fb-comment.html
+++ b/_includes/fb-comment.html
@ -1,14 +1,16 @@
 {%- if site.fb_comment_id -%}
 <div class="comments">
-    <div id="fb-root"></div>
-    <script>(function(d, s, id) {
-       var js, fjs = d.getElementsByTagName(s)[0];
-       if (d.getElementById(id)) return;
-       js = d.createElement(s); js.id = id;
-       js.src = 'https://connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.12&appId={{ site.fb_comment_id }}&autoLogAppEvents=1';
-       fjs.parentNode.insertBefore(js, fjs);
-    }(document, 'script', 'facebook-jssdk'));</script>
-    <div class="fb-comments" data-href="{{ page.url | absolute_url }}" data-width="100%" data-numposts="5"></div>
-    <noscript>Please enable JavaScript to view the comments powered by Facebook.</noscript>
+  <div id="fb-root"></div>
+  <script>
+    (function(d, s, id) {
+      var js, fjs = d.getElementsByTagName(s)[0];
+      if (d.getElementById(id)) return;
+      js = d.createElement(s); js.id = id;
+      js.src = 'https://connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.12&appId={{ site.fb_comment_id }}&autoLogAppEvents=1';
+      fjs.parentNode.insertBefore(js, fjs);
+    }(document, 'script', 'facebook-jssdk'));
+  </script>
+  <div class="fb-comments" data-href="{{ page.url | absolute_url }}" data-width="100%" data-numposts="5"></div>
+  <noscript>Please enable JavaScript to view the comments powered by Facebook.</noscript>
 </div>
 {%- endif -%}
--- a/_includes/footer-minimal.html
+++ b/_includes/footer-minimal.html
@ -1,18 +1,18 @@
 <footer class="footer-min">
  <div class="text-muted">
-	{% if site.author %}
-	{{ site.author }}
-	&nbsp;&nbsp;&bull;&nbsp;&nbsp;
-	{% endif %}
-	{% if page.date %}
-	  {{ page.date }}
-	{% else %}
-	  {{ site.time | date: '%Y' }}
-	{% endif %}
+    {% if site.author %}
+      {{ site.author }}
+      &nbsp;&nbsp;&bull;&nbsp;&nbsp;
+    {% endif %}
+    {% if page.date %}
+      {{ page.date }}
+    {% else %}
+      {{ site.time | date: '%Y' }}
+    {% endif %}

    {% if site.url-pretty %}
-    &nbsp;&nbsp;&bull;&nbsp;&nbsp;
-    <a href="{{ '' | absolute_url }}">{{ site.url-pretty }}</a>
+      &nbsp;&nbsp;&bull;&nbsp;&nbsp;
+      <a href="{{ '' | absolute_url }}">{{ site.url-pretty }}</a>
    {% endif %}
  </div>
 </footer>
--- a/_includes/footer-scripts.html
+++ b/_includes/footer-scripts.html
@ -9,9 +9,9 @@
    <!-- doing something a bit funky here because I want to be careful not to include JQuery twice! -->
    {% if js contains 'jquery' %}
      <script>
-      	if (typeof jQuery == 'undefined') {
+        if (typeof jQuery == 'undefined') {
          document.write('<script src="{{ js | relative_url }}"></scr' + 'ipt>');
-      	}
+        }
      </script>
    {% else %}
      <script src="{{ js | relative_url }}"></script>
--- a/_includes/footer.html
+++ b/_includes/footer.html
@ -1,7 +1,7 @@
 <footer>
-  <div class="container beautiful-jekyll-footer">
+  <div class="container-md beautiful-jekyll-footer">
    <div class="row">
-      <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
+      <div class="col-xl-8 offset-xl-2 col-lg-10 offset-lg-1">
      {% include social-networks-links.html %}
      {% if page.footer-extra %}
        <div class="footer-custom-content">
@ -10,14 +10,14 @@
      {% endif %}
      <p class="copyright text-muted">
      {% if site.author %}
-      {{ site.author }}
-      &nbsp;&bull;&nbsp;
+        {{ site.author }}
+        &nbsp;&bull;&nbsp;
      {% endif %}
      {{ site.time | date: '%Y' }}

      {% if site.url-pretty %}
-      &nbsp;&bull;&nbsp;
-      <a href="{{ '' | absolute_url }}">{{ site.url-pretty }}</a>
+        &nbsp;&bull;&nbsp;
+        <a href="{{ '' | absolute_url }}">{{ site.url-pretty }}</a>
      {% endif %}

      {% if site.matomo %}
--- a/_includes/google_analytics.html
+++ b/_includes/google_analytics.html
@ -1,14 +1,14 @@
 {% if site.google_analytics %}
 <!-- Google Analytics -->
 <script>
-    (function (i, s, o, g, r, a, m) {
-        i['GoogleAnalyticsObject'] = r; i[r] = i[r] || function () {
-            (i[r].q = i[r].q || []).push(arguments)
-        }, i[r].l = 1 * new Date(); a = s.createElement(o),
-            m = s.getElementsByTagName(o)[0]; a.async = 1; a.src = g; m.parentNode.insertBefore(a, m)
-    })(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
-    ga('create', '{{ site.google_analytics }}', 'auto');
-    ga('send', 'pageview');
+  (function (i, s, o, g, r, a, m) {
+    i['GoogleAnalyticsObject'] = r; i[r] = i[r] || function () {
+      (i[r].q = i[r].q || []).push(arguments)
+    }, i[r].l = 1 * new Date(); a = s.createElement(o),
+      m = s.getElementsByTagName(o)[0]; a.async = 1; a.src = g; m.parentNode.insertBefore(a, m)
+  })(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
+  ga('create', '{{ site.google_analytics }}', 'auto');
+  ga('send', 'pageview');
 </script>
 <!-- End Google Analytics -->
 {% endif %}
--- a/_includes/gtag.html
+++ b/_includes/gtag.html
@ -1,11 +1,10 @@
 {% if site.gtag %}
 <!-- Global site tag (gtag.js) - Google Analytics -->
 <script async src="https://www.googletagmanager.com/gtag/js?id={{ site.gtag }}"></script>
-    <script>
-          window.dataLayer = window.dataLayer || [];
+<script>
+  window.dataLayer = window.dataLayer || [];
  function gtag(){dataLayer.push(arguments);}
  gtag('js', new Date());
-
  gtag('config', '{{ site.gtag }}');
 </script>
 {% endif %}
--- a/_includes/gtm_body.html
+++ b/_includes/gtm_body.html
@ -1,6 +1,5 @@
 {% if site.gtm %}
-    <!-- Google Tag Manager (noscript) -->
-    <noscript><iframe src="https://www.googletagmanager.com/ns.html?id={{ site.gtm }}"
-    height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
-    <!-- End Google Tag Manager (noscript) -->
+  <!-- Google Tag Manager (noscript) -->
+  <noscript><iframe src="https://www.googletagmanager.com/ns.html?id={{ site.gtm }}" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+  <!-- End Google Tag Manager (noscript) -->
 {% endif %}
--- a/_includes/gtm_head.html
+++ b/_includes/gtm_head.html
@ -1,9 +1,11 @@
 {% if site.gtm %}
-    <!-- Google Tag Manager -->
-    <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-    new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-    j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-    'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-    })(window,document,'script','dataLayer','{{ site.gtm }}');</script>
-    <!-- End Google Tag Manager -->
+  <!-- Google Tag Manager -->
+  <script>
+    (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+      new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+      j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+      'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+    })(window,document,'script','dataLayer','{{ site.gtm }}');
+  </script>
+  <!-- End Google Tag Manager -->
 {% endif %}
--- a/_includes/head.html
+++ b/_includes/head.html
@ -1,19 +1,18 @@
 <head>
-  <meta charset="utf-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, viewport-fit=cover">
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">

  <title>{% if page.use-site-title %}{{ site.title }} {{ site.title-separator | default: '-' }} {{ site.description }}{% elsif page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
  
  {% if site.author %}
-  <meta name="author" content="{{ site.author }}" />
+  <meta name="author" content="{{ site.author }}">
  {% endif %}
  
  {% if page.subtitle %}
  <meta name="description" content="{{ page.subtitle }}">
  {% endif %}

-  <link rel="alternate" type="application/rss+xml" title="{{ site.title | default: 'Untitled' }} {{ site.title-separator | default: '-' }} {{ site.description }}" href="{{ '/feed.xml' | absolute_url }}" />
+  <link rel="alternate" type="application/rss+xml" title="{{ site.title | default: 'Untitled' }} {{ site.title-separator | default: '-' }} {{ site.description }}" href="{{ '/feed.xml' | absolute_url }}">

  {% include gtag.html %}
  {% include gtm_head.html %}
@ -27,13 +26,13 @@

  {% if layout.common-css %}
    {% for css in layout.common-css %}
-      <link rel="stylesheet" href="{{ css | relative_url }}" />
+      <link rel="stylesheet" href="{{ css | relative_url }}">
    {% endfor %}
  {% endif %}

  {% if layout.common-googlefonts %}
    {% for font in layout.common-googlefonts %}
-      <link rel="stylesheet" href="//fonts.googleapis.com/css?family={{ font }}" />
+      <link rel="stylesheet" href="//fonts.googleapis.com/css?family={{ font }}">
    {% endfor %}
  {% endif %}

@ -45,27 +44,27 @@

  {% if page.css %}
    {% for css in page.css %}
-      <link rel="stylesheet" href="{{ css | relative_url }}" />
+      <link rel="stylesheet" href="{{ css | relative_url }}">
    {% endfor %}
  {% endif %}

  {% if page.googlefonts %}
    {% for font in page.googlefonts %}
-      <link rel="stylesheet" href="//fonts.googleapis.com/css?family={{ font }}" />
+      <link rel="stylesheet" href="//fonts.googleapis.com/css?family={{ font }}">
    {% endfor %}
  {% endif %}

    <!-- Facebook OpenGraph tags -->
  {% if site.fb_app_id %}
-  <meta property="fb:app_id" content="{{ site.fb_app_id }}" />
+  <meta property="fb:app_id" content="{{ site.fb_app_id }}">
  {% endif %}

  {% if page.meta-title %}
-  <meta property="og:title" content="{{ page.meta-title }}" />
+  <meta property="og:title" content="{{ page.meta-title }}">
  {% elsif page.title %}
-  <meta property="og:title" content="{{ page.title }}" />
+  <meta property="og:title" content="{{ page.title }}">
  {% elsif site.title %}
-  <meta property="og:title" content="{{ site.title }}" />
+  <meta property="og:title" content="{{ site.title }}">
  {% endif %}

   {% if page.meta-description %}
@ -77,34 +76,34 @@
  {% endif %}


-  <meta property="og:type" content="website" />
+  <meta property="og:type" content="website">

  {% if page.id %}
-  <meta property="og:url" content="{{ page.url | absolute_url }}" />
-  <link rel="canonical" href="{{ page.url | absolute_url }}" />
+  <meta property="og:url" content="{{ page.url | absolute_url }}">
+  <link rel="canonical" href="{{ page.url | absolute_url }}">
  {% else %}
-  <meta property="og:url" content="{{ page.url | absolute_url | strip_index }}" />
-  <link rel="canonical" href="{{ page.url | absolute_url | strip_index }}" />
+  <meta property="og:url" content="{{ page.url | absolute_url | strip_index }}">
+  <link rel="canonical" href="{{ page.url | absolute_url | strip_index }}">
  {% endif %}

  {% if page.share-img %}
-  <meta property="og:image" content="{{ page.share-img }}" />
+  <meta property="og:image" content="{{ page.share-img }}">
  {% elsif site.avatar %}
-  <meta property="og:image" content="{{ site.avatar | absolute_url }}" />
+  <meta property="og:image" content="{{ site.avatar | absolute_url }}">
  {% endif %}


  <!-- Twitter summary cards -->
-  <meta name="twitter:card" content="summary" />
-  <meta name="twitter:site" content="@{{ site.social-network-links.twitter }}" />
-  <meta name="twitter:creator" content="@{{ site.social-network-links.twitter }}" />
+  <meta name="twitter:card" content="summary">
+  <meta name="twitter:site" content="@{{ site.social-network-links.twitter }}">
+  <meta name="twitter:creator" content="@{{ site.social-network-links.twitter }}">

  {% if page.meta-title %}
-  <meta name="twitter:title" content="{{ page.meta-title }}" />
+  <meta name="twitter:title" content="{{ page.meta-title }}">
  {% elsif page.title %}
-  <meta name="twitter:title" content="{{ page.title }}" />
+  <meta name="twitter:title" content="{{ page.title }}">
  {% else %}
-  <meta name="twitter:title" content="{{ site.title }}" />
+  <meta name="twitter:title" content="{{ site.title }}">
  {% endif %}

  {% if page.meta-description %}
@ -116,9 +115,9 @@
  {% endif %}

  {% if page.share-img %}
-  <meta name="twitter:image" content="{{ page.share-img }}" />
+  <meta name="twitter:image" content="{{ page.share-img }}">
  {% elsif site.avatar %}
-  <meta name="twitter:image" content="{{ site.avatar | absolute_url }}" />
+  <meta name="twitter:image" content="{{ site.avatar | absolute_url }}">
  {% endif %}

  {% if site.matomo %}
@ -127,7 +126,7 @@

  {% if page.comments and site.staticman.repository and site.staticman.branch %}
  <!-- Staticman -->
-  <link rel="stylesheet" href="{{ "/assets/css/staticman.css" | relative_url }}" />
+  <link rel="stylesheet" href="{{ "/assets/css/staticman.css" | relative_url }}">
  {% endif %}

 </head>
--- a/_includes/header.html
+++ b/_includes/header.html
@ -2,11 +2,11 @@

 {% assign date_format = site.date_format | default: "%B %-d, %Y" %}

-{% if page.bigimg or page.title %}
+{% if page.cover-img or page.title %}

-{% if page.bigimg %}
-  <div id="header-big-imgs" data-num-img={% if page.bigimg.first %}{{ page.bigimg.size }}{% else %}1{% endif %}
-    {% for bigimg in page.bigimg %}
+{% if page.cover-img %}
+  <div id="header-big-imgs" data-num-img={% if page.cover-img.first %}{{ page.cover-img.size }}{% else %}1{% endif %}
+    {% for bigimg in page.cover-img %}
    {% assign imgnum = forloop.index %}
    {% for imginfo in bigimg %}
      {% if imginfo[0] %}
@ -20,12 +20,12 @@
  ></div>
 {% endif %}

-<header class="header-section {% if page.bigimg %}has-img{% endif %}">
-{% if page.bigimg %}
+<header class="header-section {% if page.cover-img %}has-img{% endif %}">
+{% if page.cover-img %}
 <div class="big-img intro-header">
-  <div class="container">
+  <div class="container-md">
    <div class="row">
-      <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
+      <div class="col-xl-8 offset-xl-2 col-lg-10 offset-lg-1">
        <div class="{{ include.type }}-heading">
          <h1>{% if page.title %}{{ page.title }}{% else %}<br/>{% endif %}</h1>
      {% if page.subtitle %}
@ -51,9 +51,9 @@
 </div>
 {% endif %}
 <div class="intro-header no-img">
-  <div class="container">
+  <div class="container-md">
    <div class="row">
-      <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
+      <div class="col-xl-8 offset-xl-2 col-lg-10 offset-lg-1">
        <div class="{{ include.type }}-heading">
          <h1>{% if page.title %}{{ page.title }}{% else %}<br/>{% endif %}</h1>
      {% if page.subtitle %}
--- a/_includes/nav.html
+++ b/_includes/nav.html
@ -1,57 +1,54 @@
-<nav class="navbar navbar-default navbar-fixed-top navbar-custom {% if page.nav-short %}top-nav-short-permanent{% endif %}">
-  <div class="container-fluid">
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#main-navbar">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      {%- if site.title-img -%}
-        <a class="navbar-brand navbar-brand-logo" href="{{ '' | absolute_url }}"><img src="{{ site.title-img }}"/></a>
-      {%- elsif site.title -%}
-        <a class="navbar-brand" href="{{ '' | absolute_url }}">{{ site.title }}</a>
-      {%- endif -%}
-    </div>
+<nav class="navbar navbar-expand-md navbar-light fixed-top navbar-custom {% if page.nav-short %}top-nav-short-permanent{% endif %}">

-    <div class="collapse navbar-collapse" id="main-navbar">
-      <ul class="nav navbar-nav navbar-right">
+  {%- if site.title-img -%}
+    <a class="navbar-brand navbar-brand-logo" href="{{ '' | absolute_url }}"><img src="{{ site.title-img }}"/></a>
+  {%- elsif site.title -%}
+    <a class="navbar-brand" href="{{ '' | absolute_url }}">{{ site.title }}</a>
+  {%- endif -%}
+
+  <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#main-navbar" aria-controls="main-navbar" aria-expanded="false" aria-label="Toggle navigation">
+    <span class="navbar-toggler-icon"></span>
+  </button>
+
+  <div class="collapse navbar-collapse" id="main-navbar">
+    <ul class="navbar-nav ml-auto">
      {%- for link in site.navbar-links -%}
        {%- if link[1].first %}
-          <li class="navlinks-container">
-            <a class="navlinks-parent" href="javascript:void(0)">{{ link[0] }}</a>
-            <div class="navlinks-children">
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{ link[0] }}</a>
+            <div class="dropdown-menu" aria-labelledby="navbarDropdown">
              {%- for childlink in link[1] -%}
-              {%- for linkparts in childlink %}
-              <a href="{{ linkparts[1] | relative_url }}">{{ linkparts[0] }}</a>
-              {%- endfor -%}
+                {%- for linkparts in childlink %}
+                  <a class="dropdown-item" href="{{ linkparts[1] | relative_url }}">{{ linkparts[0] }}</a>
+                {%- endfor -%}
              {%- endfor %}
            </div>
          </li>
        {% else %}
-          <li><a href="{{ link[1] | relative_url }}">{{ link[0] }}</a></li>
+          <li class="nav-item">
+            <a class="nav-link" href="{{ link[1] | relative_url }}">{{ link[0] }}</a>
+          </li>
        {%- endif -%}
      {%- endfor -%}
-      </ul>
-    </div>
-
-	{% if page.image and (layout.show-avatar or page.show-avatar) %}
-	<div class="avatar-container">
-	  <div class="avatar-img-border">
-	    <a href="{{ '' | absolute_url }}">
-	      <img class="avatar-img" src="{{ page.image | relative_url }}" />
-		</a>
-	  </div>
-	</div>
-	{% elsif site.avatar and (layout.show-avatar or page.show-avatar) %}
-	<div class="avatar-container">
-	  <div class="avatar-img-border">
-	    <a href="{{ '' | absolute_url }}">
-	      <img class="avatar-img" src="{{ site.avatar | relative_url }}" />
-		</a>
-	  </div>
-	</div>
-	{% endif %}
-
+    </ul>
  </div>
+
+  {% if page.image and (layout.show-avatar or page.show-avatar) %}
+    <div class="avatar-container">
+      <div class="avatar-img-border">
+        <a href="{{ '' | absolute_url }}">
+          <img class="avatar-img" src="{{ page.image | relative_url }}" />
+        </a>
+      </div>
+    </div>
+  {% elsif site.avatar and (layout.show-avatar or page.show-avatar) %}
+    <div class="avatar-container">
+      <div class="avatar-img-border">
+        <a href="{{ '' | absolute_url }}">
+          <img class="avatar-img" src="{{ site.avatar | relative_url }}" />
+        </a>
+      </div>
+    </div>
+  {% endif %}
+
 </nav>
--- a/_includes/readtime.html
+++ b/_includes/readtime.html
@ -4,13 +4,13 @@
 {% assign calcReadTime = ReadTime | float %}
 {% assign finalReadTime = calcReadTime | divided_by:200 | round: 2 %}
 {% assign number = finalReadTime | round %}
-  {% if number >= 1 %}
-    {% assign yesReadTime = number | append: " minute read" %}
-    <span class="reader-time post-meta"><span class="hidden-xs middot">&middot;</span> {{ yesReadTime }}</span>
-  {% elsif number < 1 %}
-    {% assign minReadTime = '&lt; 1 minute read' %}
-    <span class="reader-time post-meta"><span class="hidden-xs middot">&middot;</span> {{ minReadTime }}</span>
-  {% else %}
-    {% assign nilReadTime = number | replace:'0',' ' %}
-      {{ nilReadTime }}
-  {% endif %}
+{% if number >= 1 %}
+  {% assign yesReadTime = number | append: " minute read" %}
+  <span class="reader-time post-meta"><span class="d-none d-md-inline middot">&middot;</span> {{ yesReadTime }}</span>
+{% elsif number < 1 %}
+  {% assign minReadTime = '&lt; 1 minute read' %}
+  <span class="reader-time post-meta"><span class="d-none d-md-inline middot">&middot;</span> {{ minReadTime }}</span>
+{% else %}
+  {% assign nilReadTime = number | replace:'0',' ' %}
+  {{ nilReadTime }}
+{% endif %}
--- a/_includes/social-networks-links.html
+++ b/_includes/social-networks-links.html
@ -1,7 +1,7 @@
 <ul class="list-inline text-center footer-links">

 {%- if site.social-network-links.rss -%}
-  <li>
+  <li class="list-inline-item">
    <a href="{{ '/feed.xml' | relative_url }}" title="RSS">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
@ -13,7 +13,7 @@
 {%- endif -%}

 {%- if site.social-network-links.email -%}
-  <li>
+  <li class="list-inline-item">
    <a href="mailto:{{ site.social-network-links.email }}" title="Email me">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
@ -25,7 +25,7 @@
 {%- endif -%}

 {%- if site.social-network-links.calendly -%}
-  <li>
+  <li class="list-inline-item">
    <a href="https://calendly.com/{{ site.social-network-links.calendly }}" title="Schedule a meeting with me">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
@ -37,7 +37,7 @@
 {%- endif -%}

 {%- if site.social-network-links.facebook -%}
-  <li>
+  <li class="list-inline-item">
    <a href="https://www.facebook.com/{{ site.social-network-links.facebook }}" title="Facebook">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
@ -49,7 +49,7 @@
 {%- endif -%}

 {%- if site.social-network-links.telegram -%}
-  <li>
+  <li class="list-inline-item">
    <a href="https://t.me/{{ site.social-network-links.telegram }}" title="Telegram">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
@ -61,7 +61,7 @@
 {%- endif -%}
  
 {%- if site.social-network-links.github -%}
-  <li>
+  <li class="list-inline-item">
    <a href="https://github.com/{{ site.social-network-links.github }}" title="GitHub">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
@ -73,7 +73,7 @@
 {%- endif -%}

 {%- if site.social-network-links.twitter -%}
-  <li>
+  <li class="list-inline-item">
    <a href="https://twitter.com/{{ site.social-network-links.twitter }}" title="Twitter">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
@ -85,7 +85,7 @@
 {%- endif -%}

 {%- if site.social-network-links.reddit -%}
-  <li>
+  <li class="list-inline-item">
    <a href="https://reddit.com/u/{{ site.social-network-links.reddit }}" title="Reddit">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
@ -97,7 +97,7 @@
 {%- endif -%}

 {%- if site.social-network-links.linkedin -%}
-  <li>
+  <li class="list-inline-item">
    <a href="https://linkedin.com/in/{{ site.social-network-links.linkedin }}" title="LinkedIn">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
@ -109,7 +109,7 @@
 {%- endif -%}

 {%- if site.social-network-links.xing -%}
-  <li>
+  <li class="list-inline-item">
    <a href="https://www.xing.com/profile/{{ site.social-network-links.xing }}" title="Xing">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
@ -121,7 +121,7 @@
 {%- endif -%}

 {%- if site.social-network-links.stackoverflow -%}
-  <li>
+  <li class="list-inline-item">
    <a href="https://stackoverflow.com/users/{{ site.social-network-links.stackoverflow }}" title="StackOverflow">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
@ -133,7 +133,7 @@
 {%- endif -%}

 {%- if site.social-network-links.snapchat -%}
-  <li>
+  <li class="list-inline-item">
    <a href="https://www.snapchat.com/add/{{ site.social-network-links.snapchat }}" title="Snapchat">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
@ -145,7 +145,7 @@
 {%- endif -%}

 {%- if site.social-network-links.instagram -%}
-  <li>
+  <li class="list-inline-item">
    <a href="https://www.instagram.com/{{ site.social-network-links.instagram }}" title="Instagram">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
@ -157,7 +157,7 @@
 {%- endif -%}

 {%- if site.social-network-links.youtube -%}
-  <li>
+  <li class="list-inline-item">
    <a href="https://www.youtube.com/{{ site.social-network-links.youtube }}" title="YouTube">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
@ -169,7 +169,7 @@
 {%- endif -%}

 {%- if site.social-network-links.spotify -%}
-  <li>
+  <li class="list-inline-item">
    <a href="https://open.spotify.com/user/{{ site.social-network-links.spotify }}" title="Spotify">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
@ -181,7 +181,7 @@
 {%- endif -%}

 {%- if site.social-network-links.telephone -%}
-  <li>
+  <li class="list-inline-item">
    <a href="tel:{{ site.social-network-links.telephone }}" title="Phone">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
@ -193,7 +193,7 @@
 {%- endif -%}

 {%- if site.social-network-links.steam -%}
-  <li>
+  <li class="list-inline-item">
    <a href="https://steamcommunity.com/id/{{ site.social-network-links.steam }}" title="Steam">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
@ -205,7 +205,7 @@
 {%- endif -%}

 {%- if site.social-network-links.twitch -%}
-  <li>
+  <li class="list-inline-item">
    <a href="https://www.twitch.tv/{{ site.social-network-links.twitch }}" title="Twitch">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
@ -217,7 +217,7 @@
 {%- endif -%}

 {%- if site.social-network-links.yelp -%}
-  <li>
+  <li class="list-inline-item">
    <a href="https://{{ site.social-network-links.yelp }}.yelp.com" title="Yelp">
      <span class="fa-stack fa-lg" aria-hidden="true">
        <i class="fas fa-circle fa-stack-2x"></i>
--- a/_includes/social-share.html
+++ b/_includes/social-share.html
@ -11,7 +11,6 @@
  <span class="sr-only">Share: </span>

  {% if site.share-links-active.twitter %}
-  <!--- Share on Twitter -->
    <a href="https://twitter.com/intent/tweet?text={{ page.title | url_encode }}&url={{ page.url | absolute_url | url_encode }}"
      class="btn btn-social-icon btn-twitter" title="Share on Twitter">
      <span class="fab fa-fw fa-twitter" aria-hidden="true"></span>
@ -20,7 +19,6 @@
  {% endif %}

  {% if site.share-links-active.facebook %}
-  <!--- Share on Facebook -->
    <a href="https://www.facebook.com/sharer/sharer.php?u={{ page.url | absolute_url | url_encode }}"
      class="btn btn-social-icon btn-facebook" title="Share on Facebook">
      <span class="fab fa-fw fa-facebook" aria-hidden="true"></span>
@ -29,7 +27,6 @@
  {% endif %}

  {% if site.share-links-active.linkedin %}
-  <!--- Share on LinkedIn -->
    <a href="https://www.linkedin.com/shareArticle?mini=true&url={{ page.url | absolute_url | url_encode }}"
      class="btn btn-social-icon btn-linkedin" title="Share on LinkedIn">
      <span class="fab fa-fw fa-linkedin" aria-hidden="true"></span>
--- a/_includes/staticman-comments.html
+++ b/_includes/staticman-comments.html
@ -25,7 +25,7 @@
        <div class="form-group">
          <label for="comment-form-message">{{ site.data.ui-text[site.locale].comment_form_comment_label | default: "Comment" }} <small class="required">*</small></label><br>
          <textarea type="text" rows="12" cols="36" id="comment-form-message" name="fields[message]" tabindex="1"></textarea>
-          <div class="small help-block"><a href="https://daringfireball.net/projects/markdown/">{{ site.data.ui-text[site.locale].comment_form_md_info | default: "Markdown is supported." }}</a></div>
+          <div class="small form-text"><a href="https://daringfireball.net/projects/markdown/">{{ site.data.ui-text[site.locale].comment_form_md_info | default: "Markdown is supported." }}</a></div>
        </div>
        <div class="form-group">
          <label for="comment-form-name">{{ site.data.ui-text[site.locale].comment_form_name_label | default: "Name" }} <small class="required">*</small></label>