diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 00000000..95dc0ada --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,2 @@ + + diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 0bb10323..bc42ddcb 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -7,6 +7,7 @@ on: jobs: build-deploy: + name: Build and Deploy runs-on: ubuntu-20.04 concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml index 21ec6d56..2506d7f9 100644 --- a/.github/workflows/label.yml +++ b/.github/workflows/label.yml @@ -4,6 +4,7 @@ on: [pull_request_target] jobs: label: + name: Label runs-on: ubuntu-latest permissions: contents: read diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml index 825c766d..0cb59ca5 100644 --- a/.github/workflows/test-build.yml +++ b/.github/workflows/test-build.yml @@ -1,9 +1,10 @@ name: Test Build -on: [push, pull_request] +on: [push] jobs: build: + name: Build Example Site runs-on: ubuntu-20.04 concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f2d266c..a2f38118 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## [Unreleased] +## [1.5.2] - 2021-11-10 + +### Added + +- German translation ([#27](https://github.com/jpanther/congo/pull/27)) +- Brazilian Portuguese translation ([#28](https://github.com/jpanther/congo/pull/28)) +- Spanish translation ([#30](https://github.com/jpanther/congo/pull/30)) + +### Fixed + +- Article pagination link spacing ([#26](https://github.com/jpanther/congo/pull/26)) +- Minor icon style issues + ## [1.5.1] - 2021-11-04 ### Fixed @@ -157,7 +170,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Advanced customisation using simple Tailwind colour definitions and styles - Fully documented -[unreleased]: https://github.com/jpanther/Congo/compare/v1.5.1...HEAD +[unreleased]: https://github.com/jpanther/Congo/compare/v1.5.2...HEAD +[1.5.2]: https://github.com/jpanther/Congo/compare/v1.5.1...v1.5.2 [1.5.1]: https://github.com/jpanther/Congo/compare/v1.5.0...v1.5.1 [1.5.0]: https://github.com/jpanther/Congo/compare/v1.4.0...v1.5.0 [1.4.0]: https://github.com/jpanther/Congo/compare/v1.3.0...v1.4.0 diff --git a/assets/css/compiled/main.css b/assets/css/compiled/main.css index 45722f6d..081c87dc 100644 --- a/assets/css/compiled/main.css +++ b/assets/css/compiled/main.css @@ -1,4 +1,4 @@ -/*! Congo v1.5.1 | MIT License | https://github.com/jpanther/congo */ +/*! Congo v1.5.2 | MIT License | https://github.com/jpanther/congo */ /*! tailwindcss v2.2.19 | MIT License | https://tailwindcss.com */ @@ -1928,8 +1928,8 @@ body a, body button { margin-right: 0.75rem; } -.-mt-1 { - margin-top: -0.25rem; +.mt-\[0\.1rem\] { + margin-top: 0.1rem; } .ml-3 { @@ -2336,14 +2336,14 @@ body a, body button { line-height: 1.75rem; } -.leading-3 { - line-height: .75rem; -} - .leading-6 { line-height: 1.5rem; } +.leading-3 { + line-height: .75rem; +} + .text-neutral-400 { color: var(--color-neutral-400); } diff --git a/assets/css/main.css b/assets/css/main.css index d15a90e0..f6f8b5d4 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -1,4 +1,4 @@ -/*! Congo v1.5.1 | MIT License | https://github.com/jpanther/congo */ +/*! Congo v1.5.2 | MIT License | https://github.com/jpanther/congo */ @tailwind base; @tailwind components; diff --git a/i18n/de.yaml b/i18n/de.yaml new file mode 100644 index 00000000..7cdc20e3 --- /dev/null +++ b/i18n/de.yaml @@ -0,0 +1,37 @@ +article: + anchor_label: "Anker" + draft: "Entwurf" + edit_title: "Inhalt bearbeiten" + reading_time: + one: "{{ .Count }} min" + other: "{{ .Count }} min" + reading_time_title: "Lesezeit" + +author: + byline_title: "Autor" + +error: + 404_title: "Seite nicht gefunden :confused:" + 404_error: "Fehler 404" + 404_description: "Es sieht so aus, als ob es diese Seite nicht gibt." + +footer: + dark_appearance: "Zum dunklen Erscheinungsbild wechseln" + light_appearance: "Zum hellen Erscheinungsbild wechseln" + powered_by: "Erstellt mit {{ .Hugo }} & {{ .Congo }}" + +list: + externalurl_title: "Link zu einer externen Seite" + no_articles: "Es gibt hier noch keine Beiträge." + +sharing: + email: "Per E-Mail teilen" + facebook: "Auf Facebook teilen" + linkedin: "Auf LinkedIn teilen" + pinterest: "Auf Pinterest pinnen" + reddit: "An Reddit senden" + twitter: "Auf Twitter teilen" + +shortcode: + recent_articles: "Kürzlich" + icon_none: "Icon nicht gefunden." diff --git a/i18n/es.yaml b/i18n/es.yaml new file mode 100644 index 00000000..4a7df79b --- /dev/null +++ b/i18n/es.yaml @@ -0,0 +1,37 @@ +article: + anchor_label: "Ancla" + draft: "Borrador" + edit_title: "Editar contenido" + reading_time: + one: "{{ .Count }} min" + other: "{{ .Count }} mins" + reading_time_title: "Tiempo de lectura" + +author: + byline_title: "Autor" + +error: + 404_title: "Página no encontrada :confused:" + 404_error: "Error 404" + 404_description: "Parece que la página que solicitaste no existe." + +footer: + dark_appearance: "Cambiar a modo oscuro" + light_appearance: "Cambiar a modo claro" + powered_by: "Desarrollada con {{ .Hugo }} & {{ .Congo }}" + +list: + externalurl_title: "Link a página externa" + no_articles: "Aún no hay artículos para listar aquí." + +sharing: + email: "Enviar vía email" + facebook: "Compartir en Facebook" + linkedin: "Compartir en LinkedIn" + pinterest: "Pinear en Pinterest" + reddit: "Publicar en Reddit" + twitter: "Tuitear en Twitter" + +shortcode: + recent_articles: "Reciente" + icon_none: "Icono no encontrado." diff --git a/i18n/pt-BR.yaml b/i18n/pt-BR.yaml new file mode 100644 index 00000000..6e5b7d2f --- /dev/null +++ b/i18n/pt-BR.yaml @@ -0,0 +1,37 @@ +article: + anchor_label: "Anchor" + draft: "Draft" + edit_title: "Editar Conteúdo" + reading_time: + one: "{{ .Count }} minuto" + other: "{{ .Count }} minutos" + reading_time_title: "Tempo de leitura" + +author: + byline_title: "Autor" + +error: + 404_title: "Página não econtrada :confused:" + 404_error: "Erro 404" + 404_description: "Aparentemente a página requisitada não existe." + +footer: + dark_appearance: "Mudar para modo escuro" + light_appearance: "Mudar para modo claro" + powered_by: "Movido por {{ .Hugo }} & {{ .Congo }}" + +list: + externalurl_title: "Link para site externo" + no_articles: "Não tem artigos para lista aqui ainda." + +sharing: + email: "Enviar por email" + facebook: "Compartilhar pelo Facebook" + linkedin: "Compartilhar pelo LinkedIn" + pinterest: "Pin no Pinterest" + reddit: "Postar no Reddit" + twitter: "Tweet no Twitter" + +shortcode: + recent_articles: "Recente" + icon_none: "Ícone não encontrado." diff --git a/layouts/partials/article-pagination.html b/layouts/partials/article-pagination.html index 622aaf4a..40134165 100644 --- a/layouts/partials/article-pagination.html +++ b/layouts/partials/article-pagination.html @@ -8,8 +8,10 @@ - {{ .NextInSection.Title | emojify }} - + {{ .NextInSection.Title | emojify }} + {{ if .Params.showDate | default (.Site.Params.article.showDate | default true) }} {{ partial "meta/date.html" . }} {{ end }} @@ -22,8 +24,10 @@ {{ if .PrevInSection }} - {{ .PrevInSection.Title | emojify }} - + {{ .PrevInSection.Title | emojify }} + {{ if .Params.showDate | default (.Site.Params.article.showDate | default true) }} {{ partial "meta/date.html" . }} {{ end }} diff --git a/layouts/partials/icon.html b/layouts/partials/icon.html index cde57b96..831697a1 100644 --- a/layouts/partials/icon.html +++ b/layouts/partials/icon.html @@ -1,6 +1,6 @@ - - {{ $icon := resources.Get (print "icons/" . ".svg") }} - {{ if $icon }} +{{ $icon := resources.Get (print "icons/" . ".svg") }} +{{ if $icon }} + {{ $icon.Content | safeHTML }} - {{ end }} - + +{{ end }} diff --git a/layouts/shortcodes/icon.html b/layouts/shortcodes/icon.html index 3afb45b5..1db633d0 100644 --- a/layouts/shortcodes/icon.html +++ b/layouts/shortcodes/icon.html @@ -1,8 +1,8 @@ - - {{ $icon := resources.Get (printf "icons/%s.svg" ($.Get 0)) }} - {{ if $icon }} +{{ $icon := resources.Get (printf "icons/%s.svg" ($.Get 0)) }} +{{ if $icon }} + {{ $icon.Content | safeHTML }} - {{ else }} - {{ i18n "shortcode.icon_none" }} - {{ end }} - + +{{ else }} + {{ i18n "shortcode.icon_none" }} +{{ end }} diff --git a/package.json b/package.json index 71bc3332..680feb5c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hugo-congo-theme", - "version": "1.5.1", + "version": "1.5.2", "description": "Congo theme for Hugo", "main": "index.js", "scripts": {