Merge branch 'master' into master

7 files changed, 23 insertions, 8 deletions

diff --git a/exampleSite/config.toml b/exampleSite/config.toml
index 98c3d10..e73cb51 100644
--- a/exampleSite/config.toml
+++ b/exampleSite/config.toml
@@ -47,7 +47,7 @@ email = "you@example.com"
 [params.extra]
 copyright = "© 2016. Erlich Bachman. [Some Rights Reserved](http://creativecommons.org/licenses/by/3.0/)." 
 poweredby = true
-hightlightjs = true
+highlightjs = true
 
 ## Main Menu
 [[menu.main]]
diff --git a/layouts/partials/content.html b/layouts/partials/content.html
index 5995e2d..bc6eacc 100644
--- a/layouts/partials/content.html
+++ b/layouts/partials/content.html
@@ -5,11 +5,11 @@
   {{ if ne .Params.showpagemeta false }}
   <div class="col-md-12">
     <h6 class="text-left meta">
-      PUBLISHED ON {{ .Date.Format .Site.Params.dateformat | upper }} 
+      PUBLISHED ON {{ .Date.Format .Site.Params.dateformat | upper }}
       {{ if isset .Params "categories" }}
       {{ $total := len .Params.categories }}
       {{ if gt $total 0 }}
-      — 
+      —
       {{ $total := sub $total 1 }}
       {{ range $i, $cat := sort $.Params.categories }}
       <a class="meta" href="{{ "/categories/" | relURL }}{{ $cat | urlize }}">{{ $cat | upper }}</a>{{ if lt $i $total }}, {{ end }}
@@ -32,7 +32,7 @@
       {{ if isset .Params "tags" }}
       {{ $total := len .Params.tags }}
       {{ if gt $total 0 }}
-      TAGS: 
+      TAGS:
       {{ $subtotal := sub $total 1 }}
       {{ range $i, $tag := sort $.Params.tags }}
       <a class="meta" href="{{ "/tags/" | relURL }}{{ $tag | urlize }}">{{ $tag | upper }}</a>{{ if lt $i $subtotal }}, {{ end }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 783c232..f2c81b9 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -4,7 +4,11 @@
 
 {{ with .Site.Params.extra }}
 {{ if .highlightjs }}
-<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.6.0/highlight.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
+  {{ range .highlightjslanguages }}
+<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/languages/{{.}}.min.js"></script>
+  {{ end }}
+
 <script type="text/javascript">
 hljs.initHighlightingOnLoad();
 </script>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 0a67ff5..453f353 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -22,7 +22,7 @@
 {{ end }}
 
 {{ if .Site.Params.extra.highlightjs }}
-  <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.6.0/styles/default.min.css">
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/{{ .Site.Params.extra.highlightjsstyle | default "default" }}.min.css">
 {{ end }}
 
 <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Lato:300,400|Roboto+Slab:400,700|Roboto:300,300i,400,400i,500,500i,700,700i">
diff --git a/layouts/partials/li.html b/layouts/partials/li.html
index 680e945..b59816e 100644
--- a/layouts/partials/li.html
+++ b/layouts/partials/li.html
@@ -4,8 +4,9 @@
     <li class="list-entry">
       <a class="list-entry-link" href="{{ .Permalink }}">{{ .Title }}</a>
       <p class="meta">
-        {{ .Date.Format .Site.Params.dateformat | upper }} 
+        {{ .Date.Format .Site.Params.dateformat | upper }}
         <span class="category">
+        {{ if isset .Params "categories" }}
         {{ $total := len .Params.categories }}
         {{ if gt $total 0 }}
         —
@@ -14,6 +15,7 @@
         <a class="category" href="{{ "/categories/" | relURL }}{{ $cat | humanize | urlize }}">{{ $cat | upper }}</a>{{ if lt $i $total }}, {{ end }}
         {{ end }}
         {{ end }}
+        {{ end }}
         </span>
       </p>
       <p class="excerpt">
diff --git a/layouts/partials/social.html b/layouts/partials/social.html
index 7199134..b204758 100644
--- a/layouts/partials/social.html
+++ b/layouts/partials/social.html
@@ -20,6 +20,15 @@
   {{ with .Site.Params.social.stackoverflow }}
   <a href="https://stackoverflow.com/users/{{.}}"><i class="fa fa-stack-overflow" aria-hidden="true"></i></a>
   {{ end }}
+  {{ with .Site.Params.social.medium}}
+  <a href="https://medium.com/{{.}}"><i class="fa fa-medium" aria-hidden="true"></i></a>
+  {{ end }}
+  {{ with .Site.Params.social.devto}}
+  <a href="https://dev.to/{{.}}"><i class="fa fa-terminal" aria-hidden="true"></i></a>
+  {{ end }}
+  {{ with .Site.Params.social.angellist}}
+  <a href="https://angel.co/{{.}}"><i class="fa fa-angellist" aria-hidden="true"></i></a>
+  {{ end }}
   {{ with .Site.Params.social.email }}
   <a href="mailto:{{.}}"><i class="fa fa-envelope-o" aria-hidden="true"></i></a>
   {{ end }}
diff --git a/theme.toml b/theme.toml
index 3b6a350..64d0be2 100644
--- a/theme.toml
+++ b/theme.toml
@@ -3,7 +3,7 @@ license = "MIT"
 licenselink = "https://github.com/shenoybr/hugo-goa/blob/master/LICENSE.md"
 description = "Simple Minimalist Hugo Theme"
 homepage = "https://github.com/shenoybr/hugo-goa"
-tags = ["Roboto", "Lato", "Roboto Slab", "bootstrap", "fontawesome", "minimal", "clean"]
+tags = ["Roboto", "Lato", "Roboto Slab", "bootstrap", "font awesome", "minimal", "clean"]
 features = ["blog", "pages", "minimal", "responsive", "404", "icons", "disqus", "anlaytics"]
 min_version = 0.16