diff --git a/config/_default/config.yaml b/config/_default/config.yaml index b5bc65c..9632e13 100644 --- a/config/_default/config.yaml +++ b/config/_default/config.yaml @@ -6,7 +6,8 @@ theme: blowfish baseURL: "https://rin.systems/" defaultContentLanguage: en enableRobotsTXT: true -paginate: 10 +pagination: + pagerSize: 10 summaryLength: 100 buildDrafts: false buildFuture: false diff --git a/layouts/partials/extend-head.html b/layouts/partials/extend-head.html new file mode 100644 index 0000000..6c5aa01 --- /dev/null +++ b/layouts/partials/extend-head.html @@ -0,0 +1,10 @@ +{{/* Instant Page Script */}} +{{/* Optimised by A Friend */}} + + diff --git a/layouts/partials/head.html b/layouts/partials/head.html deleted file mode 100644 index 3fd40d5..0000000 --- a/layouts/partials/head.html +++ /dev/null @@ -1,159 +0,0 @@ - - - {{ with .Site.Language.Params.htmlCode | default .Site.LanguageCode }} - - {{ end }} - - - {{/* Title */}} - {{ if .IsHome -}} - {{ .Site.Title | emojify }} - - {{- else -}} - {{ .Title | emojify }} · {{ .Site.Title | emojify }} - - {{- end }} - {{/* Metadata */}} - {{ with (.Params.Summary | default .Params.Description) | default .Site.Params.description -}} - - {{- end }} - {{ with .Params.Tags | default .Site.Params.keywords -}} - - {{- end }} - {{ with .Site.Params.robots }} - - {{ end }} - {{ with .Params.robots }} - - {{ end }} - - {{ range .AlternativeOutputFormats -}} - {{ printf ` - ` .Rel .MediaType.Type .RelPermalink ($.Site.Title | emojify) | - safeHTML }} - {{ end -}} - {{/* Asset bundles */}} - {{ $assets := newScratch }} - {{ $cssScheme := resources.Get (printf "css/schemes/%s.css" (.Site.Params.colorScheme | default "blowfish")) }} - {{ if not $cssScheme }} - {{ $cssScheme = resources.Get "css/schemes/blowfish.css" }} - {{ end }} - {{ $assets.Add "css" (slice $cssScheme) }} - {{ $cssMain := resources.Get "css/compiled/main.css" }} - {{ $assets.Add "css" (slice $cssMain) }} - {{ $cssCustom := resources.Get "css/custom.css" }} - {{ if $cssCustom }} - {{ $assets.Add "css" (slice $cssCustom) }} - {{ end }} - {{ $bundleCSS := $assets.Get "css" | resources.Concat "css/main.bundle.css" | resources.Minify | resources.Fingerprint - "sha512" }} - - {{ $jsAppearance := resources.Get "js/appearance.js" }} - {{ $jsAppearance = $jsAppearance | resources.ExecuteAsTemplate $jsAppearance.RelPermalink . | resources.Minify | resources.Fingerprint "sha512" }} - - {{ if .Site.Params.enableSearch | default false }} - {{ $jsFuse := resources.Get "lib/fuse/fuse.min.js" }} - {{ $jsSearch := resources.Get "js/search.js" }} - {{ $assets.Add "js" (slice $jsFuse $jsSearch) }} - {{ end }} - {{ if .Site.Params.enableCodeCopy | default false }} - {{ $jsCode := resources.Get "js/code.js" }} - {{ $assets.Add "js" (slice $jsCode) }} - {{ end }} - {{ if .Site.Params.rtl | default false }} - {{ $jsRTL := resources.Get "js/rtl.js" }} - {{ $assets.Add "js" (slice $jsRTL) }} - {{ end }} - {{ if $assets.Get "js" }} - {{ $bundleJS := $assets.Get "js" | resources.Concat "js/main.bundle.js" | resources.Minify | resources.Fingerprint - "sha512" }} - - {{ end }} - - {{/* Icons */}} - {{ if templates.Exists "partials/favicons.html" }} - {{ partialCached "favicons.html" .Site }} - {{ else }} - - - - - {{ end }} - {{/* Site Verification */}} - {{ with .Site.Params.verification.google }} - - {{ end }} - {{ with .Site.Params.verification.bing }} - - {{ end }} - {{ with .Site.Params.verification.pinterest }} - - {{ end }} - {{ with .Site.Params.verification.yandex }} - - {{ end }} - {{/* Social */}} - {{ template "_internal/opengraph.html" . }} - {{ template "_internal/twitter_cards.html" . }} - {{/* Schema */}} - {{ partial "schema.html" . }} - {{/* Me */}} - {{ with .Site.Author.name }} - {{ end }} - {{ with .Site.Author.links }} - {{ range $links := . }} - {{ range $name, $url := $links }} - {{ end }} - {{ end }} - {{ end }} - {{/* Vendor */}} - {{ partial "vendor.html" . }} - {{/* Analytics */}} - {{ partial "analytics/main.html" .Site }} - {{/* Extend head - eg. for custom analytics scripts, etc. */}} - {{ if templates.Exists "partials/extend-head.html" }} - {{ partialCached "extend-head.html" .Site }} - {{ end }} - - {{/* Firebase */}} - {{ with $.Site.Params.firebase }} - {{ if isset $.Site.Params "firebase" }} - - - - - - {{ end }} - {{ end }} - {{/* Instant Page Script */}} - {{/* Optimised by A Friend */}} - - - - diff --git a/layouts/partials/head.html.old b/layouts/partials/head.html.old deleted file mode 100644 index 346ccb1..0000000 --- a/layouts/partials/head.html.old +++ /dev/null @@ -1,162 +0,0 @@ - - - {{ with .Site.Language.Params.htmlCode | default .Site.LanguageCode }} - - {{ end }} - - - {{/* Title */}} - {{ if .IsHome -}} - {{ .Site.Title | emojify }} - - {{- else -}} - {{ .Title | emojify }} · {{ .Site.Title | emojify }} - - {{- end }} - {{/* Metadata */}} - {{ with .Site.Params.description -}} - - {{- end }} - {{ with .Site.Params.keywords -}} - - {{- end }} - {{ with .Site.Params.robots }} - - {{ end }} - {{ with .Params.robots }} - - {{ end }} - - {{ range .AlternativeOutputFormats -}} - {{ printf ` - ` .Rel .MediaType.Type (.RelPermalink | absURL) ($.Site.Title | emojify) | - safeHTML }} - {{ end -}} - {{/* Asset bundles */}} - {{ $assets := newScratch }} - {{ $cssScheme := resources.Get (printf "css/schemes/%s.css" (.Site.Params.colorScheme | default "blowfish")) }} - {{ if not $cssScheme }} - {{ $cssScheme = resources.Get "css/schemes/blowfish.css" }} - {{ end }} - {{ $assets.Add "css" (slice $cssScheme) }} - {{ $cssMain := resources.Get "css/compiled/main.css" }} - {{ $assets.Add "css" (slice $cssMain) }} - {{ $cssCustom := resources.Get "css/custom.css" }} - {{ if $cssCustom }} - {{ $assets.Add "css" (slice $cssCustom) }} - {{ end }} - {{ $bundleCSS := $assets.Get "css" | resources.Concat "css/main.bundle.css" | resources.Minify | resources.Fingerprint - "sha512" }} - - {{ $jsMain := resources.Get "js/main.js" }} - {{ $jsMain = $jsMain | resources.Minify | resources.Fingerprint "sha512" }} - - {{ $jsAppearance := resources.Get "js/appearance.js" }} - {{ $jsAppearance = $jsAppearance | resources.Minify | resources.Fingerprint "sha512" }} - - {{ if .Site.Params.enableSearch | default false }} - {{ $jsFuse := resources.Get "lib/fuse/fuse.min.js" }} - {{ $jsSearch := resources.Get "js/search.js" }} - {{ $assets.Add "js" (slice $jsFuse $jsSearch) }} - {{ end }} - {{ if .Site.Params.enableCodeCopy | default false }} - {{ $jsCode := resources.Get "js/code.js" }} - {{ $assets.Add "js" (slice $jsCode) }} - {{ end }} - {{ if .Site.Params.rtl | default false }} - {{ $jsRTL := resources.Get "js/rtl.js" }} - {{ $assets.Add "js" (slice $jsRTL) }} - {{ end }} - {{ if $assets.Get "js" }} - {{ $bundleJS := $assets.Get "js" | resources.Concat "js/main.bundle.js" | resources.Minify | resources.Fingerprint - "sha512" }} - - {{ end }} - - {{/* Icons */}} - {{ if templates.Exists "partials/favicons.html" }} - {{ partialCached "favicons.html" .Site }} - {{ else }} - - - - - {{ end }} - {{/* Site Verification */}} - {{ with .Site.Params.verification.google }} - - {{ end }} - {{ with .Site.Params.verification.bing }} - - {{ end }} - {{ with .Site.Params.verification.pinterest }} - - {{ end }} - {{ with .Site.Params.verification.yandex }} - - {{ end }} - {{/* Social */}} - {{ template "_internal/opengraph.html" . }} - {{ template "_internal/twitter_cards.html" . }} - {{/* Schema */}} - {{ partial "schema.html" . }} - {{/* Me */}} - {{ with .Site.Author.name }} - {{ end }} - {{ with .Site.Author.links }} - {{ range $links := . }} - {{ range $name, $url := $links }} - {{ end }} - {{ end }} - {{ end }} - {{/* Vendor */}} - {{ partial "vendor.html" . }} - {{/* Analytics */}} - {{ partialCached "analytics.html" .Site }} - {{/* Extend head - eg. for custom analytics scripts, etc. */}} - {{ if templates.Exists "partials/extend-head.html" }} - {{ partialCached "extend-head.html" .Site }} - {{ end }} - - - {{/* Firebase */}} - {{ with $.Site.Params.firebase }} - {{ if isset $.Site.Params "firebase" }} - - - - - - {{/* Instant Page Script */}} - {{/* Optimised by A Friend */}} - - - {{ end }} - {{ end }} - diff --git a/themes/blowfish b/themes/blowfish index 9818cfd..16716db 160000 --- a/themes/blowfish +++ b/themes/blowfish @@ -1 +1 @@ -Subproject commit 9818cfd07b7038a22e582ec26f95159817e38d1a +Subproject commit 16716dbb14a0d11a61b3f7cd141b8671ec474727