diff --git a/README.md b/README.md index d7e4b8ed75412c92ecfc0dd4abeaeffda5a78d2c..d44d729d7fb8b0a52cda37f6d4752c5b90cb5fc0 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,6 @@ Soho is a minimalist two-column [hugo](https://gohugo.io) theme based on [Hyde]( - Rich Snippets (JSON-LD) - Twitter Card - Pagination -- Hidden Pages - Customizable - Support all [Hugo Internals](https://gohugo.io/templates/internal/) diff --git a/exampleSite/content/post/hidden-page.md b/exampleSite/content/post/hidden-page.md deleted file mode 100644 index e349ce8818cb7943de63772b7276052ecf9bb16f..0000000000000000000000000000000000000000 --- a/exampleSite/content/post/hidden-page.md +++ /dev/null @@ -1,11 +0,0 @@ -+++ -title = "Hidden Page" -date = "2020-02-01" -description = "This page is hidden and should not be visible without knowing the URL." -tags = [ - "privacy", -] -hidden = true -+++ - -This page is hidden and should not be visible without knowing the URL. diff --git a/exampleSite/content/post/soho.md b/exampleSite/content/post/soho.md index 5819f9b4ae68798b0433d7ea4959fb1edeba5809..2abc89333fd2a646a863b3fe522b64c0939bd6c5 100644 --- a/exampleSite/content/post/soho.md +++ b/exampleSite/content/post/soho.md @@ -19,7 +19,6 @@ tags = [ - Rich Snippets (JSON-LD) - Twitter Card - Pagination -- Hidden Pages - Customizable - Support all [Hugo Internals](https://gohugo.io/templates/internal/) diff --git a/layouts/_default/category.html b/layouts/_default/category.html index 294ab6552d540367554abb590538360b236a6ad9..f66747eaa9ea51b6a71e43c4af8bce738ebef00d 100644 --- a/layouts/_default/category.html +++ b/layouts/_default/category.html @@ -1,13 +1,7 @@ {{ define "main" -}} <ul class="posts"> <h1>Category: {{ .Title }}</h1> - {{ $regularPages := .Data.Pages -}} - {{ $pagesNotHidden := where $regularPages ".Params.hidden" "==" false }} - {{ $pagesHiddenUnset := where $regularPages ".Params.hidden" "==" nil }} - - {{ $pages := $pagesNotHidden | union $pagesHiddenUnset }} - - {{ range $pages -}} + {{ range .Data.Pages -}} <li> <span> <a href="{{ .Permalink }}">{{ .Title }}</a> diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 665318daba9ea0eab3024b956da5c8c21a7296ed..752b805c77bdae778fe752848b1585147adb085a 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,13 +1,7 @@ {{ define "main" -}} <ul class="posts"> <h1>{{ .Title }}</h1> - {{ $regularPages := .Data.Pages -}} - {{ $pagesNotHidden := where $regularPages ".Params.hidden" "==" false }} - {{ $pagesHiddenUnset := where $regularPages ".Params.hidden" "==" nil }} - - {{ $pages := $pagesNotHidden | union $pagesHiddenUnset }} - - {{ range $pages -}} + {{ range .Data.Pages -}} <li> <span> <a href="{{ .Permalink }}">{{ .Title }}</a> diff --git a/layouts/_default/single.html b/layouts/_default/single.html index b3554ca37046ea244efaeb6711cf482397be21fe..80217af6e345a296db1a7074ac12532a3089adf6 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -4,7 +4,7 @@ {{ if ne .Type "page" -}} <div class="post-date"> - <time datetime="{{ .Date.Format "2006-01-02T15:04:05Z0700" }}">{{ .Date.Format "Jan 2, 2006" }}</time> · {{ .ReadingTime }} min read + <time datetime="{{ .Date.Format "2006-01-02T15:04:05Z0700" }}">{{ .Date.Format "Jan 2, 2006" }}</time> · {{ .ReadingTime }} min read </div> {{- end }} diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html index d9be653c73cbab4b6d29b0cf2c1c688d87b2916a..34a87e0840168bc5a75c8a8590b45b90361256d3 100644 --- a/layouts/_default/taxonomy.html +++ b/layouts/_default/taxonomy.html @@ -1,13 +1,7 @@ {{ define "main" -}} <ul class="posts"> <h1>Tag: {{ .Title }}</h1> - {{ $regularPages := .Data.Pages -}} - {{ $pagesNotHidden := where $regularPages ".Params.hidden" "==" false }} - {{ $pagesHiddenUnset := where $regularPages ".Params.hidden" "==" nil }} - - {{ $pages := $pagesNotHidden | union $pagesHiddenUnset }} - - {{ range $pages -}} + {{ range .Data.Pages -}} <li> <span> <a href="{{ .Permalink }}">{{ .Title }}</a> diff --git a/layouts/index.html b/layouts/index.html index 3de3e6206443b4576a9686bcc2bcf365c7745fa2..01b82534b3a8f9a7bbde0fa9b2cdcf72373549b4 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,10 +1,6 @@ {{ define "main" -}} <div class="posts"> - {{- $regularPages := where .Site.RegularPages "Type" "in" .Site.Params.MainSections -}} - {{- $pagesNotHidden := where $regularPages ".Params.hidden" "==" false -}} - {{- $pagesHiddenUnset := where $regularPages ".Params.hidden" "==" nil -}} - - {{- $pages := $pagesNotHidden | union $pagesHiddenUnset -}} + {{- $pages := where .Site.RegularPages "Type" "in" .Site.Params.MainSections -}} {{- $paginator := .Paginate $pages -}} {{ range $paginator.Pages }} @@ -14,14 +10,12 @@ </h1> <div class="post-date"> - <time datetime="{{ .Date.Format "2006-01-02T15:04:05Z0700" }}">{{ .Date.Format "Jan 2, 2006" }}</time> · {{ .ReadingTime }} min read + <time datetime="{{ .Date.Format "2006-01-02T15:04:05Z0700" }}">{{ .Date.Format "Jan 2, 2006" }}</time> · {{ .ReadingTime }} min read </div> - {{ if .Description }} - {{ .Description }} - {{ else }} + <div> {{ .Summary }} - {{ end }} + </div> {{ if .Truncated }} <div class="read-more-link"> diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index cb0327c8c48b16b3d16757b10aed95af1fb269a7..354fbd9de13e3e51be63af429fa6aee2238cc50a 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,14 +1,13 @@ <footer> <div> © {{ $.Site.Params.Copyright }} {{ now.Format "2006"}} - · + {{ with $.Site.Params.License }} - <a href="{{ $.Site.Params.licenseURL }}" - target="_blank">{{ . | safeHTML }}</a> + · <a href="{{ $.Site.Params.licenseURL }}" target="_blank">{{ . | safeHTML }}</a> {{end}} + {{ with $.Site.Params.BuiltWith }} - · - Build with <a href="https://gohugo.io/" target="_blank">Hugo</a> & <a href="https://themes.gohugo.io/soho/" target="_blank">Soho</a> theme + · Build with <a href="https://gohugo.io/" target="_blank">Hugo</a> & <a href="https://themes.gohugo.io/soho/" target="_blank">Soho</a> theme {{end}} </div> </footer> diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html index 22ecbf527ad157c1d1fa7cc47fae52cf87bf501c..5ce773f66f53af5e484b49f54628e559aeaae8b7 100644 --- a/layouts/partials/sidebar.html +++ b/layouts/partials/sidebar.html @@ -27,7 +27,7 @@ </li> {{ range .Site.Menus.main -}} <li> - <a href="{{.URL}}"> {{ .Name }} </a> + <a href="{{ .URL }}"> {{ .Name }} </a> </li> {{- end }} </ul> @@ -35,7 +35,7 @@ <section class="social-icons"> {{ range $item := .Site.Params.socialIcons }} - <a href="{{ $item.url }}" rel="me" title="{{ $item.title }}"> + <a href="{{ $item.url }}" rel="me" title="{{ $item.title }}" target="_blank"> <i class="fab {{ $item.icon }}" aria-hidden="true"></i> </a> {{ end }} diff --git a/static/css/hyde.css b/static/css/hyde.css index 4f41617f5a4abf30efcda9e705f358aa4e746fa3..3692a71ee337c109ee92df11453f6132b38b1086 100644 --- a/static/css/hyde.css +++ b/static/css/hyde.css @@ -214,7 +214,7 @@ ul.posts { .pagination { justify-content: center; display: flex; - margin: 1em 0; + margin: 1em 0 2rem 0; padding: 0; }