From 81689af79901f0cdaff765cda6322dd4a9a7ccb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Sun, 21 Mar 2021 13:31:17 +0100 Subject: [PATCH] Squashed 'docs/' changes from bb15e9804..9cece6640 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 9cece6640 Function sort: fix example labels (#1344) 84444120f Revert "Fix sample data for sort function (#1363)" (#1364) 05c8619f4 Fix sample data for sort function (#1363) 2beb1c0ed Fix "Configure taxonomies" title (#1361) cd777b9fb Fix sitemap configuration link (#1360) 52251fb42 Update the 'Customize Dates' example to not error (#1357) 1a14cc08a Update quick-start.md 17bb98a94 Add note about image metadata removal ec4f7bfff Update 404.md cebfb7a90 explaination that `weight` key is used for sorting 83190ff12 fix typo: "advance settings" → "advanced settings" 75743968c Update quick-start.md f1c64cd5a Improved documentation. 8af3b236c Update theme git-subtree-dir: docs git-subtree-split: 9cece6640095a21673a730201466ea636d2f8ded --- .../gohugoio/gohugoioTheme/data/sponsors.toml | 14 +++--- .../layouts/_default/baseof.html | 7 ++- .../layouts/_default/single.html | 48 +++++++++---------- .../gohugoioTheme/layouts/partials/gtag.html | 2 +- .../home-page-sections/installation.html | 3 +- .../partials/home-page-sections/sponsors.html | 4 +- .../gohugoioTheme/layouts/showcase/list.html | 2 +- .../gohugoio/gohugoioTheme/package.json | 43 +++++++++++++++++ .../static/images/sponsors/brave-logo.svg | 1 + _vendor/modules.txt | 2 +- .../image-processing/index.md | 8 +++- content/en/content-management/multilingual.md | 3 +- content/en/content-management/taxonomies.md | 2 +- content/en/functions/intersect.md | 2 +- content/en/functions/sort.md | 28 +++++------ content/en/getting-started/configuration.md | 2 +- content/en/getting-started/quick-start.md | 2 +- .../hosting-on-github.md | 2 +- content/en/templates/404.md | 2 +- content/en/variables/menus.md | 7 +-- go.mod | 2 +- go.sum | 2 + 22 files changed, 121 insertions(+), 67 deletions(-) create mode 100644 _vendor/github.com/gohugoio/gohugoioTheme/package.json create mode 100644 _vendor/github.com/gohugoio/gohugoioTheme/static/images/sponsors/brave-logo.svg diff --git a/_vendor/github.com/gohugoio/gohugoioTheme/data/sponsors.toml b/_vendor/github.com/gohugoio/gohugoioTheme/data/sponsors.toml index 9261ffc78..0940da6d7 100644 --- a/_vendor/github.com/gohugoio/gohugoioTheme/data/sponsors.toml +++ b/_vendor/github.com/gohugoio/gohugoioTheme/data/sponsors.toml @@ -1,9 +1,3 @@ -[[banners]] -name = "Forestry.io" -link = "https://forestry.io/" -logo = "/images/sponsors/forestry-logotype.svg" -copy = "" - [[banners]] name = "Linode" link = "https://www.linode.com/" @@ -14,4 +8,12 @@ copy = "" name = "eSolia" link = "https://esolia.com/post/why-did-esolia-choose-hugo/" logo = "/images/sponsors/esolia-logo.svg" +copy = "" + + +[[banners]] +name = "Brave" +link = "https://brave.com/" +logo = "/images/sponsors/brave-logo.svg" +bgcolor = "#5A2FA1" copy = "" \ No newline at end of file diff --git a/_vendor/github.com/gohugoio/gohugoioTheme/layouts/_default/baseof.html b/_vendor/github.com/gohugoio/gohugoioTheme/layouts/_default/baseof.html index a83d3f662..0de21a255 100644 --- a/_vendor/github.com/gohugoio/gohugoioTheme/layouts/_default/baseof.html +++ b/_vendor/github.com/gohugoio/gohugoioTheme/layouts/_default/baseof.html @@ -39,6 +39,8 @@ {{ $.Scratch.Set "stylesheet" . }} {{end}} + {{ block "scripts" . }} {{- partial "site-scripts.html" . -}} @@ -53,9 +55,6 @@ {{ partial "gtag" . }} {{ end }} - - - @@ -69,4 +68,4 @@ - \ No newline at end of file + diff --git a/_vendor/github.com/gohugoio/gohugoioTheme/layouts/_default/single.html b/_vendor/github.com/gohugoio/gohugoioTheme/layouts/_default/single.html index 48c015c51..8cd289624 100644 --- a/_vendor/github.com/gohugoio/gohugoioTheme/layouts/_default/single.html +++ b/_vendor/github.com/gohugoio/gohugoioTheme/layouts/_default/single.html @@ -1,31 +1,31 @@ {{ define "main" }} -
-
+
+
-
+
{{- partial "toc.html" . -}} -
- -
-
-
-
- {{ .Render "page" }} - {{ partial "related.html" . }}
-
-
- {{ partial "nav-links-docs.html" . }} -
-
-
+
+
+
+
+ {{ .Render "page" }} + {{ partial "related.html" . }} +
+
+
+ {{ partial "nav-links-docs.html" . }} +
-
-
- {{ partial "docs/page-meta-data.html" . }} - {{ partial "page-edit.html" . }} - {{ partial "tags.html" . }} +
+
+ +
+
+ {{ partial "docs/page-meta-data.html" . }} + {{ partial "page-edit.html" . }} + {{ partial "tags.html" . }} +
- -{{ end }} \ No newline at end of file +{{ end }} diff --git a/_vendor/github.com/gohugoio/gohugoioTheme/layouts/partials/gtag.html b/_vendor/github.com/gohugoio/gohugoioTheme/layouts/partials/gtag.html index 2cedc384a..fe9f4d2aa 100644 --- a/_vendor/github.com/gohugoio/gohugoioTheme/layouts/partials/gtag.html +++ b/_vendor/github.com/gohugoio/gohugoioTheme/layouts/partials/gtag.html @@ -6,7 +6,7 @@ gtag('js', new Date()); {{ $site := $.Site.BaseURL | replaceRE "^https?://(www\\.)?([^/]+).*" "$2" }} - gtag('config', '{{ . }}', {'dimension1': '{{ $site }}', 'dimension2': '{{ getenv "BRANCH" }}'}); + gtag('config', '{{ . }}', {'anonymize_ip': true, 'dimension1': '{{ $site }}', 'dimension2': '{{ getenv "BRANCH" }}'}); /** * Function that tracks a click on an outbound link in Analytics. diff --git a/_vendor/github.com/gohugoio/gohugoioTheme/layouts/partials/home-page-sections/installation.html b/_vendor/github.com/gohugoio/gohugoioTheme/layouts/partials/home-page-sections/installation.html index 4bea1a54a..a23cae11d 100644 --- a/_vendor/github.com/gohugoio/gohugoioTheme/layouts/partials/home-page-sections/installation.html +++ b/_vendor/github.com/gohugoio/gohugoioTheme/layouts/partials/home-page-sections/installation.html @@ -14,7 +14,7 @@
Hugo Gopher
-

Mac OS

+

macOS

$ brew install hugo
@@ -35,5 +35,4 @@ - diff --git a/_vendor/github.com/gohugoio/gohugoioTheme/layouts/partials/home-page-sections/sponsors.html b/_vendor/github.com/gohugoio/gohugoioTheme/layouts/partials/home-page-sections/sponsors.html index f9f5ec588..a808655a6 100644 --- a/_vendor/github.com/gohugoio/gohugoioTheme/layouts/partials/home-page-sections/sponsors.html +++ b/_vendor/github.com/gohugoio/gohugoioTheme/layouts/partials/home-page-sections/sponsors.html @@ -1,4 +1,4 @@ -{{$classes_box := "ba b--light-gray bg-light-gray br3 flex flex-column flex-wrap items-center justify-center ph3 pv4 mb4 w-100 w-30-l "}} +{{$classes_box := "ba b--dark-gray bg-light-gray br3 flex flex-column flex-wrap items-center justify-center ph3 pv4 mb4 w-100 w-30-l "}} {{$gtag := .gtag | default "unknown" }} {{ with .cx.Site.Data.sponsors }}
@@ -8,7 +8,7 @@ {{ range .banners }} {{ $banner := . }} {{if .logo}} -
+
{{with .link -}} {{ $url := printf "%s?%s" . (querify "utm_source" "homepage" "utm_medium" "banner" "utm_campaign" "hugosponsor") | safeURL }} {{ if eq (getenv "HUGO_ENV") "production" | or (eq $.cx.Site.Params.env "production") }} diff --git a/_vendor/github.com/gohugoio/gohugoioTheme/layouts/showcase/list.html b/_vendor/github.com/gohugoio/gohugoioTheme/layouts/showcase/list.html index b0083fc0f..bff52ad8d 100644 --- a/_vendor/github.com/gohugoio/gohugoioTheme/layouts/showcase/list.html +++ b/_vendor/github.com/gohugoio/gohugoioTheme/layouts/showcase/list.html @@ -17,7 +17,7 @@ {{/* pagination.html: https://github.com/gohugoio/hugo/blob/master/tpl/tplimpl/template_embedded.go#L117 */}} {{ template "_internal/pagination.html" . }}
-
The Showcase articles are copyright the content authors. Any open source license will be attached.
+
The Showcase articles are copyrighted by their respective content authors. Any open source license will be attached.
{{ end }} diff --git a/_vendor/github.com/gohugoio/gohugoioTheme/package.json b/_vendor/github.com/gohugoio/gohugoioTheme/package.json new file mode 100644 index 000000000..daffbc0f0 --- /dev/null +++ b/_vendor/github.com/gohugoio/gohugoioTheme/package.json @@ -0,0 +1,43 @@ +{ + "name": "gohugo-default-styles", + "version": "1.1.0", + "description": "Default Theme for Hugo Sites", + "main": "index.js", + "homepage": "https://gohugo.io/", + "bugs": { + "url": "https://github.com/gohugoio/gohugoioTheme/issues" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/gohugoio/gohugoioTheme.git" + }, + "author": "budparr", + "license": "MIT", + "scripts": { + "build": "NODE_ENV=production webpack", + "build-dev": "NODE_ENV=development webpack --progress --watch", + "start": "npm run build-dev" + }, + "devDependencies": { + "clean-webpack-plugin": "^1.0.0", + "clipboard": "^2.0.4", + "css-loader": "^4.3.0", + "docsearch.js": "^2.6.1", + "file-loader": "^2.0.0", + "glob-all": "^3.1.0", + "highlight.js": "^9.13.1", + "lazysizes": "^5.2.1", + "mini-css-extract-plugin": "^0.4.4", + "postcss": "^7.0.32", + "postcss-cssnext": "^3.1.0", + "postcss-import": "^12.0.1", + "postcss-loader": "^3.0.0", + "purgecss-webpack-plugin": "^1.3.1", + "scrolldir": "^1.4.0", + "tachyons": "^4.7.0", + "typeface-muli": "0.0.54", + "webpack": "^4.44.1", + "webpack-command": "^0.4.2" + }, + "dependencies": {} +} diff --git a/_vendor/github.com/gohugoio/gohugoioTheme/static/images/sponsors/brave-logo.svg b/_vendor/github.com/gohugoio/gohugoioTheme/static/images/sponsors/brave-logo.svg new file mode 100644 index 000000000..27cdd974d --- /dev/null +++ b/_vendor/github.com/gohugoio/gohugoioTheme/static/images/sponsors/brave-logo.svg @@ -0,0 +1 @@ +brave_logo_2color_reversed \ No newline at end of file diff --git a/_vendor/modules.txt b/_vendor/modules.txt index 200400694..d3402db0b 100644 --- a/_vendor/modules.txt +++ b/_vendor/modules.txt @@ -1 +1 @@ -# github.com/gohugoio/gohugoioTheme v0.0.0-20200711112515-b0dfe471654f +# github.com/gohugoio/gohugoioTheme v0.0.0-20210301124928-2c15837dfec3 diff --git a/content/en/content-management/image-processing/index.md b/content/en/content-management/image-processing/index.md index ebd3362dc..a432b9851 100644 --- a/content/en/content-management/image-processing/index.md +++ b/content/en/content-management/image-processing/index.md @@ -33,11 +33,17 @@ To print all images paths in a [Page Bundle]({{< relref "/content-management/org The `image` resource can also be retrieved from a [global resource]({{< relref "/hugo-pipes/introduction#from-file-to-resource" >}}) +```go-html-template {{- $image := resources.Get "images/logo.jpg" -}} +``` ## 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`. +The `image` resource implements the `Resize`, `Fit`, `Fill`, and `Filter` methods, each returning a transformed image using the specified dimensions and processing options. + +{{% note %}} +Metadata (EXIF, IPTC, XMP, etc.) is not preserved during image transformation. Use the [`Exif`](#exif) method with the _original_ image to extract EXIF metadata from JPEG or TIFF images. +{{% /note %}} ### Resize diff --git a/content/en/content-management/multilingual.md b/content/en/content-management/multilingual.md index e24c573c2..28bf6ab06 100644 --- a/content/en/content-management/multilingual.md +++ b/content/en/content-management/multilingual.md @@ -421,13 +421,14 @@ At the time of this writing, Go does not yet have support for internationalized ...then index the non-English date names in your templates like so: ~~~html -