oscailte 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8a5800d066a43306565d3e703c482bf80579ce3
-  data.tar.gz: 838bdaa17bebdd96c21bb7dc49c2c5fe9c9ed6ec
+  metadata.gz: 705e3361f1bef731eab4e4d6bdffcd9ca6415ad0
+  data.tar.gz: 12c4086156055fce1e2a1aa8a7a04c4f14585e4d
 SHA512:
-  metadata.gz: f960a65a0aa550f4f11fd822b7c6bb9a8d3bb72c3627bb0552d1a9aa2c42d3aa9c8e962aa82e4c88963695c84436b1b1b820151bf22c21933a98e80c1112e1d7
-  data.tar.gz: c4e677eac2a2d105d94f98de70b4b54e3845fa64040b743fc73370fd192ef331eb7dd99501194e308f59f25e9ecce4a0ca9cfff82a1cc5518cd4b50662b776a9
+  metadata.gz: 30cf38612a5d9def4087bbf1e6ec22c34c88e77c6cc856018f94483264833e9c6a49520fe392e07d32907711d77529a35a1a244307f6d4fa9f545d09d3ba651d
+  data.tar.gz: 8bd5be26dd39e5ab21df3f55454601048bb0f6a5a91fb214523d56aa00f789e27f502fbd1f3e9ce37a78c43a869be88dd35ffbf9d1d8ebe82432d17cd2f331a1

data/README.md

@@ -1,7 +1,7 @@
 # Oscailte — A Jekyll theme
 
 ---
-## ![Attention](http://i.imgur.com/iBbFfJH.png) Latest version: 3.0</sup>
+## ![Attention](http://i.imgur.com/iBbFfJH.png) Latest version: 3.0.1</sup>
 
 ---
 

data/_includes/comments.html

@@ -1,21 +1,21 @@
-{%- if page.comments != false and site.disqus.shortname and jekyll.environment == "production" -%}
-<section class="container">
-  <h1 class="SectionTitle">Comments</h1>
-  <div id="disqus_thread" class="Comments"></div>
-  <script>
-    var disqus_config = function () {
-      this.page.url = '{{ page.url | absolute_url }}';
-      this.page.identifier = '{{ page.url | absolute_url }}';
-    };
-    (function() {
-      var d = document, s = d.createElement('script');
-      s.src = 'https://{{ site.disqus.shortname }}.disqus.com/embed.js';
-      s.setAttribute('data-timestamp', +new Date());
-      (d.head || d.body).appendChild(s);
-    })();
-  </script>
-  <noscript>
-    {{ disqus_enable_javascript }}
-  </noscript>
-</section>
+{%- if page.comments != false and site.disqus.shortname and jekyll.environment == "production" -%}
+<section class="container">
+  <h1 class="SectionTitle">Comments</h1>
+  <div id="disqus_thread" class="Comments"></div>
+  <script>
+    var disqus_config = function () {
+      this.page.url = '{{ page.url | absolute_url }}';
+      this.page.identifier = '{{ page.url | absolute_url }}';
+    };
+    (function() {
+      var d = document, s = d.createElement('script');
+      s.src = 'https://{{ site.disqus.shortname }}.disqus.com/embed.js';
+      s.setAttribute('data-timestamp', +new Date());
+      (d.head || d.body).appendChild(s);
+    })();
+  </script>
+  <noscript>
+    {{ disqus_enable_javascript }}
+  </noscript>
+</section>
 {%- endif -%}

data/_includes/footer.html

@@ -1,10 +1,10 @@
-<footer class="Site__footer o-circuited">
-  <div class="Container">
-    <p>
-      All content copyright {{ site.author }}<br>
-      <small class="o-muted">Powered by <a href="https://jekyllrb.com/">Jekyll</a>, themed with <a href="https://github.com/coogie/oscailte">Oscailte</a></small>.
-    </p>
-
-    {%- include social.html -%}
-  </div>
-</footer>      
+<footer class="Site__footer o-circuited">
+  <div class="Container">
+    <p>
+      All content copyright {{ site.author }}<br>
+      <small class="o-muted">Powered by <a href="https://jekyllrb.com/">Jekyll</a>, themed with <a href="https://github.com/coogie/oscailte">Oscailte</a></small>.
+    </p>
+
+    {%- include social.html -%}
+  </div>
+</footer>      

data/_includes/google-analytics.html

@@ -1,11 +1,11 @@
-{%- assign analyics_id = site.oscailte.google_analytics -%}
-{%- if analyics_id and jekyll.environment == 'production' -%}
-<script async src="https://www.googletagmanager.com/gtag/js?id={{ analyics_id }}"></script>
-<script>
-  window['ga-disable-{{ analyics_id }}'] = window.OSCAILTE_DNT;
-  window.dataLayer = window.dataLayer || [];
-  function gtag(){dataLayer.push(arguments);}
-  gtag('js', new Date());
-  gtag('config', '{{ analyics_id }}');
-</script>
+{%- assign analyics_id = site.oscailte.google_analytics -%}
+{%- if analyics_id and jekyll.environment == 'production' -%}
+<script async src="https://www.googletagmanager.com/gtag/js?id={{ analyics_id }}"></script>
+<script>
+  window['ga-disable-{{ analyics_id }}'] = window.OSCAILTE_DNT;
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+  gtag('config', '{{ analyics_id }}');
+</script>
 {%- endif -%}

data/_includes/head.html

@@ -1,12 +1,12 @@
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <meta http-equiv="X-UA-Compatible" content="ie=edge">
-  {% seo %}
-  {% feed_meta %}
-  <link rel="icon" type="image/x-icon" href="{{ '/favicon.ico' | relative_url }}">
-  <link rel="stylesheet" href="{{ '/assets/css/main.css' | relative_url }}">
-  <script>
-    window.OSCAILTE_DNT = window.doNotTrack === "1" || navigator.doNotTrack === "1" || navigator.doNotTrack === "yes" || navigator.msDoNotTrack === "1";
-  </script>
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta http-equiv="X-UA-Compatible" content="ie=edge">
+  {% seo %}
+  {% feed_meta %}
+  <link rel="icon" type="image/x-icon" href="{{ '/favicon.ico' | relative_url }}">
+  <link rel="stylesheet" href="{{ '/assets/css/main.css' | relative_url }}">
+  <script>
+    window.OSCAILTE_DNT = window.doNotTrack === "1" || navigator.doNotTrack === "1" || navigator.doNotTrack === "yes" || navigator.msDoNotTrack === "1";
+  </script>
 </head>

data/_includes/header.html

@@ -1,17 +1,17 @@
-<header class="Header">
-  <div class="Container">
-    {% if site.title %}
-    <h1 class="Header__title">
-      <a href="{{ site.url }}">
-        {{ site.title }}
-        {% if site.subtitle %}
-          <br>
-          <small class="Header__subtitle">{{ site.subtitle }}</small>
-        {% endif %}
-      </a>
-    </h1>
-    {% endif %}
-
-    {% include navigation.html %}
-  </div>
-</header>
+<header class="Header">
+  <div class="Container">
+    {% if site.title %}
+    <h1 class="Header__title">
+      <a href="{{ '/' | relative_url }}">
+        {{ site.title }}
+        {% if site.subtitle %}
+          <br>
+          <small class="Header__subtitle">{{ site.subtitle }}</small>
+        {% endif %}
+      </a>
+    </h1>
+    {% endif %}
+
+    {% include navigation.html %}
+  </div>
+</header>

data/_includes/hero.html

@@ -1,17 +1,17 @@
-<section class="Hero o-circuited">
-  <div class="Hero__content Container">
-    {%- unless page.layout == 'post' or site.oscailte.social.github == nil -%}
-      {% avatar {{site.oscailte.social.github}} size=350 %}
-    {%- endunless -%}
-
-    <h1 class="Hero__title">
-      {{ include.title }}
-    </h1>
-
-    {% if include.meta %}
-      <div class="Hero__meta">
-        {{ include.meta }}
-      </div>
-    {% endif %}
-  </div>
+<section class="Hero o-circuited">
+  <div class="Hero__content Container">
+    {%- unless page.layout == 'post' or site.oscailte.social.github == nil -%}
+      {% avatar {{site.oscailte.social.github}} size=350 %}
+    {%- endunless -%}
+
+    <h1 class="Hero__title">
+      {{ include.title }}
+    </h1>
+
+    {% if include.meta %}
+      <div class="Hero__meta">
+        {{ include.meta }}
+      </div>
+    {% endif %}
+  </div>
 </section>

data/_includes/icon.html

@@ -1,2 +1,2 @@
-{%- capture path -%}/assets/oscailte/img/icons.svg#{{ include.icon }}{%- endcapture -%}
+{%- capture path -%}/assets/oscailte/img/icons.svg#{{ include.icon }}{%- endcapture -%}
 <svg class="Icon Icon--{{ include.icon }}"><use xlink:href="{{ path | relative_url }}"></use></svg>

data/_includes/navigation.html

@@ -1,18 +1,18 @@
-{%- assign default_paths = site.pages | map: "path" -%}
-{%- assign page_paths = site.header_pages | default: default_paths -%}
-{%- assign titles_size = site.pages | map: 'title' | join: '' | size -%}
-
-{%- if titles_size > 0 -%}
-<nav class="Navigation">
-  <ul class="Navigation__items o-list-bare">
-    {%- for path in page_paths -%}
-      {%- assign nav_page = site.pages | where: "path", path | first -%}
-      {%- if nav_page.title -%}
-      <li class="Navigation__item{% if page.url == nav_page.url %} is-active{%endif%}">
-        <a class="Navigation__link" href="{{nav_page.url}}">{{nav_page.title | escape}}</a>
-      </li>
-      {%- endif -%}
-    {%- endfor -%}
-  </ul>
-</nav>
+{%- assign default_paths = site.pages | map: "path" -%}
+{%- assign page_paths = site.header_pages | default: default_paths -%}
+{%- assign titles_size = site.pages | map: 'title' | join: '' | size -%}
+
+{%- if titles_size > 0 -%}
+<nav class="Navigation">
+  <ul class="Navigation__items o-list-bare">
+    {%- for path in page_paths -%}
+      {%- assign nav_page = site.pages | where: "path", path | first -%}
+      {%- if nav_page.title -%}
+      <li class="Navigation__item{% if page.url == nav_page.url %} is-active{%endif%}">
+        <a class="Navigation__link" href="{{ nav_page.url | relative_url }}">{{nav_page.title | escape}}</a>
+      </li>
+      {%- endif -%}
+    {%- endfor -%}
+  </ul>
+</nav>
 {% endif %}

data/_includes/social.html

@@ -1,17 +1,17 @@
-{%- assign social = site.oscailte.social -%}
-
-<div class="Social">
-  <ul class="Social__list o-list-bare">
-    {%- if social.dribbble -%}<li class="Social__item Social__item--dribbble o-no-owl"><a class="Social__link" href="https://dribbble.com/{{ social.dribbble | cgi_escape | escape }}" title="{{ social.dribbble | escape }}"> {%- include icon.html icon="dribbble" -%} </a></li>{%- endif -%}
-    {%- if social.facebook -%}<li class="Social__item Social__item--facebook o-no-owl"><a class="Social__link" href="https://www.facebook.com/{{ social.facebook | cgi_escape | escape }}" title="{{ social.facebook | escape }}"> {%- include icon.html icon="facebook" -%} </a></li>{%- endif -%}
-    {%- if social.flickr -%}<li class="Social__item Social__item--flickr o-no-owl"><a class="Social__link" href="https://www.flickr.com/photos/{{ social.flickr | cgi_escape | escape }}" title="{{ social.flickr | escape }}"> {%- include icon.html icon="flickr" -%} </a></li>{%- endif -%}
-    {%- if social.github -%}<li class="Social__item Social__item--github o-no-owl"><a class="Social__link" href="https://github.com/{{ social.github | cgi_escape | escape }}" title="{{ social.github | escape }}"> {%- include icon.html icon="github" -%} </a></li>{%- endif -%}
-    {%- if social.instagram -%}<li class="Social__item Social__item--instagram o-no-owl"><a class="Social__link" href="https://www.instagram.com/{{ social.instagram | cgi_escape | escape }}" title="{{ social.instagram | escape }}"> {%- include icon.html icon="instagram" -%} </a></li>{%- endif -%}
-    {%- if social.keybase -%}<li class="Social__item Social__item--keybase o-no-owl"><a class="Social__link" href="https://keybase.io/{{ social.keybase | cgi_escape | escape }}" title="{{ social.keybase | escape }}"> {%- include icon.html icon="keybase" -%} </a></li>{%- endif -%}
-    {%- if social.linkedin -%}<li class="Social__item Social__item--linkedin o-no-owl"><a class="Social__link" href="https://www.linkedin.com/in/{{ social.linkedin | cgi_escape | escape }}" title="{{ social.linkedin | escape }}"> {%- include icon.html icon="linkedin" -%} </a></li>{%- endif -%}
-    {%- if social.pinterest -%}<li class="Social__item Social__item--pinterest o-no-owl"><a class="Social__link" href="https://www.pinterest.com/{{ social.pinterest | cgi_escape | escape }}" title="{{ social.pinterest | escape }}"> {%- include icon.html icon="pinterest" -%} </a></li>{%- endif -%}
-    {%- if social.telegram -%}<li class="Social__item Social__item--telegram o-no-owl"><a class="Social__link" href="https://t.me/{{ social.telegram | cgi_escape | escape }}" title="{{ social.telegram | escape }}"> {%- include icon.html icon="telegram" -%} </a></li>{%- endif -%}
-    {%- if social.twitter -%}<li class="Social__item Social__item--twitter o-no-owl"><a class="Social__link" href="https://twitter.com/{{ social.twitter | cgi_escape | escape }}" title="{{ social.twitter | escape }}"> {%- include icon.html icon="twitter" -%} </a></li>{%- endif -%}
-    {%- if social.rss -%}<li class="Social__item Social__item--rss o-no-owl"><a class="Social__link" href="{{ 'feed.xml' | relative_url }}" title="{{ social.rss | escape }}"> {%- include icon.html icon="rss" -%} </a></li>{%- endif -%}
-  </ul>
+{%- assign social = site.oscailte.social -%}
+
+<div class="Social">
+  <ul class="Social__list o-list-bare">
+    {%- if social.dribbble -%}<li class="Social__item Social__item--dribbble o-no-owl"><a class="Social__link" href="https://dribbble.com/{{ social.dribbble | cgi_escape | escape }}" title="{{ social.dribbble | escape }}"> {%- include icon.html icon="dribbble" -%} </a></li>{%- endif -%}
+    {%- if social.facebook -%}<li class="Social__item Social__item--facebook o-no-owl"><a class="Social__link" href="https://www.facebook.com/{{ social.facebook | cgi_escape | escape }}" title="{{ social.facebook | escape }}"> {%- include icon.html icon="facebook" -%} </a></li>{%- endif -%}
+    {%- if social.flickr -%}<li class="Social__item Social__item--flickr o-no-owl"><a class="Social__link" href="https://www.flickr.com/photos/{{ social.flickr | cgi_escape | escape }}" title="{{ social.flickr | escape }}"> {%- include icon.html icon="flickr" -%} </a></li>{%- endif -%}
+    {%- if social.github -%}<li class="Social__item Social__item--github o-no-owl"><a class="Social__link" href="https://github.com/{{ social.github | cgi_escape | escape }}" title="{{ social.github | escape }}"> {%- include icon.html icon="github" -%} </a></li>{%- endif -%}
+    {%- if social.instagram -%}<li class="Social__item Social__item--instagram o-no-owl"><a class="Social__link" href="https://www.instagram.com/{{ social.instagram | cgi_escape | escape }}" title="{{ social.instagram | escape }}"> {%- include icon.html icon="instagram" -%} </a></li>{%- endif -%}
+    {%- if social.keybase -%}<li class="Social__item Social__item--keybase o-no-owl"><a class="Social__link" href="https://keybase.io/{{ social.keybase | cgi_escape | escape }}" title="{{ social.keybase | escape }}"> {%- include icon.html icon="keybase" -%} </a></li>{%- endif -%}
+    {%- if social.linkedin -%}<li class="Social__item Social__item--linkedin o-no-owl"><a class="Social__link" href="https://www.linkedin.com/in/{{ social.linkedin | cgi_escape | escape }}" title="{{ social.linkedin | escape }}"> {%- include icon.html icon="linkedin" -%} </a></li>{%- endif -%}
+    {%- if social.pinterest -%}<li class="Social__item Social__item--pinterest o-no-owl"><a class="Social__link" href="https://www.pinterest.com/{{ social.pinterest | cgi_escape | escape }}" title="{{ social.pinterest | escape }}"> {%- include icon.html icon="pinterest" -%} </a></li>{%- endif -%}
+    {%- if social.telegram -%}<li class="Social__item Social__item--telegram o-no-owl"><a class="Social__link" href="https://t.me/{{ social.telegram | cgi_escape | escape }}" title="{{ social.telegram | escape }}"> {%- include icon.html icon="telegram" -%} </a></li>{%- endif -%}
+    {%- if social.twitter -%}<li class="Social__item Social__item--twitter o-no-owl"><a class="Social__link" href="https://twitter.com/{{ social.twitter | cgi_escape | escape }}" title="{{ social.twitter | escape }}"> {%- include icon.html icon="twitter" -%} </a></li>{%- endif -%}
+    {%- if social.rss -%}<li class="Social__item Social__item--rss o-no-owl"><a class="Social__link" href="{{ 'feed.xml' | relative_url }}" title="{{ social.rss | escape }}"> {%- include icon.html icon="rss" -%} </a></li>{%- endif -%}
+  </ul>
 </div>

data/_includes/strings.html

@@ -1,9 +1,9 @@
-{%- assign strings = site.oscailte.strings -%}
-
-{%- assign skip_to_main_content     = strings.skip_to_main_content     | default: "Skip to main content" -%}
-{%- assign x_minute_read            = strings.x_minute_read            | default: "$x$ minute read" -%}
-{%- assign hero_title               = strings.hero_title               | default: "Welcome to Oscailte!<br> A powerful, clean, and responsive Jekyll theme." -%}
-{%- assign recent_posts             = strings.recent_posts             | default: "Recent posts" -%}
-{%- assign view_all                 = strings.view_all                 | default: "View all" -%}
-{%- assign read_full                = strings.read_full                | default: "Read full" -%}
+{%- assign strings = site.oscailte.strings -%}
+
+{%- assign skip_to_main_content     = strings.skip_to_main_content     | default: "Skip to main content" -%}
+{%- assign x_minute_read            = strings.x_minute_read            | default: "$x$ minute read" -%}
+{%- assign hero_title               = strings.hero_title               | default: "Welcome to Oscailte!<br> A powerful, clean, and responsive Jekyll theme." -%}
+{%- assign recent_posts             = strings.recent_posts             | default: "Recent posts" -%}
+{%- assign view_all                 = strings.view_all                 | default: "View all" -%}
+{%- assign read_full                = strings.read_full                | default: "Read full" -%}
 {%- assign disqus_enable_javascript = strings.disqus_enable_javascript | default: 'Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript" rel="nofollow">comments powered by Disqus</a>.' -%}

data/_layouts/default.html

@@ -1,7 +1,7 @@
----
-layout: core
----
-
-<section class="Container">
-  {{ content }}
+---
+layout: core
+---
+
+<section class="Container">
+  {{ content }}
 </section>

data/_layouts/home.html

@@ -1,44 +1,44 @@
----
-layout: core
----
-{%- include strings.html -%}
-
-{%- include hero.html title=hero_title -%}
-
-<section class="Container">
-  {{ content }}
-
-  {%- if site.posts.size > 0 -%}
-  <aside class="RecentPosts">
-    <h2 class="RecentPosts__title">{{ recent_posts }}</h2>
-    {%- if site.oscailte.posts_url -%}
-    <small>
-      <a class="RecentPosts__all" href="{{ site.oscailte.posts_url | relative_url }}">
-        {{ view_all }}
-      </a>  
-    </small>
-    {%- endif -%}
-    <ul class="RecentPosts__list o-list-bare">
-      {%- for post in site.posts limit: 6 -%}
-      <li class="RecentPosts__item Card o-no-owl">
-        {%- assign date_format = site.oscailte.date_format | default: "%b %-d, %Y" -%}
-        <h3 class="Card__title">
-          <a class="RecentPosts__link" href="{{ post.url | relative_url }}">
-            {{ post.title | escape }}
-          </a>
-        </h3>
-        <small class="Card__meta o-no-owl o-muted">
-          {%- include icon.html icon="calendar" -%} {{ post.date | date: date_format }}
-        </small>
-        {%- if site.show_excerpts -%}
-        <div class="RecentPosts__excerpt o-no-owl">
-          {{ post.excerpt }}
-        </div>
-        {%- endif -%}
-        <a class="Button" href="{{ post.url | relative_url }}">{{ read_full }}</a>
-      </li>
-      {%- endfor -%}
-    </ul>
-  </aside>
-  {%- endif -%}
+---
+layout: core
+---
+{%- include strings.html -%}
+
+{%- include hero.html title=hero_title -%}
+
+<section class="Container">
+  {{ content }}
+
+  {%- if site.posts.size > 0 -%}
+  <aside class="RecentPosts">
+    <h2 class="RecentPosts__title">{{ recent_posts }}</h2>
+    {%- if site.oscailte.posts_url -%}
+    <small>
+      <a class="RecentPosts__all" href="{{ site.oscailte.posts_url | relative_url }}">
+        {{ view_all }}
+      </a>  
+    </small>
+    {%- endif -%}
+    <ul class="RecentPosts__list o-list-bare">
+      {%- for post in site.posts limit: 6 -%}
+      <li class="RecentPosts__item Card o-no-owl">
+        {%- assign date_format = site.oscailte.date_format | default: "%b %-d, %Y" -%}
+        <h3 class="Card__title">
+          <a class="RecentPosts__link" href="{{ post.url | relative_url }}">
+            {{ post.title | escape }}
+          </a>
+        </h3>
+        <small class="Card__meta o-no-owl o-muted">
+          {%- include icon.html icon="calendar" -%} {{ post.date | date: date_format }}
+        </small>
+        {%- if site.show_excerpts -%}
+        <div class="RecentPosts__excerpt o-no-owl">
+          {{ post.excerpt }}
+        </div>
+        {%- endif -%}
+        <a class="Button" href="{{ post.url | relative_url }}">{{ read_full }}</a>
+      </li>
+      {%- endfor -%}
+    </ul>
+  </aside>
+  {%- endif -%}
 </section>

data/_layouts/page.html

@@ -1,5 +1,5 @@
----
-layout: default
----
-
+---
+layout: default
+---
+
 {{ content }}

data/_layouts/post.html

@@ -1,38 +1,38 @@
----
-layout: core
----
-{%- include strings.html -%}
-
-{%- assign date_iso = page.date | date: "%Y-%m-%d" -%}
-{%- assign date_formatted = page.date | date_to_string -%}
-
-{%- assign upper_minutes = page.content | number_of_words | divided_by: 160  -%}
-{%- assign lower_minutes = page.content | number_of_words | divided_by: 180  -%}
-
-{%- capture ttr -%}
-  {%- if upper_minutes == 0 -%}
-    {{ x_minute_read | replace: "$x$", "<1" }}
-  {%- elsif upper_minutes == lower_minutes -%}
-    {%- capture val -%}~{{ upper_minutes }}{%- endcapture -%}
-    {{ x_minute_read | replace: "$x$", val }}
-  {%- else -%}
-    {%- capture val -%}{{ lower_minutes }}-{{ upper_minutes }}{%- endcapture -%}
-    {{ x_minute_read | replace: "$x$", val }}
-  {%- endif -%}
-{%- endcapture -%}
-
-{%- capture meta -%}
-  <time class="Date" datetime="{{ date_iso }}">{{ date_formatted }}</time> &mdash; {{ ttr }}
-{%- endcapture -%}
-
-<header>
-  {% include hero.html title=page.title meta=meta %}
-</header>
-
-<div class="Container">
-  <article>
-    {{ page.content }} 
-  </article>
-
-  {%- include comments.html -%}
+---
+layout: core
+---
+{%- include strings.html -%}
+
+{%- assign date_iso = page.date | date: "%Y-%m-%d" -%}
+{%- assign date_formatted = page.date | date_to_string -%}
+
+{%- assign upper_minutes = page.content | number_of_words | divided_by: 160  -%}
+{%- assign lower_minutes = page.content | number_of_words | divided_by: 180  -%}
+
+{%- capture ttr -%}
+  {%- if upper_minutes == 0 -%}
+    {{ x_minute_read | replace: "$x$", "&lt;1" }}
+  {%- elsif upper_minutes == lower_minutes -%}
+    {%- capture val -%}~{{ upper_minutes }}{%- endcapture -%}
+    {{ x_minute_read | replace: "$x$", val }}
+  {%- else -%}
+    {%- capture val -%}{{ lower_minutes }}-{{ upper_minutes }}{%- endcapture -%}
+    {{ x_minute_read | replace: "$x$", val }}
+  {%- endif -%}
+{%- endcapture -%}
+
+{%- capture meta -%}
+  <time class="Date" datetime="{{ date_iso }}">{{ date_formatted }}</time> &mdash; {{ ttr }}
+{%- endcapture -%}
+
+<header>
+  {% include hero.html title=page.title meta=meta %}
+</header>
+
+<div class="Container">
+  <article>
+    {{ page.content }} 
+  </article>
+
+  {%- include comments.html -%}
 </div>