Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update hugo and geekdocs theme #596

Merged
merged 7 commits into from
Jan 6, 2025
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/build-recommendation-object.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ on:
- 'azure-specialized-workloads/**/*.kql'
- 'azure-waf/**/*.yaml'
- 'azure-waf/**/*.kql'
branches: [update-recommendation-object]
workflow_dispatch:

env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/hugo-site-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
build:
runs-on: ubuntu-latest
env:
HUGO_VERSION: 0.124.1
HUGO_VERSION: 0.14.0
oZakari marked this conversation as resolved.
Show resolved Hide resolved
steps:
- name: Harden Runner
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
/tools/[Ww][Aa][Rr][Aa]*.xlsx
/tools/*.txt
/tools/*.pptx
/public/

# User-specific files
*.rsuser
Expand Down
1 change: 1 addition & 0 deletions docs/themes/hugo-geekdoc/.nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lts/*
4 changes: 2 additions & 2 deletions docs/themes/hugo-geekdoc/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Geekdoc

[![Build Status](https://ci.thegeeklab.de/api/badges/21/status.svg)](https://ci.thegeeklab.de/repos/21)
[![Hugo Version](https://img.shields.io/badge/hugo-0.93-blue.svg)](https://gohugo.io)
[![Build Status](https://ci.thegeeklab.de/api/badges/thegeeklab/hugo-geekdoc/status.svg)](https://ci.thegeeklab.de/repos/thegeeklab/hugo-geekdoc)
[![Hugo Version](https://img.shields.io/badge/hugo-0.124-blue.svg)](https://gohugo.io)
[![GitHub release](https://img.shields.io/github/v/release/thegeeklab/hugo-geekdoc)](https://github.com/thegeeklab/hugo-geekdoc/releases/latest)
[![GitHub contributors](https://img.shields.io/github/contributors/thegeeklab/hugo-geekdoc)](https://github.com/thegeeklab/hugo-geekdoc/graphs/contributors)
[![License: MIT](https://img.shields.io/github/license/thegeeklab/hugo-geekdoc)](https://github.com/thegeeklab/hugo-geekdoc/blob/main/LICENSE)
Expand Down
2 changes: 1 addition & 1 deletion docs/themes/hugo-geekdoc/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.39.6
v1.2.1
496 changes: 398 additions & 98 deletions docs/themes/hugo-geekdoc/data/assets.json

Large diffs are not rendered by default.

22 changes: 22 additions & 0 deletions docs/themes/hugo-geekdoc/eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import eslint from "@eslint/js";
import globals from "globals";
import babelParser from "@babel/eslint-parser";
import eslintPluginPrettierRecommended from "eslint-plugin-prettier/recommended";

export default [
eslint.configs.recommended,
{
languageOptions: {
globals: {
...globals.browser,
},
parser: babelParser,
ecmaVersion: 2022,
sourceType: "module",
parserOptions: {
requireConfigFile: false,
},
},
},
eslintPluginPrettierRecommended,
];
52 changes: 52 additions & 0 deletions docs/themes/hugo-geekdoc/i18n/am.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
---
edit_page: ገጹን ማስተካከያ

nav_navigation: መሄጃ
nav_tags: መለያዎች
nav_more: ተጨማሪ
nav_top: ወደ ላይ ተመለስ

form_placeholder_search: ፈልግ

error_page_title: ጠፋብዎት? አይጨነቁ።
error_message_title: ጠፋብዎት?
error_message_code: አልተገኘም
error_message_text: >
ገጹን ማግኘት አልተቻለም፤ ነገር ግን አይጨነቁ፤ በዚህ <a class="gdoc-error__link" href="{{ . }}">ገጽ</a> መመለስ ይችላሉ።

button_toggle_dark: ብሩህ/ጨለማ መቀያየሪያ
button_nav_open: መሄጃውን ክፈት
button_nav_close: መሄጃውን ዝጋ
button_menu_open: ምርጫዎችን ክፈት
button_menu_close: ምርጫዎችን ዝጋ
button_homepage: ወደ መጀመሪያ ገጽ ተመለስ

title_anchor_prefix: "ማያያዣ ወደ:"

posts_read_more: ሙሉውን ያንብቡ
posts_read_time:
one: "ለማንበብ አንድ ደቂቃ"
other: "{{ . }} ደቂቃዎች ለማንበብ"
posts_update_prefix: መጨረሻ የዘመነው
posts_count:
one: "አንድ ጽሑፍ"
other: "{{ . }} ጽሑፎች"
posts_tagged_with: ከ '{{ . }}' ጋር የተዛመዱ ጽሑፎች በሙሉ

footer_build_with: >
በ <a href="https://gohugo.io/" class="gdoc-footer__link">Hugo</a> የተገነባ ከ
<svg class="gdoc-icon gdoc_heart"><use xlink:href="#gdoc_heart"></use></svg> ጋር
footer_legal_notice: ሕጋዊ መረጃዎች
footer_privacy_policy: ስለ መረጃዎ አያያዝ ያለን አቋም
footer_content_license_prefix: >
ስለ ይዘቱ ባለመብትነት መረጃ

language_switch_no_tranlation_prefix: "ያልተተረጐመ ገጽ:"

propertylist_required: ግድ የሚያስፈልግ
propertylist_optional: ግድ ያልሆነ
propertylist_default: በባዶ ፈንታ

pagination_page_prev: ያለፈው
pagination_page_next: ቀጣይ
pagination_page_state: "{{ .PageNumber }}/{{ .TotalPages }}"
53 changes: 53 additions & 0 deletions docs/themes/hugo-geekdoc/i18n/fr.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
---
edit_page: Editer la page

nav_navigation: Navigation
nav_tags: Tags
nav_more: Plus
nav_top: Retour au haut de page

form_placeholder_search: Chercher

error_page_title: Perdu? Ne t'inquiète pas
error_message_title: Perdu?
error_message_code: Error 404
error_message_text: >
On dirait que ce que vous cherchez est introuvable. Ne vous inquiétez pas, nous pouvons
vous ramèner à la <a class="gdoc-error__link" href="{{ . }}">page d'accueil</a>.

button_toggle_dark: Basculer le mode Sombre/Clair/Auto
button_nav_open: Ouvrir la navigation
button_nav_close: Fermer la navigation
button_menu_open: Ouvrir la barre de menus
button_menu_close: Fermer la barre de menus
button_homepage: retour à la page d'accueil

title_anchor_prefix: "Ancrer à :"

posts_read_more: Lire l'article complet
posts_read_time:
one: "Une minute pour lire"
other: "{{ . }} minutes à lire"
posts_update_prefix: Mis à jour le
posts_count:
one: "Un billet"
other: "{{ . }} billets"
posts_tagged_with: Tous les articles marqués avec '{{ . }}'

footer_build_with: >
Construit avec <a href="https://gohugo.io/" class="gdoc-footer__link">Hugo</a> et
<svg class="gdoc-icon gdoc_heart"><use xlink:href="#gdoc_heart"></use></svg>
footer_legal_notice: Mentions légales
footer_privacy_policy: Politique de confidentialité
footer_content_license_prefix: >
Contenu sous licence

language_switch_no_tranlation_prefix: "Page non traduite:"

propertylist_required: requis
propertylist_optional: facultatif
propertylist_default: défaut

pagination_page_prev: précédent
pagination_page_next: suivant
pagination_page_state: "{{ .PageNumber }}/{{ .TotalPages }}"
53 changes: 53 additions & 0 deletions docs/themes/hugo-geekdoc/i18n/oc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
---
edit_page: Modificar la pagina

nav_navigation: Navegacion
nav_tags: Etiquetas
nav_more: Mai
nav_top: Tornar ennaut

form_placeholder_search: Cercar

error_page_title: Perdut ? Cap de problèma
error_message_title: Perdut ?
error_message_code: Error 404
error_message_text: >
Sembla que cercatz quicòm que se pòt pas trobat. Vos’n fagatz pas vos podèm
tornar a la <a class="gdoc-error__link" href="{{ . }}">pagina d’acuèlh</a>.

button_toggle_dark: Alternar lo mòde escur/clar/auto
button_nav_open: Dobrir la navegacion
button_nav_close: Tampar la navegacion
button_menu_open: Dobrir la barra de menú
button_menu_close: Tampar la barra de menú
button_homepage: Tornar a la pagina d’acuèlh

title_anchor_prefix: "Ancorar a:"

posts_read_more: Legir la publicacion complèta
posts_read_time:
one: "Una minuta de lectura"
other: "{{ . }} minutas de lectura"
posts_update_prefix: Actualizada lo
posts_count:
one: "Una publicacion"
other: "{{ . }} publicacions"
posts_tagged_with: Totas las publicacions amb '{{ . }}'

footer_build_with: >
Construch amb <a href="https://gohugo.io/" class="gdoc-footer__link">Hugo</a> e
<svg class="gdoc-icon gdoc_heart"><use xlink:href="#gdoc_heart"></use></svg>
footer_legal_notice: Mencions legalas
footer_privacy_policy: politica de confidencialitat
footer_content_license_prefix: >
Contengut sota licéncia

language_switch_no_tranlation_prefix: "Pagina non traducha :"

propertylist_required: requerit
propertylist_optional: opcional
propertylist_default: per defaut

pagination_page_prev: prec.
pagination_page_next: seg.
pagination_page_state: "{{ .PageNumber }}/{{ .TotalPages }}"
2 changes: 1 addition & 1 deletion docs/themes/hugo-geekdoc/layouts/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<div class="gdoc-error__line gdoc-error__title">{{ i18n "error_message_title" }}</div>
<div class="gdoc-error__line gdoc-error__code">{{ i18n "error_message_code" }}</div>
<div class="gdoc-error__line gdoc-error__help">
{{ i18n "error_message_text" .Site.BaseURL | safeHTML }}
{{ i18n "error_message_text" .Site.Home.Permalink | safeHTML }}
</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@

<!-- prettier-ignore-start -->
{{- if $showAnchor -}}
<div class="gdoc-page__anchorwrap">
<div class="flex align-center gdoc-page__anchorwrap">
<h{{ .Level }} id="{{ .Anchor | safeURL }}" {{- with .Attributes.class }}
class="{{ . }}"
{{- end }}
>
{{ .Text | safeHTML }}
<a data-clipboard-text="{{ .Page.Permalink }}#{{ .Anchor | safeURL }}" class="gdoc-page__anchor clip flex align-center" title="{{ i18n "title_anchor_prefix" }} {{ .Text | safeHTML }}" aria-label="{{ i18n "title_anchor_prefix" }} {{ .Text | safeHTML }}" href="#{{ .Anchor | safeURL }}">
<svg class="gdoc-icon gdoc_link"><use xlink:href="#gdoc_link"></use></svg>
</a>
</h{{ .Level }}>
<a data-clipboard-text="{{ .Page.Permalink }}#{{ .Anchor | safeURL }}" class="gdoc-page__anchor clip flex align-center" title="{{ i18n "title_anchor_prefix" }} {{ .Text | safeHTML }}" aria-label="{{ i18n "title_anchor_prefix" }} {{ .Text | safeHTML }}" href="#{{ .Anchor | safeURL }}">
<svg class="gdoc-icon gdoc_link"><use xlink:href="#gdoc_link"></use></svg>
</a>
</div>
{{- else -}}
<div class="gdoc-page__anchorwrap">
Expand Down
9 changes: 8 additions & 1 deletion docs/themes/hugo-geekdoc/layouts/_default/baseof.html
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,16 @@
{{ template "main" . }}


{{ $showPrevNext := (default true .Site.Params.geekdocNextPrev) }}
{{ if $showPrevNext }}
<div class="gdoc-page__footer flex flex-wrap justify-between">
{{ partial "menu-nextprev" . }}
{{ if .Site.Params.geekdocMenuBundle }}
{{ partial "menu-bundle-np" . }}
{{ else }}
{{ partial "menu-filetree-np" . }}
{{ end }}
</div>
{{ end }}
</div>
</main>

Expand Down
1 change: 1 addition & 0 deletions docs/themes/hugo-geekdoc/layouts/_default/single.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
class="gdoc-markdown gdoc-markdown__align--{{ default "left" (.Page.Params.geekdocAlign | lower) }}"
>
<h1>{{ partial "utils/title" . }}</h1>
{{ partial "page-metadata" . }}
{{ partial "utils/content" . }}
</article>
{{ end }}
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
{{- end }}

{{- if (default false $.Site.Params.geekdocOverwriteHTMLBase) }}
<base href="{{ .Site.BaseURL }}" />
<base href="{{ .Site.Home.Permalink }}" />
{{- end }}

{{ printf "<!-- %s -->" "Made with Geekdoc theme https://github.com/thegeeklab/hugo-geekdoc" | safeHTML }}
2 changes: 1 addition & 1 deletion docs/themes/hugo-geekdoc/layouts/partials/language.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{ if .Site.IsMultiLingual }}
{{ if hugo.IsMultilingual }}
<span class="gdoc-language">
<ul class="gdoc-language__selector" role="button" aria-pressed="false" tabindex="0">
<li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
{{ $current.Scratch.Set "nextPage" false }}
{{ $current.Scratch.Set "prevPage" false }}

{{ template "menu_nextprev" dict "sect" $.Site.Data.menu.main.main "current" $current "site" $site }}
{{ template "menu-bundle-np" dict "sect" $.Site.Data.menu.main.main "current" $current "site" $site }}

{{ define "menu_nextprev" }}
{{ define "menu-bundle-np" }}
{{ $current := .current }}
{{ $site := .site }}

Expand Down Expand Up @@ -44,35 +44,32 @@

{{ $sub := default false .sub }}
{{ if $sub }}
{{ template "menu_nextprev" dict "sect" $sub "current" ($current.Scratch.Get "current") "site" ($current.Scratch.Get "site") }}
{{ template "menu-bundle-np" dict "sect" $sub "current" ($current.Scratch.Get "current") "site" ($current.Scratch.Get "site") }}
{{ end }}
{{ end }}
{{ end }}

{{ $showPrevNext := (and (default true .Site.Params.geekdocNextPrev) .Site.Params.geekdocMenuBundle) }}
{{ if $showPrevNext }}
<span class="gdoc-page__nav">
{{ with ($current.Scratch.Get "prevPage") }}
<a
class="gdoc-page__nav--prev flex align-center"
href="{{ .this.RelPermalink }}"
title="{{ .name }}"
>
<i class="gdoc-icon">gdoc_arrow_left_alt</i>
{{ .name }}
</a>
{{ end }}
</span>
<span class="gdoc-page__nav">
{{ with ($current.Scratch.Get "nextPage") }}
<a
class="gdoc-page__nav--next flex align-center"
href="{{ .this.RelPermalink }}"
title="{{ .name }}"
>
{{ .name }}
<i class="gdoc-icon">gdoc_arrow_right_alt</i>
</a>
{{ end }}
</span>
{{ end }}
<span class="gdoc-page__nav">
{{ with ($current.Scratch.Get "prevPage") }}
<a
class="gdoc-page__nav--prev flex align-center"
href="{{ .this.RelPermalink }}"
title="{{ .name }}"
>
<i class="gdoc-icon">gdoc_arrow_left_alt</i>
{{ .name }}
</a>
{{ end }}
</span>
<span class="gdoc-page__nav">
{{ with ($current.Scratch.Get "nextPage") }}
<a
class="gdoc-page__nav--next flex align-center"
href="{{ .this.RelPermalink }}"
title="{{ .name }}"
>
{{ .name }}
<i class="gdoc-icon">gdoc_arrow_right_alt</i>
</a>
{{ end }}
</span>
4 changes: 2 additions & 2 deletions docs/themes/hugo-geekdoc/layouts/partials/menu-bundle.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<svg class="gdoc-icon {{ .icon }}"><use xlink:href="#{{ .icon }}"></use></svg>
{{ end }}
<a
href="{{ if .external }}
href="{{ if .external -}}
{{ .ref }}
{{- else -}}
{{ path.Join $this.RelPermalink $anchor }}
Expand All @@ -68,7 +68,7 @@
<svg class="gdoc-icon toggle gdoc_keyboard_arrow_left">
<use xlink:href="#gdoc_keyboard_arrow_left"></use>
</svg>
<svg class="gdoc-icon toggle gdoc_keyboard_arrow_down hidden">
<svg class="gdoc-icon toggle gdoc_keyboard_arrow_down">
<use xlink:href="#gdoc_keyboard_arrow_down"></use>
</svg>
{{ end }}
Expand Down
Loading
Loading