From 2d6aa1051333ac6081cd266479039b2df8fc6b84 Mon Sep 17 00:00:00 2001 From: Juraj Hilje Date: Wed, 21 Feb 2024 20:05:07 +0100 Subject: [PATCH 1/3] vendor: update Hugo to v0.79.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a4a9951cf..793238b57 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ RUN apt-get update \ && apt-get install -y nodejs \ && apt-get update \ && npm install --global yarn \ - && curl -L https://github.com/gohugoio/hugo/releases/download/v0.76.3/hugo_0.76.3_Linux-64bit.deb -o /tmp/hugo.deb \ + && curl -L https://github.com/gohugoio/hugo/releases/download/v0.79.1/hugo_0.79.1_Linux-64bit.deb -o /tmp/hugo.deb \ && dpkg -i /tmp/hugo.deb \ && rm /tmp/hugo.deb From 65a96988a4edd3ac969132a38fcac4bc98ea1f5a Mon Sep 17 00:00:00 2001 From: Natanael Rodriguez Ramos Date: Thu, 25 Apr 2024 10:10:11 +0100 Subject: [PATCH 2/3] vendor: update Hugo to v0.125.3 and nodejs to v16 --- Dockerfile | 4 ++-- src/config/_default/config.toml | 2 +- src/themes/ivpn-v3/layouts/blog/single.html | 20 +++++++++---------- src/themes/ivpn-v3/layouts/pages/guides.html | 6 +++--- .../ivpn-v3/layouts/pages/help-details.html | 2 +- src/themes/ivpn-v3/layouts/pages/help.html | 2 +- .../ivpn-v3/layouts/pages/setup-article.html | 2 +- .../ivpn-v3/layouts/pages/setup-list.html | 2 +- .../layouts/partials/blog-article.html | 10 +++++----- .../layouts/partials/blog-categories.html | 2 +- .../layouts/partials/blog-side-bar.html | 8 ++++---- 11 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Dockerfile b/Dockerfile index 793238b57..3a7ceacf7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,11 +10,11 @@ WORKDIR /opt/build # Install nodejs, yarn and hugo RUN apt-get update \ && apt-get install -y gnupg gnupg2 gnupg1 \ - && curl -sL https://deb.nodesource.com/setup_15.x | bash - \ + && curl -sL https://deb.nodesource.com/setup_16.x | bash - \ && apt-get install -y nodejs \ && apt-get update \ && npm install --global yarn \ - && curl -L https://github.com/gohugoio/hugo/releases/download/v0.79.1/hugo_0.79.1_Linux-64bit.deb -o /tmp/hugo.deb \ + && curl -L https://github.com/gohugoio/hugo/releases/download/v0.125.3/hugo_0.125.3_linux-amd64.deb -o /tmp/hugo.deb \ && dpkg -i /tmp/hugo.deb \ && rm /tmp/hugo.deb diff --git a/src/config/_default/config.toml b/src/config/_default/config.toml index 3fae752c0..70d21ec26 100644 --- a/src/config/_default/config.toml +++ b/src/config/_default/config.toml @@ -4,7 +4,7 @@ title = "IVPN" theme = "ivpn-v3" paginate = 8 summaryLength = 35 -disableKinds = ["sitemap", "taxonomyTerm"] +disableKinds = ["sitemap", "taxonomy"] [markup.goldmark.renderer] unsafe= true diff --git a/src/themes/ivpn-v3/layouts/blog/single.html b/src/themes/ivpn-v3/layouts/blog/single.html index 2a287e445..d1de383c8 100644 --- a/src/themes/ivpn-v3/layouts/blog/single.html +++ b/src/themes/ivpn-v3/layouts/blog/single.html @@ -1,19 +1,19 @@ {{ define "main" }}
- IVPN Blog>{{ range .Params.categories }}{{ with ($.Site.GetPage (printf "/categories/%s" (. | urlize))) }}{{ .Title }}{{ end }}{{ end }}>{{ .Title }} + IVPN Blog>{{ range .Params.categories }}{{ with ($.Site.GetPage (printf "/categories/%s" (. | urlize))) }}{{ .Title }}{{ end }}{{ end }}>{{ .Title }}

{{ .Title }}

{{ range .Params.categories }} {{ with ($.Site.GetPage (printf "/categories/%s" (. | urlize))) }} - {{ .Title }} + {{ .Title }} {{ end }} {{ end }} {{ range .Params.authors }} {{ with ($.Site.GetPage (printf "/authors/%s" (. | urlize))) }} - By {{ .Title }} | + By {{ .Title }} | {{ end }} {{ end }} Posted on {{ .Date.Format "January 2, 2006"}} @@ -68,14 +68,14 @@

{{ len .Params.comments }} Comments

{{ range .Params.categories }} {{ with ($.Site.GetPage (printf "/categories/%s" (. | urlize))) }} - {{ .Title }} + {{ .Title }} {{ end }} {{ end }} -

{{ .Page.Title }}

+

{{ .Page.Title }}

{{ range .Params.authors }} {{ with ($.Site.GetPage (printf "/authors/%s" (. | urlize))) }} - By {{ .Title }} + By {{ .Title }} {{ end }} {{ end }}

@@ -93,22 +93,22 @@

{{ .Page.Title }}

{{ if .Params.thumbnailImage }} - + {{ .Title }} {{ end }} {{ range .Params.categories }} {{ with ($.Site.GetPage (printf "/categories/%s" (. | urlize))) }} - {{ .Title }} + {{ .Title }} {{ end }} {{ end }}
-

{{ .Page.Title }}

+

{{ .Page.Title }}

Posted on {{ .Date.Format "January 2, 2006"}} by {{ range .Params.authors }} {{ with ($.Site.GetPage (printf "/authors/%s" (. | urlize))) }} - {{ .Title }} + {{ .Title }} {{ end }} {{ end }}

diff --git a/src/themes/ivpn-v3/layouts/pages/guides.html b/src/themes/ivpn-v3/layouts/pages/guides.html index 0b394d641..b3ec34327 100644 --- a/src/themes/ivpn-v3/layouts/pages/guides.html +++ b/src/themes/ivpn-v3/layouts/pages/guides.html @@ -5,7 +5,7 @@

Get started

{{ range where .Pages "Params.section" "Basic" }} - + {{ .Title }} Read more @@ -14,7 +14,7 @@

Get started

Advanced Privacy and Anonymity

{{ range where .Pages "Params.section" "Advanced" }} - + {{ .Title }} Read more @@ -23,7 +23,7 @@

Advanced Privacy and Anonymity

Misc

{{ range where .Pages "Params.section" "Misc" }} - + {{ .Title }} Read more diff --git a/src/themes/ivpn-v3/layouts/pages/help-details.html b/src/themes/ivpn-v3/layouts/pages/help-details.html index 9e0540cce..2840baf37 100644 --- a/src/themes/ivpn-v3/layouts/pages/help-details.html +++ b/src/themes/ivpn-v3/layouts/pages/help-details.html @@ -34,7 +34,7 @@

Related Articles

{{ if isset .Params "h1" }} {{ if not (in .Params.h1 $pageH1) }}
  • - {{ .Params.h1 }} + {{ .Params.h1 }}
    • {{ end }} {{ end }} diff --git a/src/themes/ivpn-v3/layouts/pages/help.html b/src/themes/ivpn-v3/layouts/pages/help.html index 0b6efd439..32b71a062 100644 --- a/src/themes/ivpn-v3/layouts/pages/help.html +++ b/src/themes/ivpn-v3/layouts/pages/help.html @@ -28,7 +28,7 @@

    Help Center

    diff --git a/src/themes/ivpn-v3/layouts/pages/setup-article.html b/src/themes/ivpn-v3/layouts/pages/setup-article.html index 3bcd4e286..f89b9825b 100644 --- a/src/themes/ivpn-v3/layouts/pages/setup-article.html +++ b/src/themes/ivpn-v3/layouts/pages/setup-article.html @@ -7,7 +7,7 @@

    {{ .Params.section }}

    diff --git a/src/themes/ivpn-v3/layouts/pages/setup-list.html b/src/themes/ivpn-v3/layouts/pages/setup-list.html index 1351e605d..c54736be1 100644 --- a/src/themes/ivpn-v3/layouts/pages/setup-list.html +++ b/src/themes/ivpn-v3/layouts/pages/setup-list.html @@ -6,7 +6,7 @@

    {{ .Params.section }}

    diff --git a/src/themes/ivpn-v3/layouts/partials/blog-article.html b/src/themes/ivpn-v3/layouts/partials/blog-article.html index b46d898a2..a716aed38 100644 --- a/src/themes/ivpn-v3/layouts/partials/blog-article.html +++ b/src/themes/ivpn-v3/layouts/partials/blog-article.html @@ -1,5 +1,5 @@
    - + {{ if .Params.thumbnailImage }} {{ .Page.Title }} {{ else }} @@ -9,20 +9,20 @@
    {{ range .Params.categories }} {{ with ($.Site.GetPage (printf "/categories/%s" (. | urlize))) }} - {{ .Title }} + {{ .Title }} {{ end }} {{ end }} -

    {{ .Page.Title }}

    +

    {{ .Page.Title }}

    {{ range .Params.authors }} {{ with ($.Site.GetPage (printf "/authors/%s" (. | urlize))) }} - By {{ .Title }} | + By {{ .Title }} | {{ end }} {{ end }} Posted on {{ .Page.Date.Format "January 2, 2006"}}

    {{ .Page.Summary | safeHTML }}

    - Continue reading + Continue reading
    diff --git a/src/themes/ivpn-v3/layouts/partials/blog-categories.html b/src/themes/ivpn-v3/layouts/partials/blog-categories.html index b7bd7893f..cc63e4226 100644 --- a/src/themes/ivpn-v3/layouts/partials/blog-categories.html +++ b/src/themes/ivpn-v3/layouts/partials/blog-categories.html @@ -1,7 +1,7 @@
    {{ range sort .Site.Taxonomies.categories ".Page.Weight" "asc" }}
    - + {{ .Page.Title }} ({{ .Count }} {{ if eq .Count 1 }}article{{ else }}articles{{ end }}) diff --git a/src/themes/ivpn-v3/layouts/partials/blog-side-bar.html b/src/themes/ivpn-v3/layouts/partials/blog-side-bar.html index d5ccfd9a2..fa56f8115 100644 --- a/src/themes/ivpn-v3/layouts/partials/blog-side-bar.html +++ b/src/themes/ivpn-v3/layouts/partials/blog-side-bar.html @@ -1,7 +1,7 @@

    Tags

    {{ range .Site.Taxonomies.tags }} - {{ .Page.Title }} + {{ .Page.Title }} {{ end }}
    @@ -10,14 +10,14 @@
    {{ range .Params.categories }} {{ with ($.Site.GetPage (printf "/categories/%s" (. | urlize))) }} - {{ .Title }} + {{ .Title }} {{ end }} {{ end }} -

    {{ .Page.Title }}

    +

    {{ .Page.Title }}

    {{ range .Params.authors }} {{ with ($.Site.GetPage (printf "/authors/%s" (. | urlize))) }} - By {{ .Title }} + By {{ .Title }} {{ end }} {{ end }}

    From bdce62a3e7a45d91fcf6fd9e9a91cfc52aa7487a Mon Sep 17 00:00:00 2001 From: Natanael Rodriguez Ramos Date: Fri, 26 Apr 2024 12:44:46 +0100 Subject: [PATCH 3/3] vendor: update Hugo to v0.125.3 and nodejs to v16 --- src/config/_default/config.toml | 7 +++++++ src/themes/ivpn-v3/assets/scss/components/highlight.scss | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/src/config/_default/config.toml b/src/config/_default/config.toml index 70d21ec26..eb054da52 100644 --- a/src/config/_default/config.toml +++ b/src/config/_default/config.toml @@ -6,6 +6,13 @@ paginate = 8 summaryLength = 35 disableKinds = ["sitemap", "taxonomy"] +pygmentsUseClasses=true +pygmentsCodefencesGuessSyntax=true +pygmentsCodefences=true +pygmentsStyle="monokai" +pygmentsOptions="noclasses=false" + + [markup.goldmark.renderer] unsafe= true diff --git a/src/themes/ivpn-v3/assets/scss/components/highlight.scss b/src/themes/ivpn-v3/assets/scss/components/highlight.scss index 4721cadb0..2e5f1ee53 100644 --- a/src/themes/ivpn-v3/assets/scss/components/highlight.scss +++ b/src/themes/ivpn-v3/assets/scss/components/highlight.scss @@ -10,6 +10,10 @@ pre code span { display: inline; } + + pre code .cl{ + color: #b35a5a !important; + } } .bold {