Merge branch 'dev' into feature/isso-comments

layouts/blog/single.html

@@ -29,6 +29,14 @@
                 {{ partial "content" . }}
                 <br>
             </div>
+            {{ if .Site.Params.share }}
+            <div class="share">
+                <a href="" class="ssk ssk-facebook"></a>
+                <a href="" class="ssk ssk-twitter"></a>
+                <a href="" class="ssk ssk-google-plus"></a>
+                <a href="" class="ssk ssk-linkedin"></a>
+            </div>
+            {{ end }}
             {{ if .Site.Params.posts_navigation }}
                 <div class="navigation">
                     {{ if .PrevInSection }}

layouts/partials/css/colors.css

@@ -58,4 +58,8 @@ section.main .content .markdown pre, section.main .content .markdown pre code {
 
 .hljs-built_in, .hljs-bullet, .hljs-code, .hljs-addition {
     color: {{ .Param "colors.type" }};
+}
+
+.ssk {
+    background-color: {{ .Param "colors.trivial" }};
 }

layouts/partials/css/main.css

@@ -1,6 +1,6 @@
 @font-face {
   font-family: 'Nexa Bold';
-  src: url('/fonts/Nexa Bold.otf');
+  src: url('{{ .Site.BaseURL }}fonts/Nexa Bold.otf');
 }
 
 html, body, div, span, applet, object, iframe,
@@ -495,12 +495,6 @@ section.main .content .markdown pre {
   word-break: break-all;
   word-wrap: break-word;
 }
-@media (min-width: 769px) {
-  section.main .content .markdown pre {
-    width: 110%;
-    margin-left: -4%;
-  }
-}
 section.main .content .markdown pre code {
   /* enclosed by 4 backticks (````) */
   padding: 0;
@@ -625,6 +619,7 @@ section.main .content .navigation {
   -moz-align-items: center;
   -ms-align-items: center;
   align-items: center;
+  padding: 2em;
 }
 section.main .content .navigation div {
   display: -webkit-flex;
@@ -648,11 +643,34 @@ section.main .content .navigation .icon {
 }
 section.main .content .navigation a {
   width: 250px;
-  margin-left: 1em;
+  margin: 0 1em;
   text-align: center;
   font-style: italic;
   color: #313537;
 }
+section.main .content .share, section.main .content .share div {
+  display: -webkit-flex;
+  display: -moz-flex;
+  display: -ms-flexbox;
+  display: -ms-flex;
+  display: flex;
+  -webkit-flex-direction: row;
+  -moz-flex-direction: row;
+  -ms-flex-direction: row;
+  flex-direction: row;
+  -webkit-align-items: center;
+  -moz-align-items: center;
+  -ms-align-items: center;
+  align-items: center;
+  justify-content: center;
+}
+section.main .content .share {
+  background-color: rgba(152, 152, 152, 0.07);
+  padding: 1em 0;
+}
+section.main .content .share a {
+  margin: 0 6px;
+}
 
 /* Fonts */
 

layouts/partials/css/min769px.css

@@ -6,4 +6,8 @@ section.main .content .markdown img {
 max-width: 110%;
 width: 110%;
 margin-left: -4%;
+}
+section.main .content .markdown pre {
+width: 110%;
+margin-left: -4%;
 }

layouts/partials/footer.html

@@ -1,9 +1,20 @@
 <section class="footer">
     <div class="container">
+
+        {{ if .Site.Params.githubRepo }}
+        <div class="copyright">
+            <a href="https://github.com/{{ .Site.Params.githubRepo }}/tree/master/content/{{ .File.Path }}" target="_blank">View this post on GitHub</a>
+        </div>
+        {{ end }}
+
         <div class="copyright">
 
         {{ if .Site.Params.copyright }}
-            <a href="{{ .Site.BaseURL }}license">{{ .Site.Params.copyright}}</a>
+            {{ if .Site.Params.copyrightUrl }}
+                <a href="{{ .Site.Params.copyrightUrl }}">{{ .Site.Params.copyright }}</a>
+            {{ else }}
+                <a href="{{ .Site.BaseURL }}license">{{ .Site.Params.copyright }}</a>
+            {{ end }}
         {{ end }}
 
         </div>

layouts/partials/footer_scripts.html

@@ -18,6 +18,7 @@
   <script src="{{ .Site.BaseURL }}js/progressively.min.js" defer></script>
 {{ end }}
 
+
 {{ if .Site.Params.issoHost }}
 <script
   data-isso="//{{ .Site.Params.issoHost }}/"
@@ -27,6 +28,10 @@
 ></script>
 {{ end }}
 
+{{ if .Site.Params.share }}
+  <script src="{{ .Site.BaseURL }}js/social-share-kit.min.js" defer></script>
+{{ end }}
+
 {{ template "_internal/google_analytics_async.html" . }}
 
 <script>
@@ -37,5 +42,13 @@
     {{ if .Site.Params.progressively }}
       progressively.init({delay: 30, throttle: 50});
     {{ end }}
+    {{ if .Site.Params.share }}
+      SocialShareKit.init({
+        twitter: {
+            text: '',
+            {{ if .Site.Params.twitter }}via: '{{ .Site.Params.twitter }}'{{ end }}
+        }
+      });
+    {{ end }}
   };
 </script>

layouts/partials/head_includes.html

@@ -28,6 +28,12 @@
   </style>
 {{ end }}
 
+{{ if .Site.Params.share }}
+  <style type="text/css" media="screen">
+    {{ partial "css/social-share-kit.css" . | safeCSS }}
+  </style>
+{{ end }}
+
 {{ if .Site.Params.colors }}
   <style type="text/css" media="screen">
     {{ partial "css/colors.css" . | safeCSS }}

layouts/partials/meta.html

@@ -9,11 +9,18 @@
 {{ if .Site.Params.twitter }}
     <meta property="twitter:site" content="@{{.Site.Params.twitter}}">
 {{ end }}
+<meta property="og:site_name" content="{{ .Site.Title }}" />
+<meta property="og:locale" content="nn_NO" />
+<meta property="og:type" content="article" />
+<meta property="og:url" content="{{ .Permalink }}" />
+<meta property="og:title" content="{{ .Title }}" />
 <meta property="twitter:title" content="{{ if .Title }}{{ .Title }}{{ else }}{{ .Site.Title }}{{ end }}">
 {{ if .Site.Params.social_banner }}
+    <meta property="og:image" content="{{ if .Params.meta_img }}{{ .Site.BaseURL }}{{ .Params.meta_img }}{{ else }}{{ .Site.BaseURL }}{{.Site.Params.social_banner}}{{ end }}">
     <meta property="twitter:card" content="summary_large_image">
     <meta property="twitter:image" content="{{ if .Params.meta_img }}{{ .Site.BaseURL }}{{ .Params.meta_img }}{{ else }}{{ .Site.BaseURL }}{{.Site.Params.social_banner}}{{ end }}">
 {{ else }}
     <meta property="twitter:card" content="summary">
 {{ end }}
-<meta property="twitter:description" content="{{ if .IsHome }}{{ .Site.Params.description }}{{ else if .IsPage }}{{ .Description }}{{ end }}">
+<meta property="og:description" content="{{ if .IsHome }}{{ .Site.Params.description }}{{ else if .IsPage }}{{ .Description }}{{ end }}">
+<meta property="twitter:description" content="{{ if .IsHome }}{{ .Site.Params.description }}{{ else if .IsPage }}{{ .Description }}{{ end }}">