Merge 843506a7f2 into 82b5481914

🔀 Merge pull request #748 from jpanther/dependabot/npm_and_yarn/prettier-3.1.1
📌 Bump prettier from 3.1.0 to 3.1.1
2023-12-17 12:03:53 +09:00 · 2023-12-12 10:15:54 +11:00 · 2023-12-10 22:09:36 +00:00 · 2023-12-04 20:44:42 -06:00
5 changed files with 36 additions and 33 deletions
--- 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"
--- a/package-lock.json
+++ b/package-lock.json
@ -15,7 +15,7 @@
        "fuse.js": "^7.0.0",
        "katex": "^0.16.9",
        "mermaid": "^10.6.1",
-        "prettier": "^3.1.0",
+        "prettier": "^3.1.1",
        "prettier-plugin-go-template": "^0.0.15",
        "prettier-plugin-tailwindcss": "^0.5.9",
        "quicklink": "^2.3.0",
@ -2333,9 +2333,9 @@
      "dev": true
    },
    "node_modules/prettier": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.0.tgz",
-      "integrity": "sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.1.tgz",
+      "integrity": "sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw==",
      "dev": true,
      "bin": {
        "prettier": "bin/prettier.cjs"
@ -4845,9 +4845,9 @@
      "dev": true
    },
    "prettier": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.0.tgz",
-      "integrity": "sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.1.tgz",
+      "integrity": "sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw==",
      "dev": true
    },
    "prettier-plugin-go-template": {
--- a/package.json
+++ b/package.json
@ -34,7 +34,7 @@
    "fuse.js": "^7.0.0",
    "katex": "^0.16.9",
    "mermaid": "^10.6.1",
-    "prettier": "^3.1.0",
+    "prettier": "^3.1.1",
    "prettier-plugin-go-template": "^0.0.15",
    "prettier-plugin-tailwindcss": "^0.5.9",
    "quicklink": "^2.3.0",
Author	SHA1	Message	Date
Wolf Noble	a0771d5a9b	Merge `843506a7f2` into `82b5481914`	2023-12-17 12:03:53 +09:00
James Panther	82b5481914	🔀 Merge pull request #748 from jpanther/dependabot/npm_and_yarn/prettier-3.1.1 📌 Bump prettier from 3.1.0 to 3.1.1	2023-12-12 10:15:54 +11:00
dependabot[bot]	d19572206a	📌 Bump prettier from 3.1.0 to 3.1.1 Bumps [prettier](https://github.com/prettier/prettier) from 3.1.0 to 3.1.1. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/3.1.0...3.1.1) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-12-10 22:09:36 +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