Medium clone (#23)

* Medium like look and feel

* discuss comment count

* minor changes

* misc changes

* layout changes for recents

* theme changes

* theme changes

* font size

* add headings

* font change

* minor change to title

* theme change

* remove justify

* font size normalization

* font again

* themeing changes

* upgrade bootstrap

27 files changed, 180 insertions, 187 deletions

diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index a8c9ff2..8224e08 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,13 +1,17 @@
 {{ partial "head" . }}
-<div class="container post-container">
-  <header>
-    {{ partial "content/h1-title" . }}
-  </header>
-  <ul class="container">
-    {{ range $index, .Paginator.Pages }}
-      <li>{{ partial "content/title-link" . }}</li>
-    {{ end }}
-  </ul>
-  {{ partial "content/pagination.html" . }}
+
+<div class="container">
+    <section>
+        <div class="section-title">
+            <span>{{ if .IsPage }}{{ if .Draft }}{{ .Site.Data.Strings.draft }} :: {{ end }}{{ end }}{{ .Title }}</span>
+        </div>
+        <div class="row px-2">
+          {{ range $index, .Paginator.Pages }}
+            {{ partial "post/card" . }}
+          {{ end }}
+          <!-- begin post -->
+        </div>
+    </section>
 </div>
-{{ partial "foot" . }}
+
+{{ partial "foot" . }}
\ No newline at end of file
diff --git a/layouts/_default/single.content.html b/layouts/_default/single.content.html
index e4758c3..9722d39 100644
--- a/layouts/_default/single.content.html
+++ b/layouts/_default/single.content.html
@@ -1,3 +1,3 @@
-<div class="content pt-2">
+<div class="article-body">
   {{ .Content }}
 </div>
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 5550bb0..7bcf64c 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,14 +1,13 @@
 {{ partial "head" . }}
-<div class="container p-a-0">
-  <div class="row m-l-0 m-r-0">
-    <div class="col-xs-12 col-md-9 post-container">
+<div class="container">
+  <div class="row">
+    <!-- End Fixed Left Share -->
+    <div class="offset-lg-1 col-lg-10 col-xs-12">
       {{ .Render "single.hat" }}
       {{ .Render "single.content" }}
       {{ .Render "single.boot" }}
     </div>
-      <div class="col-xs-12 col-md-3">
-        {{ partial "content/sidebar" .}}
-      </div>
   </div>
+  
 </div>
 {{ partial "foot" . }}
diff --git a/layouts/_default/summary.content.html b/layouts/_default/summary.content.html
index 24a2091..ad2f5d5 100644
--- a/layouts/_default/summary.content.html
+++ b/layouts/_default/summary.content.html
@@ -1,4 +1,4 @@
-<p>
+<div class="article-body">
   {{ if .IsPage }}
     {{ if .Description }}
       {{ .Description | markdownify }}
@@ -6,4 +6,4 @@
       {{ .Summary }}
     {{ end }}
   {{ end }}
-</p>
+</div>
diff --git a/layouts/_default/summary.hat.html b/layouts/_default/summary.hat.html
index 57a339e..2b2d4eb 100644
--- a/layouts/_default/summary.hat.html
+++ b/layouts/_default/summary.hat.html
@@ -1,3 +1,3 @@
 <h3>
-  <a href="{{ .Permalink }}">{{ if .IsPage }}{{ if .Draft }}{{ .Site.Data.Strings.draft }} :: {{ end }}{{ end }}{{ .Title }}</a>
+    <a href="{{ .Permalink }}">{{ if .IsPage }}{{ if .Draft }}{{ .Site.Data.Strings.draft }} :: {{ end }}{{ end }}{{ .Title }}</a>
 </h3>
diff --git a/layouts/index.html b/layouts/index.html
index 8299d73..5653a4f 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,3 +1,3 @@
 {{ partial "head" . }}
-{{ partial "homepage" . }}
+{{ partial "content/recent-posts" . }}
 {{ partial "foot" . }}
diff --git a/layouts/page/single.html b/layouts/page/single.html
index f92624c..2f4d0ed 100644
--- a/layouts/page/single.html
+++ b/layouts/page/single.html
@@ -1,12 +1,15 @@
+
+
+
 {{ partial "head" . }}
-<div class="container p-b-2">
+<div class="container">
   <div class="row">
-    <div class="col-xs-12 col-md-9 post-container">
+    
+    
+    <!-- End Fixed Left Share -->
+    <div class="offset-lg-1 col-lg-10 col-xs-12">
       {{ .Render "single.content" }}
     </div>
-      <div class="col-xs-12 col-md-3">
-        {{ partial "content/sidebar" .}}
-      </div>
   </div>
 </div>
 {{ partial "foot" . }}
diff --git a/layouts/partials/base/footer.html b/layouts/partials/base/footer.html
index 8d7b308..0953a25 100644
--- a/layouts/partials/base/footer.html
+++ b/layouts/partials/base/footer.html
@@ -1,12 +1,12 @@
 <footer class="footer text-white {{ .Site.Params.navbarBgColorClass | default .Site.Data.Defaults.navbarBgColorClass }}">
   <div class="container">
     <div class="row">
-      <div class="col-xs-12 col-md-9">
-        <p class="text-xs-center m-a-0 p-a-0">
+      <div class="offset-lg-1 col-lg-10 col-xs-12">
+        <p class="text-center mb-0 pa-0">
           &copy; {{now.Format "2006"}} {{ with .Site.Copyright }}{{ . | markdownify}}{{ end }}
         </p>
         {{ if .Site.Menus.footer }}
-        <p class="text-xs-center  m-a-0 p-a-0">
+        <p class="text-center mb-0 pa-0">
           {{ $footerMenuLen := len .Site.Menus.footer}} {{ if gt $footerMenuLen 0 }} {{ range $k, $v := .Site.Menus.footer }}
           <span class="p-l-1 p-r-1">
                 <a href="{{.URL}}" class="text-capitalize no-decoration text-white">{{ .Name }}</a>
diff --git a/layouts/partials/base/header.html b/layouts/partials/base/header.html
index f36a7bb..0042124 100644
--- a/layouts/partials/base/header.html
+++ b/layouts/partials/base/header.html
@@ -1,4 +1,4 @@
-<nav class="navbar navbar-expand-md fixed-top site-navbar {{ .Site.Params.navbarBgColorClass | default .Site.Data.Defaults.navbarBgColorClass }}">
+<nav class="navbar navbar-expand-md site-navbar {{ .Site.Params.navbarBgColorClass | default .Site.Data.Defaults.navbarBgColorClass }}">
     <a class="navbar-brand text-white" href="{{ .Site.BaseURL }}">{{ .Site.Title }}</a>
   <button class="navbar-toggler" 
   type="button" data-toggle="collapse" data-target="#exCollapsingNavbar2" aria-controls="exCollapsingNavbar2"
diff --git a/layouts/partials/base/scripts.html b/layouts/partials/base/scripts.html
index 7ba7705..5fe1b62 100644
--- a/layouts/partials/base/scripts.html
+++ b/layouts/partials/base/scripts.html
@@ -1,12 +1,7 @@
 
-<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.3/umd/popper.min.js" integrity="sha384-vFJXuSJphROIrBnz7yo7oB41mKfc8JzQZiCq4NCceLEaO4IHwicKwpJf9c9IpFgh" crossorigin="anonymous"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-beta.2/js/bootstrap.min.js" integrity="sha256-GIa8Vh3sfESnVB2CN3rYGkD/MklvMq0lmITweQxE1qU=" crossorigin="anonymous"></script>
-
-<script src="{{ "assets/js/highlight.pack.js" | relURL }}"></script>
-
-<script>hljs.initHighlightingOnLoad();</script>
-
+<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
+<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
 {{ with .Site.DisqusShortname }}
 <script id="dsq-count-scr" src="//{{ . }}.disqus.com/count.js" async></script>
 {{ end }}
diff --git a/layouts/partials/content/h1-title.html b/layouts/partials/content/h1-title.html
index 2f15bd7..a86affe 100644
--- a/layouts/partials/content/h1-title.html
+++ b/layouts/partials/content/h1-title.html
@@ -1 +1 @@
-<h1 class="post-title mb-1">{{ partial "content/title" . }}</h1>
+<h1 class="post-title">{{ partial "content/title" . }}</h1>
diff --git a/layouts/partials/content/pagination.html b/layouts/partials/content/pagination.html
index 8aea3bf..3f4f64d 100644
--- a/layouts/partials/content/pagination.html
+++ b/layouts/partials/content/pagination.html
@@ -1,22 +1,3 @@
 {{ if gt $.Paginator.TotalPages 1 }}
-<div class="row ">
-    <ul class="pagination">
-      {{ if or (.Paginator.HasPrev) (.Paginator.HasNext) }}
-          {{ if .Paginator.HasPrev }}
-            <li class="page-item">
-              <a class="page-link" rel="prev" href="{{ .Paginator.Prev.URL | relURL }}">
-                  « Previous
-              </a>
-            </li>
-          {{ end }}
-          {{ if .Paginator.HasNext }}
-            <li class="page-item">
-              <a class="page-link" rel="next" href="{{ .Paginator.Next.URL | relURL }}">
-                  Next »
-              </a>
-            </li>
-          {{ end }}
-      {{ end }}
-    </ul>
-</div>
+
 {{ end }}
diff --git a/layouts/partials/content/post-meta.html b/layouts/partials/content/post-meta.html
index 2b3fcb4..9ed7b25 100644
--- a/layouts/partials/content/post-meta.html
+++ b/layouts/partials/content/post-meta.html
@@ -1,11 +1,6 @@
 <div class="post-meta">
   <div class="post-meta-item">
-    <i class="fa fa-calendar"></i>
-    <time datetime="{{ .Date.Format "2006-01-02" }}">{{ .Date.Format .Site.Data.Formats.date }}</time>
-
-    {{ with .Params.author }}
-      &middot; {{ $.Site.Data.Strings.byauthor }} {{ . }}
-    {{ end }}
+    <time datetime="{{ .Date.Format "01 Jan 2016" }}">{{ .Date.Format .Site.Data.Formats.date }}</time>
     &middot; {{ .ReadingTime }} {{ .Site.Data.Strings.metaReadinMinutes }}
     &middot; {{ .WordCount }} {{ .Site.Data.Strings.words }}
   </div>
@@ -35,13 +30,5 @@
         </div>
       {{ end }}
   {{ end }}
-  {{ if not (eq .Site.DisqusShortname "") }}
-  <div class="post-meta-item">
-    &nbsp;<i class="fa fa-comment-o"></i>
-    <a href="{{ .Permalink }}#disqus_thread" class="article-comment-link">
-         Comments
-    </a>
-  </div>
-  {{end}}
 
 </div>
diff --git a/layouts/partials/content/recent-posts.html b/layouts/partials/content/recent-posts.html
new file mode 100644
index 0000000..0cc90e0
--- /dev/null
+++ b/layouts/partials/content/recent-posts.html
@@ -0,0 +1,15 @@
+<div class="container">
+    <section>
+        <div class="section-title">
+            <span>Posts</span>
+        </div>
+        <div class="row px-2">
+            {{ $paginator := .Paginate (where .Data.Pages "Type" "post") }}
+                {{ range $paginator.Pages.ByDate.Reverse }}
+                    {{ partial "post/card" . }}
+                {{ end }}
+            {{ partial "content/pagination" . }}
+            <!-- begin post -->
+        </div>
+    </section>
+</div>
\ No newline at end of file
diff --git a/layouts/partials/content/related-posts.html b/layouts/partials/content/related-posts.html
new file mode 100644
index 0000000..2303561
--- /dev/null
+++ b/layouts/partials/content/related-posts.html
@@ -0,0 +1,12 @@
+{{ $related := .Site.RegularPages.Related . | first 3 }} {{ with $related }}
+<div class="container">
+    <section>
+        <div class="section-title">
+                <span>Posts</span>
+        </div>
+        <div class="row px-2">
+            {{ range . }} {{ partial "post/card" . }} {{ end }}
+        </div>
+    </section>
+</div>
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 34ed569..fb90781 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -2,13 +2,10 @@
 <html class="no-js">
 <head>
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
-  <title>{{ .Title }} {{ if ne .Title .Site.Title }} &middot; {{ .Site.Title }}{{ end }}</title>
+  <title>{{ .Title }}</title>
   {{ partial "base/metas" . }}
-
-  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-beta.2/css/bootstrap.min.css" integrity="sha256-QUyqZrt5vIjBumoqQV0jM8CgGqscFfdGhN+nVCqX0vc=" crossorigin="anonymous" />
+  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" integrity="sha256-eZrrJcwDc/3uDhsdt61sL2oOBY362qM3lon1gyExkL0=" crossorigin="anonymous" />
-
-
   <link rel="stylesheet" href="{{ "assets/css/style.css" | relURL }}">
   <link rel="stylesheet" href="{{ "assets/css/tomorrow-night.css" | relURL }}">
 
diff --git a/layouts/partials/homepage.html b/layouts/partials/homepage.html
deleted file mode 100644
index aad1866..0000000
--- a/layouts/partials/homepage.html
+++ /dev/null
@@ -1,27 +0,0 @@
-  <div class="container">
-    {{ if isset .Site.Params.showBlogHeader true }}
-      <div class="row">
-        <header>
-          {{ partial "content/h1-title" . }}
-          <span>{{ .Site.Data.Strings.lastupdate }}:
-            <time datetime="{{ .Site.LastChange.Format "2006-01-02T15:04:05Z07:00" }}">
-              {{ .Site.LastChange.Format .Site.Data.Formats.datetime }}
-            </time>
-          </span>
-        </header>
-      </div>
-    {{ end }}
-    <div class="row m-l-0 m-r-0">
-      <div class="col-xs-12 col-md-9">
-        {{ $paginator := .Paginate (where .Data.Pages "Type" "post") }}
-        {{ range $paginator.Pages.ByDate.Reverse }}
-          {{ .Render "summary" }}
-        {{ end }}
-        {{ partial "content/pagination" . }}
-      </div>
-        <div class="col-xs-12 col-md-3">
-          {{ partial "content/sidebar" . }}
-        </div>
-    </div>
-
-  </div>
diff --git a/layouts/partials/post/card.html b/layouts/partials/post/card.html
new file mode 100644
index 0000000..069d2f2
--- /dev/null
+++ b/layouts/partials/post/card.html
@@ -0,0 +1,37 @@
+<div class="col-xs-12 col-md-6 col-lg-4 pb-3 px-2 align-self-stretch d-flex align-items-stretch">
+    <div class="card mx-0 post-card">
+
+      {{ if and (isset .Params "thumbnail") (not (eq .Params.thumbnail "")) }}
+        <a href="{{ .Permalink }}" itemprop="url">
+            {{if or (in (substr .Params.thumbnail 0 7) "http://") (in (substr .Params.thumbnail 0 8) "https://")}}
+              <img src="{{ .Params.thumbnail }}" class="card-img-top">
+            {{ else if  (in (substr .Params.thumbnail 0 1) "/" ) }}
+              <img src="{{ .Params.thumbnail | relURL }}" class="card-img-top">
+            {{ else }}
+              <img src="{{ .Permalink }}{{ .Params.thumbnail }}" class="card-img-top">
+            {{end}}
+        </a>
+        {{ end }}
+
+    <div class="card-body">
+      <p class="card-title">
+          <a href="{{ .Permalink }}">{{ if .IsPage }}{{ if .Draft }}{{ .Site.Data.Strings.draft }} :: {{ end }}{{ end }}{{ .Title }}</a>
+      </p>
+      <p class="card-text">
+          {{ if .IsPage }}
+          {{ if .Description }}
+            {{ .Description | markdownify | truncate 140 }}
+          {{ else }}
+            {{ .Summary | truncate 140}}
+          {{ end }}
+        {{ end }}
+      </h4>
+    </div>
+    <div class="card-footer recentpost">
+        <small class="text-muted">
+            <time datetime="{{ .Date.Format "22 July 2017" }}">{{ .Date.Format .Site.Data.Formats.date }}</time>
+          &middot;&nbsp;{{ .ReadingTime }} {{ .Site.Data.Strings.metaReadinMinutes }}
+        </small>
+    </div>  
+  </div>
+</div>
diff --git a/layouts/partials/post/share.html b/layouts/partials/post/share.html
new file mode 100644
index 0000000..a89bf84
--- /dev/null
+++ b/layouts/partials/post/share.html
@@ -0,0 +1,44 @@
+<div class="share">
+    <p>
+        Share
+    </p>
+    <ul>
+        {{ if not (eq .Site.Params.twitter "") }}
+        <li>
+            <a target="_blank" href="https://twitter.com/intent/tweet?text=“{{ .Title }}” by @{{ .Site.Params.twitter }} {{ .Permalink }}">
+                <svg class="svgIcon-use" width="29" height="29" viewbox="0 0 29 29">
+                    <path d="M21.967 11.8c.018 5.93-4.607 11.18-11.177 11.18-2.172 0-4.25-.62-6.047-1.76l-.268.422-.038.5.186.013.168.012c.3.02.44.032.6.046 2.06-.026 3.95-.686 5.49-1.86l1.12-.85-1.4-.048c-1.57-.055-2.92-1.08-3.36-2.51l-.48.146-.05.5c.22.03.48.05.75.08.48-.02.87-.07 1.25-.15l2.33-.49-2.32-.49c-1.68-.35-2.91-1.83-2.91-3.55 0-.05 0-.01-.01.03l-.49-.1-.25.44c.63.36 1.35.57 2.07.58l1.7.04L7.4 13c-.978-.662-1.59-1.79-1.618-3.047a4.08 4.08 0 0 1 .524-1.8l-.825.07a12.188 12.188 0 0 0 8.81 4.515l.59.033-.06-.59v-.02c-.05-.43-.06-.63-.06-.87a3.617 3.617 0 0 1 6.27-2.45l.2.21.28-.06c1.01-.22 1.94-.59 2.73-1.09l-.75-.56c-.1.36-.04.89.12 1.36.23.68.58 1.13 1.17.85l-.21-.45-.42-.27c-.52.8-1.17 1.48-1.92 2L22 11l.016.28c.013.2.014.35 0 .52v.04zm.998.038c.018-.22.017-.417 0-.66l-.498.034.284.41a8.183 8.183 0 0 0 2.2-2.267l.97-1.48-1.6.755c.17-.08.3-.02.34.03a.914.914 0 0 1-.13-.292c-.1-.297-.13-.64-.1-.766l.36-1.254-1.1.695c-.69.438-1.51.764-2.41.963l.48.15a4.574 4.574 0 0 0-3.38-1.484 4.616 4.616 0 0 0-4.61 4.613c0 .29.02.51.08.984l.01.02.5-.06.03-.5c-3.17-.18-6.1-1.7-8.08-4.15l-.48-.56-.36.64c-.39.69-.62 1.48-.65 2.28.04 1.61.81 3.04 2.06 3.88l.3-.92c-.55-.02-1.11-.17-1.6-.45l-.59-.34-.14.67c-.02.08-.02.16 0 .24-.01 2.12 1.55 4.01 3.69 4.46l.1-.49-.1-.49c-.33.07-.67.12-1.03.14-.18-.02-.43-.05-.64-.07l-.76-.09.23.73c.57 1.84 2.29 3.14 4.28 3.21l-.28-.89a8.252 8.252 0 0 1-4.85 1.66c-.12-.01-.26-.02-.56-.05l-.17-.01-.18-.01L2.53 21l1.694 1.07a12.233 12.233 0 0 0 6.58 1.917c7.156 0 12.2-5.73 12.18-12.18l-.002.04z"></path>
+                </svg>
+            </a>
+        </li>
+        {{end}}
+    </ul>
+    <div class="sep">
+    </div>
+
+
+    {{ if not (eq .Site.DisqusShortname "") }}
+    <p>Talk</p>
+    <ul>
+        <li>
+            <div class="share-icon" >
+                <a href="#comment-section">
+                    <svg class="svgIcon-use" width="29" height="29" viewbox="0 0 29 29">
+                        <path d="M21.27 20.058c1.89-1.826 2.754-4.17 2.754-6.674C24.024 8.21 19.67 4 14.1 4 8.53 4 4 8.21 4 13.384c0 5.175 4.53 9.385 10.1 9.385 1.007 0 2-.14 2.95-.41.285.25.592.49.918.7 1.306.87 2.716 1.31 4.19 1.31.276-.01.494-.14.6-.36a.625.625 0 0 0-.052-.65c-.61-.84-1.042-1.71-1.282-2.58a5.417 5.417 0 0 1-.154-.75zm-3.85 1.324l-.083-.28-.388.12a9.72 9.72 0 0 1-2.85.424c-4.96 0-8.99-3.706-8.99-8.262 0-4.556 4.03-8.263 8.99-8.263 4.95 0 8.77 3.71 8.77 8.27 0 2.25-.75 4.35-2.5 5.92l-.24.21v.32c0 .07 0 .19.02.37.03.29.1.6.19.92.19.7.49 1.4.89 2.08-.93-.14-1.83-.49-2.67-1.06-.34-.22-.88-.48-1.16-.74z"></path>
+                    </svg>
+                </a>
+                <span class="comment-count">
+                        <a href="{{ .Permalink }}#disqus_thread"></a>
+                </span>
+                <span class="sr-only">Comment count</span>
+            </a>
+            
+            
+            
+
+        </li>
+    </ul>
+    {{end}}
+
+
+</div>
\ No newline at end of file
diff --git a/layouts/post/list.html b/layouts/post/list.html
new file mode 100644
index 0000000..749491d
--- /dev/null
+++ b/layouts/post/list.html
@@ -0,0 +1,3 @@
+{{ partial "head" . }}
+{{ partial "content/recent-posts" . }}
+{{ partial "foot" . }}
\ No newline at end of file
diff --git a/layouts/post/single.boot.html b/layouts/post/single.boot.html
index 21db0c6..08946e8 100644
--- a/layouts/post/single.boot.html
+++ b/layouts/post/single.boot.html
@@ -1,33 +1,27 @@
-<footer>
   <!--navigation-->
   {{ if .IsPage }} 
   {{ if or ( .NextInSection ) ( .PrevInSection ) }}
-  <nav>
-    <ul class="pagination">
-      {{ if .PrevInSection }}
-      <li class="page-item">
-        <a href="{{ .PrevInSection.Permalink }}" title="{{ .PrevInSection.Title }} " class="page-link">
-          <span aria-hidden="true">&larr;</span>{{ .Site.Data.Strings.previous }}
-        </a>
-      </li>
-      {{end}} 
-      {{ if .NextInSection }}
-      <li class="page-item">
-        <a href="{{ .NextInSection.Permalink }}" title="{{ .NextInSection.Title }}" class="page-link">
-          {{ .Site.Data.Strings.next }}
-          <span aria-hidden="true">&rarr;</span>
-        </a>
-      </li>
-      {{end}}
-    </ul>
-  </nav>
-  {{ end }} 
-  {{ end }}
-  <div class="row">
-    <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
-      <div class="pt-4">
-        {{ if ne .Site.DisqusShortname "" }} {{ template "_internal/disqus.html" . }} {{ end }}
+
+    <section>
+        <div class="section-title">
+                <span>You might also like</span>
+        </div>
+        <div class="row px-2">
+          {{ if .PrevInSection }}
+            {{ partial "post/card" .PrevInSection }} 
+          {{ end }} 
+          {{ partial "content/related-posts" . }}
+          {{ if .NextInSection }}
+            {{ partial "post/card" .NextInSection }} 
+          {{ end }}
+        </div>
+    </section>
+    <div class="row">
+      <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
+        <div class="pt-4" id="comment-section">
+          {{ if ne .Site.DisqusShortname "" }} {{ template "_internal/disqus.html" . }} {{ end }}
+        </div>
       </div>
     </div>
-  </div>
-</footer>
\ No newline at end of file
+  {{ end }} 
+  {{ end }}
\ No newline at end of file
diff --git a/layouts/post/single.hat.html b/layouts/post/single.hat.html
index 56c447d..919530a 100644
--- a/layouts/post/single.hat.html
+++ b/layouts/post/single.hat.html
@@ -1,5 +1,5 @@
 <div>
-  {{ partial "content/title-banner" . }}
   {{ partial "content/h1-title" . }}
   {{ partial "content/post-meta" . }}
+  {{ partial "content/title-banner" . }}
 </div>
diff --git a/layouts/post/summary.hat.html b/layouts/post/summary.hat.html
index be83b9a..c8a8173 100644
--- a/layouts/post/summary.hat.html
+++ b/layouts/post/summary.hat.html
@@ -1,5 +1 @@
-<div>
-  {{ partial "content/title-banner" . }}
-  {{ partial "content/h1-link-title" . }}
-  {{ partial "content/post-meta" . }}
-</div>
+{{ partial "post/card" . }}
diff --git a/layouts/section/code.html b/layouts/section/code.html
deleted file mode 100644
index 3a0342e..0000000
--- a/layouts/section/code.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{{ partial "head" . }}
-<section id="main-content" class="container main_content section">
-  <header>
-    {{ partial "content/h1-title" . }}
-  </header>
-  {{ range $index, .Paginator.Pages.ByTitle }}
-    {{ .Render "section.li" }}
-  {{ end }}
-  {{ partial "content/pagination" . }}
-</section>
-{{ partial "foot" . }}
diff --git a/layouts/shortcodes/labels.html b/layouts/shortcodes/labels.html
deleted file mode 100644
index bd5cd3c..0000000
--- a/layouts/shortcodes/labels.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{{ range . }}
-<span class="tag tag-primary">{{ . }}</span>
-{{ end }}
diff --git a/layouts/taxonomy/topic.html b/layouts/taxonomy/topic.html
deleted file mode 100644
index a9f3c76..0000000
--- a/layouts/taxonomy/topic.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{{ partial "head" . }}
-<section id="main-content" class="container main_content">
-  <header class="container">
-    {{ partial "content/h1-title" . }}
-  </header>
-  {{ range $index, $page := .Paginator.Pages }}
-    {{ .Render "summary" }}
-  {{ end }}
-  {{ partial "content/pagination" . }}
-</section>
-{{ partial "foot" . }}
diff --git a/layouts/taxonomy/topic.terms.html b/layouts/taxonomy/topic.terms.html
deleted file mode 100644
index 8e49494..0000000
--- a/layouts/taxonomy/topic.terms.html
+++ /dev/null
@@ -1,22 +0,0 @@
-{{ partial "head" . }}
-<section id="main-content" class="container main_content terms topic">
-  <header class="container">
-    {{ partial "content/h1-title" . }}
-  </header>
-  {{ $data := .Data }}
-  {{ range $key,$value := .Data.Terms.Alphabetical }}
-  <article class="container">
-    <h2>
-      <a href="{{ (print $data.Plural "/" ($value.Name | urlize) "/") | relURL }}">{{ $value.Name }}</a>
-    </h2>
-    <ul>
-      {{ range $value.Pages.ByTitle }}
-      <li>
-        <a href="{{ .Permalink }}">{{ .Title }}</a>
-      </li>
-      {{ end }}
-    </ul>
-  </article>
-  {{ end }}
-</section>
-{{ partial "foot" . }}