Merge remote-tracking branch 'origin/master'

data/beautifulhugo/social.toml

@@ -34,6 +34,12 @@ url = "https://twitter.com/%s"
 title = "Twitter"
 icon = "fab fa-twitter"
 
+[[social_icons]]
+id = "slack"
+url = "https://%s.slack.com/"
+title = "Slack"
+icon = "fab fa-slack"
+
 [[social_icons]]
 id = "reddit"
 url = "https://reddit.com/u/%s"

exampleSite/config.toml

@@ -68,8 +68,9 @@ pygmentsCodefencesGuessSyntax = true
   paypal = "username"
   telegram = "username"
   500px = "username"
-  weibo = "username"
   mastodon = "url"
+  weibo = "username"
+  slack = "username"
 
 [[menu.main]]
     name = "Blog"

layouts/_default/baseof.html

@@ -8,6 +8,7 @@
     {{ block "header" . }}{{ partial "header.html" . }}{{ end }}
     {{ block "main" . }}{{ end }}
     {{ partial "footer.html" . }}
+    {{ block "footer" . }}{{ end }}
   </body>
 </html>
 

layouts/_default/single.html

@@ -23,14 +23,19 @@
         {{ end }}
 
         {{ if .Site.Params.showRelatedPosts }}
-          {{ $related := .Site.RegularPages.Related . | first 3 }}
-          {{ with $related }}
+          {{ range first 1 (where (where .Site.Pages ".Params.tags" "intersect" .Params.tags) "Permalink" "!=" .Permalink) }}
+            {{ $.Scratch.Set "has_related" true }}
+          {{ end }}
+
+          {{ if $.Scratch.Get "has_related" }}
                   <h4 class="see-also">{{ i18n "seeAlso" }}</h4>
                   <ul>
-          {{ range . }}
+                {{ $num_to_show := .Site.Params.related_content_limit | default 5 }}
+                {{ range first $num_to_show (where (where .Site.Pages ".Params.tags" "intersect" .Params.tags) "Permalink" "!=" .Permalink) }}
                     <li><a href="{{ .RelPermalink }}">{{ .Title }}</a></li>
                 {{ end }}
               </ul>
+
           {{ end }}
         {{ end }}
       </article>