diff options
author | YK <osakana.yano49@gmail.com> | 2020-02-16 22:13:37 +0300 |
---|---|---|
committer | YK <osakana.yano49@gmail.com> | 2020-02-16 22:13:37 +0300 |
commit | d60bb782a5ddd48dd88a0c9276645e2a5ff1d606 (patch) | |
tree | 0aef50962e68415c157f5b3663e5c940b0cf5026 | |
parent | ceacb8701ce3576802367960ce3c357c43d9b154 (diff) | |
parent | 6e4d72a35035cee6bef6d5561204f99603bcbaaf (diff) |
merge | resolve conflict
-rw-r--r-- | README.md | 3 | ||||
-rw-r--r-- | exampleSite/config.toml | 38 | ||||
-rw-r--r-- | layouts/taxonomy/tag.html | 3 |
3 files changed, 23 insertions, 21 deletions
@@ -84,6 +84,9 @@ platforms = ["github","facebook","twitter","instagram","email","codepen","linked siteID = 1 rootURL = "//matomo.example.com/" +[params.fathomAnalytics] +rootURL = "//fathom.example.com/" + [taxonomies] tag ="tags" diff --git a/exampleSite/config.toml b/exampleSite/config.toml index 4d2d55b..178b63e 100644 --- a/exampleSite/config.toml +++ b/exampleSite/config.toml @@ -1,34 +1,34 @@ -baseurl = "https://www.example.com" +baseurl = "https://example.com" languageCode = "en" title = "Hugo Kiss theme" theme = "kiss" copyright = "© <a href=\"https://github.com/ribice\">Emir Ribic</a> 2017" disqusShortname = "shortname" googleAnalytics = "" -# Number of posts per page -Paginate = 5 +Paginate = 5 # Number of posts per page enableRobotsTXT = true -[params.features] -disqusOnDemand = true # Load Disqus comments on click +[params.rss] # Adding this tag enables RSS feed +includeContent = true # Includes whole content in rss +authorName = "Emir Ribic" # Author full name +authorEmail = "ribice@gmail.com" # Author email [params.assets] customCSS = ["css/custom.css"] -[params.rss] - -includeContent = true # Includes whole content in rss -authorName = "Emir Ribic" # Site author's full name -authorEmail = "ribice@gmail.com" - [params.info] adsense = "" # Adsense ID (ID only, without ca-pub-) -enableSocial = false # Adds OpenGraph and Twitter cards +enableSocial = true # Adds OpenGraph and Twitter cards homeTitle = "" # Title for home page -poweredby = true # Adds powered by Hugo and Kiss below Copyright section -related = true # Includes related articles +poweredby = true # Adds powered by hugo and kiss below Copyright +related = true # Includes related articles at the bottom of the article +codeCopy = true # Add copy button above code blocks taxonomiesCount = true # Add taxonomies count +[params.features] +disqusOnDemand = true # Load Disqus comments on click + + [params.opengraph.facebook] admins = [] # array of Facebook IDs appID = "" @@ -38,18 +38,17 @@ pageID = "" page = "" # Twitter Page username. If not set, params.social.twitter will be used. [params.social] - twitter = "ribicemir" github = "ribice" email = "ribice@gmail.com" linkedin = "ribice" -gitlab = "ribice" +facebook = "ribice" instagram = "" codepen = "" -facebook = "" +rss = "index.xml" # Add this to show RSS button in social. [params.social.config] -platforms = ["twitter","github","email","email","linkedin","gitlab"] +platforms = ["github","facebook","twitter","instagram","email","codepen","linkedin"] [params.matomoAnalytics] siteID = 1 @@ -62,5 +61,4 @@ rootURL = "//fathom.example.com/" tag ="tags" [blackfriday] -hrefTargetBlank = true - +hrefTargetBlank = true
\ No newline at end of file diff --git a/layouts/taxonomy/tag.html b/layouts/taxonomy/tag.html index 8168cd4..ad006df 100644 --- a/layouts/taxonomy/tag.html +++ b/layouts/taxonomy/tag.html @@ -2,7 +2,8 @@ {{ partial "nav" . }} <section class="section"> <div class="container"> - {{ range .Data.Pages }} + {{ $paginator := .Paginate (where .Data.Pages "Params.hidden" "ne" true) }} + {{ range sort .Paginator.Pages }} <article> <div class="subtitle tags is-6 is-pulled-right"> {{ if .Params.tags }} |