Merge 1b7361c50d 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-13 21:59:15 +01:00 · 2023-12-12 10:15:54 +11:00 · 2023-12-10 22:09:36 +00:00 · 2023-11-28 21:16:27 +08:00 · 2023-11-27 23:42:08 +08:00
3 changed files with 64 additions and 31 deletions
--- a/layouts/partials/picture.html
+++ b/layouts/partials/picture.html
@ -81,32 +81,65 @@
        type="image/webp" 
      />
    {{ end }}
-      <img
+    {{ $orientation := 1 }}
+    {{ with .Exif }}
+      {{ $orientation = .Tags.Orientation }}
+    {{ end }}
+    {{ if eq $orientation 1 }}
+    <img
+      src="{{ .RelPermalink }}"
+      width="{{ $width }}"
+      height="{{ $height }}"
+      {{ with $class }} class="{{ . }}" {{ end }}
+      {{ with $alt }} alt="{{ . }}" {{ end }}
+      {{ with $lazy }} loading="lazy" decoding="async" {{ end }}
+      {{ if lt .Width 660 }}
        src="{{ .RelPermalink }}"
-        width="{{ $width }}"
-        height="{{ $height }}"
-        {{ with $class }} class="{{ . }}" {{ end }}
-        {{ with $alt }} alt="{{ . }}" {{ end }}
-        {{ with $lazy }} loading="lazy" decoding="async" {{ end }}
-        {{ if lt .Width 660 }}
-          src="{{ .RelPermalink }}"
+      {{ else }}
+        srcset="
+        {{- (.Resize "330x").RelPermalink }} 330w,
+        {{- (.Resize "660x").RelPermalink }} 660w
+        {{ if gt .Width 1024 }}
+          ,{{ (.Resize "1024x").RelPermalink }} 1024w
        {{ else }}
-          srcset="
-          {{- (.Resize "330x").RelPermalink }} 330w,
-          {{- (.Resize "660x").RelPermalink }} 660w
-          {{ if gt .Width 1024 }}
-            ,{{ (.Resize "1024x").RelPermalink }} 1024w
-          {{ else }}
-            ,{{ .RelPermalink }} {{ .Width }}w
-          {{ end }}
-          {{ if gt .Width 1320 }}
-            ,{{ (.Resize "1320x").RelPermalink }} 2x
-          {{ else }}
-            ,{{ .RelPermalink }} {{ .Width }}w
-          {{ end }}"
-          src="{{ (.Resize "660x").RelPermalink }}"
+          ,{{ .RelPermalink }} {{ .Width }}w
        {{ end }}
-      >
+        {{ if gt .Width 1320 }}
+          ,{{ (.Resize "1320x").RelPermalink }} 2x
+        {{ else }}
+          ,{{ .RelPermalink }} {{ .Width }}w
+        {{ end }}"
+        src="{{ (.Resize "660x").RelPermalink }}"
+      {{ end }}
+    >
+    {{ else if (eq $orientation 8) }}
+    <img
+      src="{{ (.Resize "r90").RelPermalink }}"
+      width="{{ $width }}"
+      height="{{ $height }}"
+      {{ with $class }} class="{{ . }}" {{ end }}
+      {{ with $alt }} alt="{{ . }}" {{ end }}
+      {{ with $lazy }} loading="lazy" decoding="async" {{ end }}
+      {{ if lt .Width 660 }}
+        src="{{ .RelPermalink }}"
+      {{ else }}
+        srcset="
+        {{- (.Resize "330x r90").RelPermalink }} 330w,
+        {{- (.Resize "660x r90").RelPermalink }} 660w
+        {{ if gt .Width 1024 }}
+          ,{{ (.Resize "1024x r90").RelPermalink }} 1024w
+        {{ else }}
+          ,{{ .RelPermalink }} {{ .Width }}w
+        {{ end }}
+        {{ if gt .Width 1320 }}
+          ,{{ (.Resize "1320x r90").RelPermalink }} 2x
+        {{ else }}
+          ,{{ .RelPermalink }} {{ .Width }}w
+        {{ end }}"
+        src="{{ (.Resize "660x r90").RelPermalink }}"
+      {{ end }}
+    >
+    {{ end }}
    </picture>
  {{ end }}
 {{ end }}
--- 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
Wen Junhua	d7359f99f9	Merge `1b7361c50d` into `82b5481914`	2023-12-13 21:59:15 +01: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
Wen Junhua	1b7361c50d	fix: remove redundant tags	2023-11-28 21:16:27 +08:00
Wen Junhua	d225da3941	fix: add image fix	2023-11-27 23:42:08 +08:00