From 85cd240a672d84d1bb8c4ad0a2d58e5fe4706681 Mon Sep 17 00:00:00 2001 From: zwbetz Date: Tue, 10 Dec 2019 21:28:55 -0600 Subject: upgrade hugo to 0.60.1 --- README.md | 8 ++-- exampleSite/config.toml | 55 ------------------------- exampleSite/config.yaml | 39 ++++++++++++++---- exampleSite/content/post/quotes-by-carl-jung.md | 44 ++++++++++---------- netlify.toml | 2 +- theme.toml | 2 +- 6 files changed, 60 insertions(+), 90 deletions(-) delete mode 100644 exampleSite/config.toml diff --git a/README.md b/README.md index 9ab63e1..be5b45d 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ https://vanilla-bootstrap-hugo-theme.netlify.com/ ## Minimum Hugo version -Hugo version `0.58.3` or higher is required. View the [Hugo releases](https://github.com/gohugoio/hugo/releases) and download the binary for your OS. +Hugo version `0.60.1` or higher is required. View the [Hugo releases](https://github.com/gohugoio/hugo/releases) and download the binary for your OS. ## Installation @@ -54,7 +54,7 @@ hugo server --themesDir ../.. ## Configuration -Copy the `config.toml` or `config.yaml` from the [`exampleSite`](https://github.com/zwbetz-gh/vanilla-bootstrap-hugo-theme/tree/master/exampleSite), then edit as desired. +Copy `config.yaml` from the [`exampleSite`](https://github.com/zwbetz-gh/vanilla-bootstrap-hugo-theme/tree/master/exampleSite), then edit as desired. ## Homepage content @@ -77,9 +77,9 @@ Uses [Bootstrap blockquotes](https://getbootstrap.com/docs/4.3/content/typograph [Here's an actual usage](https://raw.githubusercontent.com/zwbetz-gh/vanilla-bootstrap-hugo-theme/master/exampleSite/content/post/quotes-by-carl-jung.md), and here's an example usage: ``` -{{% bootstrap-blockquote author="Carl Jung" %}} +{{< bootstrap-blockquote author="Carl Jung" >}} Knowing your own darkness is the best method for dealing with the darknesses of other people. -{{% /bootstrap-blockquote %}} +{{< /bootstrap-blockquote >}} ``` ### bootstrap-table diff --git a/exampleSite/config.toml b/exampleSite/config.toml deleted file mode 100644 index 5dc1beb..0000000 --- a/exampleSite/config.toml +++ /dev/null @@ -1,55 +0,0 @@ -baseURL = "https://example.com" -languageCode = "en-us" -title = "Vanilla" -theme = "vanilla-bootstrap-hugo-theme" -googleAnalytics = "UA-123456789-1" - -# Uncomment below to enable syntax highlighting -# pygmentsCodefences = true -# pygmentsCodefencesGuessSyntax = true -# See https://xyproto.github.io/splash/docs/all.html for more styles -# pygmentsStyle = "pygments" - -[taxonomies] - tag = "tags" - -[permalinks] - post = "/:filename/" - -# See https://feathericons.com/ -# The value of pre is the icon name -[menu] - [[menu.nav]] - name = "Home" - pre = "home" - url = "/" - weight = 1 - [[menu.nav]] - name = "Blog" - pre = "edit" - url = "/post/" - weight = 2 - [[menu.nav]] - name = "Tags" - pre = "tag" - url = "/tags/" - weight = 3 - [[menu.nav]] - name = "About" - pre = "smile" - url = "/about/" - weight = 4 - [[menu.nav]] - name = "RSS" - pre = "rss" - url = "/index.xml" - weight = 5 - -[params] - includeBootstrapJs = false - showActiveNav = true - containerMaxWidth = "700px" - dateFormat = "Jan 2, 2006" - homeText = "Welcome to the Vanilla theme demo. Have a look around. Maybe even eat some ice cream." - footerText = "Made with [Hugo](https://gohugo.io/) & [Vanilla](https://github.com/zwbetz-gh/vanilla-bootstrap-hugo-theme)" - hideFooter = false \ No newline at end of file diff --git a/exampleSite/config.yaml b/exampleSite/config.yaml index 4fcd6fe..d06df68 100644 --- a/exampleSite/config.yaml +++ b/exampleSite/config.yaml @@ -4,12 +4,6 @@ title: Vanilla theme: vanilla-bootstrap-hugo-theme googleAnalytics: UA-123456789-1 -# Uncomment below to enable syntax highlighting -# pygmentsCodefences: true -# pygmentsCodefencesGuessSyntax: true -# See https://xyproto.github.io/splash/docs/all.html for more styles -# pygmentsStyle: pygments - taxonomies: tag: tags @@ -48,4 +42,35 @@ params: dateFormat: Jan 2, 2006 homeText: Welcome to the Vanilla theme demo. Have a look around. Maybe even eat some ice cream. footerText: Made with [Hugo](https://gohugo.io/) & [Vanilla](https://github.com/zwbetz-gh/vanilla-bootstrap-hugo-theme) - hideFooter: false \ No newline at end of file + hideFooter: false + +markup: + defaultMarkdownHandler: goldmark + goldmark: + extensions: + definitionList: true + footnote: true + linkify: true + strikethrough: true + table: true + taskList: true + typographer: true + parser: + attribute: true + autoHeadingID: true + renderer: + hardWraps: false + unsafe: true + xHTML: false + highlight: + codeFences: true + hl_Lines: "" + lineNoStart: 1 + lineNos: false + lineNumbersInTable: true + noClasses: true + style: monokai + tabWidth: 4 + tableOfContents: + endLevel: 6 + startLevel: 2 diff --git a/exampleSite/content/post/quotes-by-carl-jung.md b/exampleSite/content/post/quotes-by-carl-jung.md index db230d4..6c57952 100644 --- a/exampleSite/content/post/quotes-by-carl-jung.md +++ b/exampleSite/content/post/quotes-by-carl-jung.md @@ -4,46 +4,46 @@ date: 2018-12-26T00:29:41-06:00 tags: ["quotes"] --- -{{% bootstrap-blockquote author="Carl Jung" %}} +{{< bootstrap-blockquote author="Carl Jung" >}} Even a happy life cannot be without a measure of darkness, and the word happy would lose its meaning if it were not balanced by sadness. It is far better to take things as they come along with patience and equanimity. -{{% /bootstrap-blockquote %}} +{{< /bootstrap-blockquote >}} -{{% bootstrap-blockquote author="Carl Jung" %}} +{{< bootstrap-blockquote author="Carl Jung" >}} The least of things with a meaning is worth more in life than the greatest of things without it. -{{% /bootstrap-blockquote %}} +{{< /bootstrap-blockquote >}} -{{% bootstrap-blockquote author="Carl Jung" %}} +{{< bootstrap-blockquote author="Carl Jung" >}} Who looks outside, dreams; who looks inside, awakes. -{{% /bootstrap-blockquote %}} +{{< /bootstrap-blockquote >}} -{{% bootstrap-blockquote author="Carl Jung" %}} +{{< bootstrap-blockquote author="Carl Jung" >}} Everything that irritates us about others can lead us to an understanding of ourselves. -{{% /bootstrap-blockquote %}} +{{< /bootstrap-blockquote >}} -{{% bootstrap-blockquote author="Carl Jung" %}} +{{< bootstrap-blockquote author="Carl Jung" >}} Knowing your own darkness is the best method for dealing with the darknesses of other people. -{{% /bootstrap-blockquote %}} +{{< /bootstrap-blockquote >}} -{{% bootstrap-blockquote author="Carl Jung" %}} +{{< bootstrap-blockquote author="Carl Jung" >}} The meeting of two personalities is like the contact of two chemical substances: if there is any reaction, both are transformed. -{{% /bootstrap-blockquote %}} +{{< /bootstrap-blockquote >}} -{{% bootstrap-blockquote author="Carl Jung" %}} +{{< bootstrap-blockquote author="Carl Jung" >}} There is no coming to consciousness without pain. -{{% /bootstrap-blockquote %}} +{{< /bootstrap-blockquote >}} -{{% bootstrap-blockquote author="Carl Jung" %}} +{{< bootstrap-blockquote author="Carl Jung" >}} As far as we can discern, the sole purpose of human existence is to kindle a light of meaning in the darkness of mere being. -{{% /bootstrap-blockquote %}} +{{< /bootstrap-blockquote >}} -{{% bootstrap-blockquote author="Carl Jung" %}} +{{< bootstrap-blockquote author="Carl Jung" >}} We cannot change anything until we accept it. Condemnation does not liberate, it oppresses. -{{% /bootstrap-blockquote %}} +{{< /bootstrap-blockquote >}} -{{% bootstrap-blockquote author="Carl Jung" %}} +{{< bootstrap-blockquote author="Carl Jung" >}} In all chaos there is a cosmos, in all disorder a secret order. -{{% /bootstrap-blockquote %}} +{{< /bootstrap-blockquote >}} -{{% bootstrap-blockquote author="Carl Jung" %}} +{{< bootstrap-blockquote author="Carl Jung" >}} Show me a sane man and I will cure him for you. -{{% /bootstrap-blockquote %}} +{{< /bootstrap-blockquote >}} diff --git a/netlify.toml b/netlify.toml index db5fba6..5dc82ca 100644 --- a/netlify.toml +++ b/netlify.toml @@ -3,6 +3,6 @@ command = "cd exampleSite && hugo --gc --themesDir ../.." [build.environment] - HUGO_VERSION = "0.58.3" + HUGO_VERSION = "0.60.1" HUGO_THEME = "repo" HUGO_BASEURL = "https://vanilla-bootstrap-hugo-theme.netlify.com/" \ No newline at end of file diff --git a/theme.toml b/theme.toml index c094389..261ea3b 100644 --- a/theme.toml +++ b/theme.toml @@ -5,7 +5,7 @@ description = "A vanilla Bootstrap theme for Hugo" homepage = "https://github.com/zwbetz-gh/vanilla-bootstrap-hugo-theme" tags = ["home", "blog", "tags", "bootstrap", "minimal", "clean", "simple", "feather"] features = ["home", "blog", "tags", "bootstrap", "minimal", "clean", "simple", "feather"] -min_version = "0.58.3" +min_version = "0.60.1" [author] name = "Zachary Betz" -- cgit v1.2.3