ref: 3d84ef9720f4a18c7af995680621a65ef5cb76f4
parent: 9c9987535f98714c8a4ec98903f54233735ef0e4
parent: c494c37a4523fbf2db6274dc87e0877fd5bec24b
author: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
date: Tue Mar 31 18:11:54 EDT 2020
Merge commit 'c494c37a4523fbf2db6274dc87e0877fd5bec24b'
--- a/docs/.github/workflows/calibreapp-image-actions.yml
+++ /dev/null
@@ -1,12 +1,0 @@
-name: Compress images
-on: pull_request
-jobs:
- build:
- name: calibreapp/image-actions
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@master
- - name: calibreapp/image-actions
- uses: docker://calibreapp/github-image-actions
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/docs/_vendor/github.com/gohugoio/gohugoioTheme/layouts/_default/baseof.html
+++ b/docs/_vendor/github.com/gohugoio/gohugoioTheme/layouts/_default/baseof.html
@@ -1,70 +1,73 @@
<!DOCTYPE html>
<html class="no-js" lang="{{ with $.Site.LanguageCode }}{{ . }}{{ else }}en-us{{ end }}">
- <head>
- <meta charset="utf-8">
- {{/* https://www.zachleat.com/web/preload/ */}}
- <link rel="preload" href="{{ "fonts/muli-latin-200.woff2" | absURL }}" as="font" type="font/woff2" crossorigin>
- <link rel="preload" href="{{ "fonts/muli-latin-400.woff2" | absURL }}" as="font" type="font/woff2" crossorigin>
- <link rel="preload" href="{{ "fonts/muli-latin-800.woff2" | absURL }}" as="font" type="font/woff2" crossorigin>
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
- {{/* NOTE: the Site's title, and if there is a page title, that is set too */}}
- <title>{{ block "title" . }}{{ with .Title }}{{ . }} | {{ end }}{{ .Site.Title }}{{ end }}</title>
+<head>
+ <meta charset="utf-8">
+ {{/* https://www.zachleat.com/web/preload/ */}}
+ <link rel="preload" href="{{ "fonts/muli-latin-200.woff2" | absURL }}" as="font" type="font/woff2" crossorigin>
+ <link rel="preload" href="{{ "fonts/muli-latin-400.woff2" | absURL }}" as="font" type="font/woff2" crossorigin>
+ <link rel="preload" href="{{ "fonts/muli-latin-800.woff2" | absURL }}" as="font" type="font/woff2" crossorigin>
- <meta name="viewport" content="width=device-width,minimum-scale=1">
- {{ hugo.Generator }}
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ {{/* NOTE: the Site's title, and if there is a page title, that is set too */}}
+ <title>{{ block "title" . }}{{ with .Title }}{{ . }} | {{ end }}{{ .Site.Title }}{{ end }}</title>
- {{ if eq (getenv "HUGO_ENV") "production" | or (eq .Site.Params.env "production") }}
- <meta name="robots" content="index, follow">
- {{ else }}
- <meta name="robots" content="noindex, nofollow">
- {{ end }}
+ <meta name="viewport" content="width=device-width,minimum-scale=1">
+ {{ hugo.Generator }}
- {{ range .AlternativeOutputFormats -}}
- <link rel="{{ .Rel }}" type="{{ .MediaType.Type }}" href="{{ .Permalink | safeURL }}">
- {{ end -}}
-
- {{ $isDev := eq hugo.Environment "development" }}
- {{ $stylesheet := resources.Get "output/css/app.css" }}
- {{ if not $isDev }}
- {{ $stylesheet = $stylesheet | minify | fingerprint }}
- {{ end }}
- {{ with $stylesheet }}
- {{ if $isDev }}
- <link rel="stylesheet" href="{{ .RelPermalink }}" crossorigin="anonymous">
- {{ else }}
- <link rel="stylesheet" href="{{ .RelPermalink }}" integrity="{{ .Data.Integrity }}" crossorigin="anonymous">
- {{ end }}
- {{ $.Scratch.Set "stylesheet" . }}
- {{end}}
+ {{ if eq (getenv "HUGO_ENV") "production" | or (eq .Site.Params.env "production") }}
+ <meta name="robots" content="index, follow">
+ {{ else }}
+ <meta name="robots" content="noindex, nofollow">
+ {{ end }}
+ {{ range .AlternativeOutputFormats -}}
+ <link rel="{{ .Rel }}" type="{{ .MediaType.Type }}" href="{{ .Permalink | safeURL }}">
+ {{ end -}}
- {{ block "scripts" . }}
- {{- partial "site-scripts.html" . -}}
- {{ end }}
- {{ partial "site-manifest.html" . }}
- {{- partial "head-additions.html" . -}}
- {{- template "_internal/opengraph.html" . -}}
- {{- template "_internal/schema.html" . -}}
- {{- template "_internal/twitter_cards.html" . -}}
+ {{ $isDev := eq hugo.Environment "development" }}
+ {{ $stylesheet := resources.Get "output/css/app.css" }}
+ {{ if not $isDev }}
+ {{ $stylesheet = $stylesheet | minify | fingerprint }}
+ {{ end }}
+ {{ with $stylesheet }}
+ {{ if $isDev }}
+ <link rel="stylesheet" href="{{ .RelPermalink }}" crossorigin="anonymous">
+ {{ else }}
+ <link rel="stylesheet" href="{{ .RelPermalink }}" integrity="{{ .Data.Integrity }}" crossorigin="anonymous">
+ {{ end }}
+ {{ $.Scratch.Set "stylesheet" . }}
+ {{end}}
- {{ if eq (getenv "HUGO_ENV") "production" | or (eq .Site.Params.env "production") }}
- {{ partial "gtag" . }}
- {{ end }}
+ {{ block "scripts" . }}
+ {{- partial "site-scripts.html" . -}}
+ {{ end }}
+ {{ partial "site-manifest.html" . }}
+ {{- partial "head-additions.html" . -}}
+ {{- template "_internal/opengraph.html" . -}}
+ {{- template "_internal/schema.html" . -}}
+ {{- template "_internal/twitter_cards.html" . -}}
-
+ {{ if eq (getenv "HUGO_ENV") "production" | or (eq .Site.Params.env "production") }}
+ {{ partial "gtag" . }}
+ {{ end }}
- </head>
- <body class="ma0 sans-serif bg-primary-color-light{{ with getenv "HUGO_ENV" }} {{ . }}{{ end }}">
- {{ block "nav" . }}{{ partial "site-nav.html" . }}{{ end }}
- {{ block "header" . }}{{ end }}
- <main role="main" class="content-with-sidebar min-vh-100 pb7 pb0-ns">
- {{ block "main" . }}{{ end }}
- </main>
- {{ block "footer" . }}{{ partialCached "site-footer.html" . }}{{ end }}
-
- </body>
-</html>
+
+</head>
+
+<body class="ma0 sans-serif bg-primary-color-light{{ with getenv "HUGO_ENV" }} {{ . }}{{ end }}">
+ {{ block "nav" . }}{{ partial "site-nav.html" . }}{{ end }}
+ {{ block "header" . }}{{ end }}
+ <main role="main" class="content-with-sidebar min-vh-100 pb7 pb0-ns">
+ {{ block "main" . }}{{ end }}
+ </main>
+
+ {{ block "footer" . }}{{ partialCached "site-footer.html" . }}{{ end }}
+
+
+</body>
+
+</html>
\ No newline at end of file
--- a/docs/content/en/content-management/build-options.md
+++ b/docs/content/en/content-management/build-options.md
@@ -105,4 +105,4 @@
{{ .Content }}
</blockquote>
{{ end }}
-</section>
\ No newline at end of file
+</section>
--- a/docs/content/en/content-management/comments.md
+++ b/docs/content/en/content-management/comments.md
@@ -51,7 +51,7 @@
There are a few alternatives to commenting on static sites for those who do not want to use Disqus:
-* [Static Man](https://staticman.net/)
+* [Staticman](https://staticman.net/)
* [Talkyard](https://www.talkyard.io/blog-comments) (Open source, & serverless hosting)
* [IntenseDebate](https://intensedebate.com/)
* [Graph Comment][]
@@ -58,7 +58,7 @@
* [Muut](https://muut.com/)
* [isso](https://posativ.org/isso/) (Self-hosted, Python)
* [Tutorial on Implementing Isso with Hugo][issotutorial]
-* [Utterances](https://utteranc.es/) (Open source, Github comments widget built on Github issues)
+* [Utterances](https://utteranc.es/) (Open source, GitHub comments widget built on GitHub issues)
* [Remark](https://github.com/umputun/remark) (Open source, Golang, Easy to run docker)
* [Commento](https://commento.io/) (Open Source, available as a service, local install, or docker image)
* [JustComments](https://just-comments.com) (Open Source, available as a service, can be self-hosted)
--- a/docs/content/en/content-management/image-processing/index.md
+++ b/docs/content/en/content-management/image-processing/index.md
@@ -4,7 +4,7 @@
date: 2018-01-24T13:10:00-05:00
linktitle: "Image Processing"
categories: ["content management"]
-keywords: [resources,images]
+keywords: [resources, images]
weight: 4004
draft: false
toc: true
@@ -28,7 +28,6 @@
## Image Processing Methods
-
The `image` resource implements the methods `Resize`, `Fit` and `Fill`, each returning the transformed image using the specified dimensions and processing options. The `image` resource also, since Hugo 0.58, implements the method `Exif` and `Filter`.
### Resize
@@ -37,10 +36,10 @@
```go
// Resize to a width of 600px and preserve ratio
-{{ $image := $resource.Resize "600x" }}
+{{ $image := $resource.Resize "600x" }}
// Resize to a height of 400px and preserve ratio
-{{ $image := $resource.Resize "x400" }}
+{{ $image := $resource.Resize "x400" }}
// Resize to a width 600px and a height of 400px
{{ $image := $resource.Resize "600x400" }}
@@ -47,17 +46,19 @@
```
### Fit
+
Scale down the image to fit the given dimensions while maintaining aspect ratio. Both height and width are required.
```go
-{{ $image := $resource.Fit "600x400" }}
+{{ $image := $resource.Fit "600x400" }}
```
### Fill
+
Resize and crop the image to match the given dimensions. Both height and width are required.
```go
-{{ $image := $resource.Fill "600x400" }}
+{{ $image := $resource.Fill "600x400" }}
```
### Filter
@@ -74,7 +75,7 @@
{{ $img = $img | images.Filter (images.GaussianBlur 6) (images.Pixelate 8) }}
```
-The filters will be applied in the given order.
+The filters will be applied in the given order.
Sometimes it can be useful to create the filter chain once and then reuse it:
@@ -94,7 +95,7 @@
{{ with $img.Exif }}
Date: {{ .Date }}
Lat/Long: {{ .Lat}}/{{ .Long }}
-Tags:
+Tags:
{{ range $k, $v := .Tags }}
TAG: {{ $k }}: {{ $v }}
{{ end }}
@@ -104,14 +105,22 @@
Or individually access EXIF data with dot access, e.g.:
```go-html-template
-{{ with $img.Exif }}
-Date: {{ .Date }}
-Lat/Long: {{ .Lat }}/{{ .Long }}
-Aperture: {{ .Tags.ApertureValue }}
-Focal Length: {{ .Tags.FocalLength }}
+{{ with $src.Exif }}
+ <ul>
+ {{ with .Date }}<li>Date: {{ .Format "January 02, 2006" }}</li>{{ end }}
+ {{ with .Tags.ApertureValue }}<li>Aperture: {{ lang.NumFmt 2 . }}</li>{{ end }}
+ {{ with .Tags.BrightnessValue }}<li>Brightness: {{ lang.NumFmt 2 . }}</li>{{ end }}
+ {{ with .Tags.ExposureTime }}<li>Exposure Time: {{ . }}</li>{{ end }}
+ {{ with .Tags.FNumber }}<li>F Number: {{ . }}</li>{{ end }}
+ {{ with .Tags.FocalLength }}<li>Focal Length: {{ . }}</li>{{ end }}
+ {{ with .Tags.ISOSpeedRatings }}<li>ISO Speed Ratings: {{ . }}</li>{{ end }}
+ {{ with .Tags.LensModel }}<li>Lens Model: {{ . }}</li>{{ end }}
+ </ul>
{{ end }}
```
+Some fields may need to be formatted with [`lang.NumFmt`]({{< relref "functions/numfmt" >}}) function to prevent display like `Aperture: 2.278934289` instead of `Aperture: 2.28`.
+
#### Exif fields
Date
@@ -125,10 +134,6 @@
See [Image Processing Config](#image-processing-config) for how to configure what gets included in Exif.
-
-
-
-
## Image Processing Options
In addition to the dimensions (e.g. `600x400`), Hugo supports a set of additional image options.
@@ -148,6 +153,7 @@
**Note** that you also set a default background color to use, see [Image Processing Config](#image-processing-config).
### JPEG Quality
+
Only relevant for JPEG images, values 1 to 100 inclusive, higher is better. Default is 75.
```go
@@ -155,6 +161,7 @@
```
### Rotate
+
Rotates an image by the given angle counter-clockwise. The rotation will be performed first to get the dimensions correct. The main use of this is to be able to manually correct for [EXIF orientation](https://github.com/golang/go/issues/4341) of JPEG images.
```go
@@ -161,8 +168,9 @@
{{ $image.Resize "600x r90" }}
```
-### Anchor
-Only relevant for the `Fill` method. This is useful for thumbnail generation where the main motive is located in, say, the left corner.
+### Anchor
+
+Only relevant for the `Fill` method. This is useful for thumbnail generation where the main motive is located in, say, the left corner.
Valid are `Center`, `TopLeft`, `Top`, `TopRight`, `Left`, `Right`, `BottomLeft`, `Bottom`, `BottomRight`.
```go
@@ -170,11 +178,12 @@
```
### Resample Filter
-Filter used in resizing. Default is `Box`, a simple and fast resampling filter appropriate for downscaling.
+Filter used in resizing. Default is `Box`, a simple and fast resampling filter appropriate for downscaling.
+
Examples are: `Box`, `NearestNeighbor`, `Linear`, `Gaussian`.
-See https://github.com/disintegration/imaging for more. If you want to trade quality for faster processing, this may be a option to test.
+See https://github.com/disintegration/imaging for more. If you want to trade quality for faster processing, this may be a option to test.
```go
{{ $image.Resize "600x400 Gaussian" }}
@@ -194,7 +203,6 @@
_The photo of the sunset used in the examples below is Copyright [Bjørn Erik Pedersen](https://commons.wikimedia.org/wiki/User:Bep) (Creative Commons Attribution-Share Alike 4.0 International license)_
-
{{< imgproc sunset Resize "300x" />}}
{{< imgproc sunset Fill "90x120 left" />}}
@@ -205,12 +213,10 @@
{{< imgproc sunset Resize "300x q10" />}}
-
This is the shortcode used in the examples above:
-
{{< code file="layouts/shortcodes/imgproc.html" >}}
-{{< readfile file="layouts/shortcodes/imgproc.html" >}}
+{{< readfile file="layouts/shortcodes/imgproc.html" >}}
{{< /code >}}
And it is used like this:
@@ -219,7 +225,6 @@
{{</* imgproc sunset Resize "300x" /*/>}}
```
-
{{% note %}}
**Tip:** Note the self-closing shortcode syntax above. The `imgproc` shortcode can be called both with and without **inner content**.
{{% /note %}}
@@ -244,7 +249,7 @@
# Valid values are Smart, Center, TopLeft, Top, TopRight, Left, Right, BottomLeft, Bottom, BottomRight
anchor = "smart"
-# Default background color.
+# Default background color.
# Hugo will preserve transparency for target formats that supports it,
# but will fall back to this color for JPEG.
# Expects a standard HEX color string with 3 or 6 digits.
@@ -281,15 +286,13 @@
An example using the sunset image from above:
-
{{< imgproc sunset Fill "200x200 smart" />}}
-
## Image Processing Performance Consideration
Processed images are stored below `<project-dir>/resources` (can be set with `resourceDir` config setting). This folder is deliberately placed in the project, as it is recommended to check these into source control as part of the project. These images are not "Hugo fast" to generate, but once generated they can be reused.
-If you change your image settings (e.g. size), remove or rename images etc., you will end up with unused images taking up space and cluttering your project.
+If you change your image settings (e.g. size), remove or rename images etc., you will end up with unused images taking up space and cluttering your project.
To clean up, run:
@@ -297,10 +300,6 @@
hugo --gc
```
-
{{% note %}}
**GC** is short for **Garbage Collection**.
{{% /note %}}
-
-
-
--- a/docs/content/en/functions/where.md
+++ b/docs/content/en/functions/where.md
@@ -114,7 +114,7 @@
## Use `where` with `first`
-Using `first` and [`where`][wherefunction] together can be very
+Using `first` and `where` together can be very
powerful. Below snippet gets a list of posts only from [**main
sections**](#mainsections), sorts it using the [default
ordering](/templates/lists/) for lists (i.e., `weight => date`), and
--- a/docs/content/en/getting-started/configuration.md
+++ b/docs/content/en/getting-started/configuration.md
@@ -515,7 +515,7 @@
maxAge = -1
```
-You can override any of these cache setting in your own `config.toml`.
+You can override any of these cache settings in your own `config.toml`.
### The keywords explained
--- a/docs/content/en/getting-started/directory-structure.md
+++ b/docs/content/en/getting-started/directory-structure.md
@@ -71,6 +71,9 @@
From **Hugo 0.31** you can have multiple static directories.
{{% /note %}}
+resources
+: Caches some files to speed up generation. Can be also used by template authors to distribute built SASS files, so you don't have to have the preprocessor installed. Note: resources directory is not created by default.
+
[archetypes]: /content-management/archetypes/
[configuration directives]: /getting-started/configuration/#all-variables-yaml
binary files /dev/null b/docs/content/en/news/0.68.0-relnotes/hugo-68-featured.png differ
--- a/docs/content/en/news/0.68.0-relnotes/index.md
+++ b/docs/content/en/news/0.68.0-relnotes/index.md
@@ -1,8 +1,8 @@
---
date: 2020-03-21
-title: "0.68.0"
-description: "0.68.0"
+title: "Minify config and more!"
+description: "Hugo 0.68.0 brings minify configuration and fully navigable headless sections."
categories: ["Releases"]
---
--- a/docs/content/en/news/0.68.1-relnotes/index.md
+++ b/docs/content/en/news/0.68.1-relnotes/index.md
@@ -1,8 +1,8 @@
---
date: 2020-03-22
-title: "Hugo 0.68.1: A couple of Bug Fixes"
-description: "This version fixes a couple of bugs introduced in 0.68.0."
+title: "Hugo 0.68.1: 1 bug fix"
+description: "This release reverts a change in resources.ExecuteAsTemplate that broke some theme demos."
categories: ["Releases"]
images:
- images/blog/hugo-bug-poster.png
--- a/docs/content/en/news/0.68.2-relnotes/index.md
+++ b/docs/content/en/news/0.68.2-relnotes/index.md
@@ -1,6 +1,6 @@
---
-date: 2020-03-24
+date: 2020-03-24T12:00:00-05:00
title: "Hugo 0.68.2: A couple of Bug Fixes"
description: "This version fixes a couple of bugs introduced in 0.68.0."
categories: ["Releases"]
--- a/docs/content/en/news/0.68.3-relnotes/index.md
+++ b/docs/content/en/news/0.68.3-relnotes/index.md
@@ -1,6 +1,6 @@
---
-date: 2020-03-24
+date: 2020-03-24T13:00:00-05:00
title: "Hugo 0.68.3: A couple of Bug Fixes"
description: "This version fixes a couple of bugs introduced in 0.68.0."
categories: ["Releases"]
--- a/docs/go.mod
+++ b/docs/go.mod
@@ -2,4 +2,4 @@
go 1.12
-require github.com/gohugoio/gohugoioTheme v0.0.0-20200128164921-1d0bc5482051 // indirect
+require github.com/gohugoio/gohugoioTheme v0.0.0-20200328100657-2bfd5f8c6aee // indirect
--- a/docs/go.sum
+++ b/docs/go.sum
@@ -11,3 +11,9 @@
github.com/gohugoio/gohugoioTheme v0.0.0-20200123205007-5d6620a0db26/go.mod h1:kpw3SS48xZvLQGEXKu8u5XHgXkPvL8DX3oGa07+z8Bs=
github.com/gohugoio/gohugoioTheme v0.0.0-20200128164921-1d0bc5482051 h1:cS14MnUGS6xwWYfPNshimm8HdMCZiYBxWkCD0VnvgVw=
github.com/gohugoio/gohugoioTheme v0.0.0-20200128164921-1d0bc5482051/go.mod h1:kpw3SS48xZvLQGEXKu8u5XHgXkPvL8DX3oGa07+z8Bs=
+github.com/gohugoio/gohugoioTheme v0.0.0-20200327225449-368f4cbef8d7 h1:cZ+ahAjSetbFv3aDJ9ipDbKyqaVlmkbSZ5cULgBTh+w=
+github.com/gohugoio/gohugoioTheme v0.0.0-20200327225449-368f4cbef8d7/go.mod h1:kpw3SS48xZvLQGEXKu8u5XHgXkPvL8DX3oGa07+z8Bs=
+github.com/gohugoio/gohugoioTheme v0.0.0-20200327231942-7f80b3d02bfa h1:kG+O/wT9UXomzp5eQiUuFVZ0l7YylAW6EVPLyjMxi/c=
+github.com/gohugoio/gohugoioTheme v0.0.0-20200327231942-7f80b3d02bfa/go.mod h1:kpw3SS48xZvLQGEXKu8u5XHgXkPvL8DX3oGa07+z8Bs=
+github.com/gohugoio/gohugoioTheme v0.0.0-20200328100657-2bfd5f8c6aee h1:PJZhCwnuVLyafDWNPSHk9iJvk6gEIvPRnycy7Pq3peA=
+github.com/gohugoio/gohugoioTheme v0.0.0-20200328100657-2bfd5f8c6aee/go.mod h1:kpw3SS48xZvLQGEXKu8u5XHgXkPvL8DX3oGa07+z8Bs=
--- a/docs/netlify.toml
+++ b/docs/netlify.toml
@@ -3,7 +3,7 @@
command = "hugo --gc --minify"
[context.production.environment]
-HUGO_VERSION = "0.67.1"
+HUGO_VERSION = "0.68.3"
HUGO_ENV = "production"
HUGO_ENABLEGITINFO = "true"
@@ -11,7 +11,7 @@
command = "hugo --gc --minify --enableGitInfo"
[context.split1.environment]
-HUGO_VERSION = "0.67.1"
+HUGO_VERSION = "0.68.3"
HUGO_ENV = "production"
[context.deploy-preview]
@@ -18,13 +18,13 @@
command = "hugo --gc --minify --buildFuture -b $DEPLOY_PRIME_URL"
[context.deploy-preview.environment]
-HUGO_VERSION = "0.67.1"
+HUGO_VERSION = "0.68.3"
[context.branch-deploy]
command = "hugo --gc --minify -b $DEPLOY_PRIME_URL"
[context.branch-deploy.environment]
-HUGO_VERSION = "0.67.1"
+HUGO_VERSION = "0.68.3"
[context.next.environment]
HUGO_ENABLEGITINFO = "true"
binary files /dev/null b/docs/resources/_gen/images/news/0.68.0-relnotes/hugo-68-featured_hubf411be7de0d7016f242fc7f0c46d71c_65337_480x0_resize_catmullrom_2.png differ
binary files /dev/null b/docs/resources/_gen/images/news/0.68.0-relnotes/hugo-68-featured_hubf411be7de0d7016f242fc7f0c46d71c_65337_640x0_resize_catmullrom_2.png differ