From 3722c7d41319d44dec166fc481a5c99e8ba5aa2c Mon Sep 17 00:00:00 2001 From: Michael Grosser Date: Thu, 23 Apr 2020 12:15:24 +0000 Subject: [PATCH 1/3] Wrap .File.Dir in conditionals to prevent warning Fixes: #728 --- exampleSite/config-dev.toml | 3 +++ layouts/_default/list.html | 4 ++-- layouts/partials/fragments/editor.html | 16 +++++++++------- layouts/partials/fragments/graph.html | 16 +++++++++------- layouts/partials/fragments/hero.html | 20 +++++++++++--------- 5 files changed, 34 insertions(+), 25 deletions(-) diff --git a/exampleSite/config-dev.toml b/exampleSite/config-dev.toml index b426e0fb..3903ae3a 100644 --- a/exampleSite/config-dev.toml +++ b/exampleSite/config-dev.toml @@ -9,6 +9,9 @@ enableGitInfo = true version = "0.16.2" disableKinds = ["RSS", "taxonomy", "taxonomyTerm"] +RelativeURLs = true +CanonifyURLs = true + # Google Analytics tracking googleAnalytics = "" diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 4ec3df1e..8317c461 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,6 +1,6 @@ {{- define "main" -}} - {{/* In some edge cases, .CurrentSection is not available. If it's not - available the build would break since we need .CurrentSection.File.Dir later on. */}} + {{- /* In some edge cases, .CurrentSection is not available. If it's not + available the build would break since we need .CurrentSection.File.Dir later on. */ -}} {{- if .CurrentSection -}} {{- $list_page := .Site.GetPage "page" (printf "%s%s" .CurrentSection.File.Dir "_index") -}} {{/* real_page is the _index.md file which indicates the page that is diff --git a/layouts/partials/fragments/editor.html b/layouts/partials/fragments/editor.html index de379dda..0a4620c2 100644 --- a/layouts/partials/fragments/editor.html +++ b/layouts/partials/fragments/editor.html @@ -6,10 +6,12 @@ {{- partial "helpers/container.html" (dict "start" true "in_slot" .in_slot "bg" $bg "Name" .Name "Params" .Params) -}}
{{- partial "helpers/container.html" (dict "end" true "in_slot" .in_slot) -}} - +{{- if .page.File.Dir -}} + +{{- end -}} diff --git a/layouts/partials/fragments/graph.html b/layouts/partials/fragments/graph.html index 92b22819..efe18664 100644 --- a/layouts/partials/fragments/graph.html +++ b/layouts/partials/fragments/graph.html @@ -11,10 +11,12 @@ {{- partial "helpers/container.html" (dict "end" true "in_slot" .in_slot) -}} - +{{- if .page.File.Dir -}} + +{{- end -}} diff --git a/layouts/partials/fragments/hero.html b/layouts/partials/fragments/hero.html index c1cd0c9f..3fc6228a 100644 --- a/layouts/partials/fragments/hero.html +++ b/layouts/partials/fragments/hero.html @@ -103,12 +103,14 @@ {{- if .Params.particles }} - -{{ end -}} +{{- if .page.File.Dir -}} + + {{ end -}} +{{ end -}} \ No newline at end of file From 378b3f8c2781ca79650d0d0bb0a9c92231547d22 Mon Sep 17 00:00:00 2001 From: Michael Grosser Date: Fri, 24 Apr 2020 10:56:54 +0000 Subject: [PATCH 2/3] Add changes to changelog for release --- CHANGELOG.md | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index db867078..553ae957 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ +# v0.17.0 +_2020-04-24_ + - [Downloads for v0.17.0](https://syna.okkur.org/releases/v0.17.0) + - [Changelog since v0.16.2](#changes-since-v0162) + +## Documentation for v0.17 +[Documentation](https://syna.okkur.org/docs) *Documentation defaults to latest release* + +## Changes since v0.16.2 +- Dutch translation (now supporting French, Dutch, English, German and Portuguese) + +## Fixes since v0.16.2 +- Fix date_format not being used [738](https://github.com/okkur/syna/pull/738) +- Remove relLangURL for assets [732](https://github.com/okkur/syna/pull/732) +- Fix list section path in exampleSite [726](https://github.com/okkur/syna/pull/726) + +--- + # v0.16.2 _2020-03-23_ From 014ac2baa5ee9d496403dacdee6b6fa7a4cc585e Mon Sep 17 00:00:00 2001 From: Michael Grosser Date: Fri, 24 Apr 2020 10:57:09 +0000 Subject: [PATCH 3/3] Update version to v0.17.0 --- .seed-config.yaml | 2 +- VERSION | 2 +- exampleSite/config-dev.toml | 2 +- exampleSite/config.toml | 2 +- exampleSite/content/docs/installation/content.md | 2 +- exampleSite/package.json | 2 +- layouts/partials/head.html | 2 +- netlify.toml | 6 +++--- package.json | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.seed-config.yaml b/.seed-config.yaml index aa22eb8a..05e5fea9 100644 --- a/.seed-config.yaml +++ b/.seed-config.yaml @@ -6,7 +6,7 @@ project: oneLiner: "Highly customizable open source theme for Hugo based static websites" description: | Create your next website with Syna. - version: "v0.16.2" + version: "v0.17.0" vision: type: "community" diff --git a/VERSION b/VERSION index 86586e6a..2bb97efb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v0.16.2 +v0.17.0 \ No newline at end of file diff --git a/exampleSite/config-dev.toml b/exampleSite/config-dev.toml index 3903ae3a..b98b9e5d 100644 --- a/exampleSite/config-dev.toml +++ b/exampleSite/config-dev.toml @@ -6,7 +6,7 @@ title = "Okkur - Syna" theme = "syna" themesDir = "../.." enableGitInfo = true -version = "0.16.2" +version = "0.17.0" disableKinds = ["RSS", "taxonomy", "taxonomyTerm"] RelativeURLs = true diff --git a/exampleSite/config.toml b/exampleSite/config.toml index 6e96b089..f6762205 100644 --- a/exampleSite/config.toml +++ b/exampleSite/config.toml @@ -6,7 +6,7 @@ title = "Okkur - Syna" theme = "syna" themesDir = "../.." enableGitInfo = true -version = "0.16.2" +version = "0.17.0" disableKinds = ["RSS", "taxonomy", "taxonomyTerm"] ignorefiles = [ "content/dev/.*" ] diff --git a/exampleSite/content/docs/installation/content.md b/exampleSite/content/docs/installation/content.md index 4a89ea0a..35b674d6 100644 --- a/exampleSite/content/docs/installation/content.md +++ b/exampleSite/content/docs/installation/content.md @@ -17,7 +17,7 @@ This way whenever you want to update the theme you can just pull the updates and git submodule init # If you haven't initialized before git submodule add https://git.okkur.org/syna themes/syna cd themes/syna -git checkout v0.16 # Latest release as of now is v0.16.2 +git checkout v0.17 # Latest release as of now is v0.17.0 ``` *You can visit [Hugo's documentation](https://gohugo.io/themes/installing-and-using-themes/) on installing themes for more information.* diff --git a/exampleSite/package.json b/exampleSite/package.json index 2636d99f..c839c72b 100644 --- a/exampleSite/package.json +++ b/exampleSite/package.json @@ -1,6 +1,6 @@ { "name": "example-site", - "version": "0.16.2", + "version": "0.17.0", "description": "Example Site for Syna theme for Hugo", "main": "static-main/js/index.js", "author": "Michael Grosser", diff --git a/layouts/partials/head.html b/layouts/partials/head.html index b5ea6e83..eb8c7727 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -7,7 +7,7 @@ {{- end -}} - + diff --git a/netlify.toml b/netlify.toml index 5e03690a..ce99e348 100644 --- a/netlify.toml +++ b/netlify.toml @@ -4,17 +4,17 @@ command = "HUGO_THEME=repo DEMO_MODE=true hugo --config config-dev.toml -d ../public --minify" [context.production.environment] - HUGO_VERSION = "0.68.3" + HUGO_VERSION = "0.69.2" HUGO_ENV = "production" [context.deploy-preview] command = "HUGO_THEME=repo DEMO_MODE=true hugo --config config-dev.toml -d ../public --minify" [context.deploy-preview.environment] - HUGO_VERSION = "0.68.3" + HUGO_VERSION = "0.69.2" [context.branch-deploy] command = "HUGO_THEME=repo DEMO_MODE=true hugo --config config-dev.toml -d ../public --minify" [context.branch-deploy.environment] - HUGO_VERSION = "0.68.3" + HUGO_VERSION = "0.69.2" diff --git a/package.json b/package.json index 62c16d1d..dc76815c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "syna", - "version": "0.16.2", + "version": "0.17.0", "description": "Highly customizable open source theme for Hugo based static websites", "main": "static-main", "repository": "https://git.okkur.org/syna",