Merge 4108c35fe3 into 1e90d7f077

exampleSite/content/samples/markdown/index.md

@@ -9,6 +9,10 @@ This article offers a sample of basic Markdown formatting that can be used in Co
 
 <!--more-->
 
+## Image
+
+![sample image](thumb-surendran-mp-IhWYiwSxm8g-unsplash.jpg)
+
 ## Headings
 
 The following HTML `<h1>`—`<h6>` elements represent six levels of section headings. `<h1>` is the highest section level while `<h6>` is the lowest.

layouts/_default/_markup/render-image.html

@@ -23,27 +23,49 @@
   {{ end }}
   {{ with $resource }}
     <figure>
-      <img
+      <picture>
-        class="mx-auto my-0 rounded-md"
+        {{ if ne .MediaType.SubType "svg" }}
-        {{ if eq .MediaType.SubType "svg" }}
+          <source 
-          src="{{ .RelPermalink }}"
+            {{ if lt .Width 660 }}
-        {{ else }}
+              {{ with .Resize (printf "%dx%d webp" .Width .Height) }}
-          {{ if lt .Width 660 }}
+                src="{{ .RelPermalink }}"
+              {{ end }}
+            {{ else }}
+              srcset="
+                {{- (.Resize "330x webp").RelPermalink }} 330w,
+                {{- (.Resize "660x webp").RelPermalink }} 660w,
+                {{- (.Resize "1024x webp").RelPermalink }} 1024w,
+                {{- (.Resize "1320x webp").RelPermalink }} 2x"
+              src="{{ (.Resize "660x webp").RelPermalink }}" 
+            {{ end }}
+            type="image/webp" 
+          />
+        {{ end }}
+        <img
+          class="mx-auto my-0 rounded-md"
+          {{ if eq .MediaType.SubType "svg" }}
             src="{{ .RelPermalink }}"
           {{ else }}
-            srcset="
+            width="{{ .Width }}"
-            {{- (.Resize "330x").RelPermalink }} 330w,
+            height="{{ .Height }}"
-            {{- (.Resize "660x").RelPermalink }} 660w,
+            decoding="async"
-            {{- (.Resize "1024x").RelPermalink }} 1024w,
+            {{ if lt .Width 660 }}
-            {{- (.Resize "1320x").RelPermalink }} 2x"
+              src="{{ .RelPermalink }}"
-            src="{{ (.Resize "660x").RelPermalink }}"
+            {{ else }}
+              srcset="
+              {{- (.Resize "330x").RelPermalink }} 330w,
+              {{- (.Resize "660x").RelPermalink }} 660w,
+              {{- (.Resize "1024x").RelPermalink }} 1024w,
+              {{- (.Resize "1320x").RelPermalink }} 2x"
+              src="{{ (.Resize "660x").RelPermalink }}"
+            {{ end }}
           {{ end }}
-        {{ end }}
+          alt="{{ $altText }}"
-        alt="{{ $altText }}"
+          {{ if $lazyLoad }}
-        {{ if $lazyLoad }}
+            loading="lazy"
-          loading="lazy"
+          {{ end }}
-        {{ end }}
+        />
-      />
+      </picture>
       {{ with $caption }}<figcaption class="text-center">{{ . | markdownify }}</figcaption>{{ end }}
     </figure>
   {{ else }}

layouts/_default/single.html

@@ -20,6 +20,8 @@
             {{ if eq .MediaType.SubType "svg" }}
               src="{{ .RelPermalink }}"
             {{ else }}
+              width="{{ .Width }}"
+              height="{{ .Height }}"
               {{ if lt .Width 660 }}
                 src="{{ .RelPermalink }}"
               {{ else }}

layouts/partials/article-link.html

@@ -22,6 +22,8 @@
             {{- (.Fill "160x120 smart").RelPermalink }}
             160w, {{- (.Fill "320x240 smart").RelPermalink }} 2x"
             src="{{ (.Fill "160x120 smart").RelPermalink }}"
+            width="160"
+            height="120"
           {{ end }}
           {{ if $.Site.Params.enableImageLazyLoading | default true }}
             loading="lazy"

layouts/shortcodes/figure.html

@@ -27,6 +27,8 @@
           {{ if eq .MediaType.SubType "svg" }}
             src="{{ .RelPermalink }}"
           {{ else }}
+            width="{{ .Width }}"
+            height="{{ .Height }}"
             {{ if lt .Width 660 }}
               src="{{ .RelPermalink }}"
             {{ else }}