Merge 843506a7f2 into 0c5d6d1125

🔀 Merge pull request #746 from jpanther/dependabot/github_actions/actions/stale-9
👷 Bump actions/stale from 8 to 9
2023-12-11 09:37:30 +01:00 · 2023-12-10 10:12:43 +11:00 · 2023-12-10 10:12:20 +11:00 · 2023-12-09 22:54:01 +00:00 · 2023-12-09 22:53:57 +00:00 · 2023-12-04 20:44:42 -06:00
5 changed files with 30 additions and 27 deletions
--- a/.github/workflows/label.yml
+++ b/.github/workflows/label.yml
@ -12,7 +12,7 @@ jobs:

    steps:
      - name: Label
-        uses: actions/labeler@v4
+        uses: actions/labeler@v5
        with:
          repo-token: "${{ secrets.GITHUB_TOKEN }}"
          configuration-path: .github/labeller.yml
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@ -10,7 +10,7 @@ jobs:
      issues: write
      pull-requests: write
    steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@v9
        with:
          days-before-stale: 120
          days-before-close: 30
--- a/exampleSite/assets/img/dark-logo.svg
+++ b/exampleSite/assets/img/dark-logo.svg
--- a/exampleSite/config/_default/params.toml
+++ b/exampleSite/config/_default/params.toml
@ -20,8 +20,8 @@ fingerprintAlgorithm = "sha256"

 [header]
  layout = "basic" # valid options: basic, hamburger, hybrid, custom
-  # logo = "img/logo.jpg"
-  # logoDark = "img/dark-logo.jpg"
+   logo = "img/logo.jpg"
+   logoDark = "img/dark-logo.svg"
  showTitle = true

 [footer]
--- a/layouts/partials/logo.html
+++ b/layouts/partials/logo.html
@ -1,28 +1,26 @@
-{{- if .Site.Params.header.logo }}
-  {{- $logo := resources.Get .Site.Params.header.logo }}
-  {{- $logo_dark := resources.Get .Site.Params.header.logoDark }}
-  {{- if $logo }}
+{{- if $.Page.Site.Params.header.logo }}
+  {{- $logo := resources.Get $.Page.Site.Params.header.logo }}
+  {{- $logo_dark := resources.Get $.Page.Site.Params.header.logoDark }}
+  {{- $logoAlt := $.Page.Site.Title -}} 
+  {{- $logoClass     := "max-h-[10rem] max-w-[10rem] object-scale-down object-left flex" -}}
+  {{- $logoDarkClass := (print $logoClass " hidden dark:flex")  -}}
+  {{- if $logo_dark -}}
+    {{- $logoClass = (print $logoClass " dark:hidden" ) -}}
+  {{- end }}  
+  {{- if or $logo $logo_dark -}}
    <a href="{{ "" | relLangURL }}" class="mr-2">  
-      <img
-        src="{{ $logo.RelPermalink }}"
-        width="{{ div $logo.Width 2 }}"
-        height="{{ div $logo.Height 2 }}"
-        class="max-h-[10rem] max-w-[10rem] object-scale-down object-left{{ if $logo_dark }} hidden dark:flex{{ end }}"
-        alt="{{ .Site.Title }}"
-      />
-      {{- if $logo_dark }}
-      <img
-        src="{{ $logo_dark.RelPermalink }}"
-        width="{{ div $logo_dark.Width 2 }}"
-        height="{{ div $logo_dark.Height 2 }}"
-        class="max-h-[10rem] max-w-[10rem] object-scale-down object-left dark:hidden"
-        alt="{{ .Site.Title }}"
-      />
-      {{- end}}
+  {{- end }}
+  {{- with $logo }}
+    {{- partial "picture.html" (dict "img" . "alt" $logoAlt "class" $logoClass "lazy" false "webp" false ) -}}
+  {{- end -}}
+  {{- with $logo_dark }}
+    {{- partial "picture.html" (dict "img" . "alt" $logoAlt "class" $logoDarkClass "lazy" false "webp" false ) -}}
+  {{- end -}}
+  {{- if or $logo $logo_dark -}}
    </a>
  {{- end }}
 {{- end }}
-{{- if .Site.Params.header.showTitle | default true }}
+{{- if $.Page.Site.Params.header.showTitle | default true }}
  <a
    class="decoration-primary-500 hover:underline hover:decoration-2 hover:underline-offset-2"
    rel="me"
Author	SHA1	Message	Date
Wolf Noble	71a30405b6	Merge `843506a7f2` into `0c5d6d1125`	2023-12-11 09:37:30 +01:00
James Panther	0c5d6d1125	🔀 Merge pull request #746 from jpanther/dependabot/github_actions/actions/stale-9 👷 Bump actions/stale from 8 to 9	2023-12-10 10:12:43 +11:00
James Panther	5142e27a62	🔀 Merge pull request #745 from jpanther/dependabot/github_actions/actions/labeler-5 👷 Bump actions/labeler from 4 to 5	2023-12-10 10:12:20 +11:00
dependabot[bot]	d23e94b820	👷 Bump actions/stale from 8 to 9 Bumps [actions/stale](https://github.com/actions/stale) from 8 to 9. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/stale/compare/v8...v9) --- updated-dependencies: - dependency-name: actions/stale dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2023-12-09 22:54:01 +00:00
dependabot[bot]	adc5f4a80d	👷 Bump actions/labeler from 4 to 5 Bumps [actions/labeler](https://github.com/actions/labeler) from 4 to 5. - [Release notes](https://github.com/actions/labeler/releases) - [Commits](https://github.com/actions/labeler/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/labeler dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2023-12-09 22:53:57 +00:00
Wolf Noble	843506a7f2	✨ ♻️ adhesive_bandage: adapt logo partial to use picture partial to render the logo. Add SVG Gorilla to example site as functional demo.	2023-12-04 20:44:42 -06:00