Revert "layouts: reset to theme versions"

This reverts commit 11715fcfd1.

layouts/_default/baseof.html

@@ -13,14 +13,7 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
   <!-- Twitter -->
-  {{ if isset .Site.Params "twitter" }}
-  <meta name="twitter:card" content="summary" />
-  <meta name="twitter:title" content="{{ .Title }}" />
-  <meta name="twitter:description" content="{{ if .IsHome }}{{ htmlEscape .Site.Params.description }}{{ else }}{{ htmlEscape .Description }}{{ end }}"
-  />
-  <meta name="twitter:site" content="@{{ .Site.Params.twitter }}" />
-  <meta name="twitter:creator" content="@{{ .Site.Params.twitter }}" />
-  {{ end }}
+  {{ partial "social_metadata.html" . }}
 
   <link rel="shortcut icon" type="image/png" href="/favicon.ico" />
 

layouts/_default/single.html

@@ -19,8 +19,11 @@
                   {{ partial "math.html" . }}
               {{ end }}
           </article>
-          {{ partial "tags.html" .}} {{ partial "post-pagination.html" .}}
-          {{ template "_internal/disqus.html" . }}
+          {{ partial "tags.html" .}}
+          {{ if and .Site.Params.CommentoURL (and (not .Site.BuildDrafts) (not .Site.IsServer)) -}}
+          {{ partialCached "commento.html" . }}
+          {{- end }}
+          {{ partial "post-pagination.html" .}}
           <footer class="post__footer">
             {{ partial "social-icons.html" .}}
             <p>{{ replace .Site.Copyright "{year}" now.Year }}</p>

layouts/partials/browse-by-tag.html

@@ -1,7 +1,7 @@
 <ul class="tags__list">
-  {{ range $tag, $value := $.Site.Taxonomies.tags }}
+  {{ range $category, $value := $.Site.Taxonomies.categories }}
   <li class="tag__item">
-    <a class="tag__link" href="{{ "/tags/" | relLangURL}}{{ $tag | urlize }}">{{ $tag | urlize }} ({{ len $value }})</a>
+    <a class="tag__link" href="{{ "/categories/" | relLangURL}}{{ $category | urlize }}">{{ $category | urlize }} ({{ len $value }})</a>
   </li>
   {{ end }}  
 </ul>