Added JPEG progressive

diff --git a/personal/memorabilia/index.html b/personal/memorabilia/index.html
index 3c11752d2704975672de11d3af1ae420bc0db204..80823f013a9d4a2b6b8af22fcf40491759ce5792 100644 (file)
--- a/personal/memorabilia/index.html
+++ b/personal/memorabilia/index.html
@@ -50,35 +50,35 @@
                <main>
                        <div class="slideshow full">
                                <img
-                                       srcset="/media/photos_960/zine1.png,
-                                               /media/photos_1920/zine1.png x2,
-                                               /media/photos_3840/zine1.png x4"
-                                       src="/media/photos_3840/zine1.png" />
+                                       srcset="/media/photos_960/zine1.jpg,
+                                               /media/photos_1920/zine1.jpg x2,
+                                               /media/photos_3840/zine1.jpg x4"
+                                       src="/media/photos_3840/zine1.jpg" />
                                <img
-                                       srcset="/media/photos_960/zine2.png,
-                                               /media/photos_1920/zine2.png x2,
-                                               /media/photos_3840/zine2.png x4"
-                                       src="/media/photos_3840/zine2.png" />
+                                       srcset="/media/photos_960/zine2.jpg,
+                                               /media/photos_1920/zine2.jpg x2,
+                                               /media/photos_3840/zine2.jpg x4"
+                                       src="/media/photos_3840/zine2.jpg" />
                                <img
-                                       srcset="/media/photos_960/zine3.png,
-                                               /media/photos_1920/zine3.png x2,
-                                               /media/photos_3840/zine3.png x4"
-                                       src="/media/photos_3840/zine3.png" />
+                                       srcset="/media/photos_960/zine3.jpg,
+                                               /media/photos_1920/zine3.jpg x2,
+                                               /media/photos_3840/zine3.jpg x4"
+                                       src="/media/photos_3840/zine3.jpg" />
                                <img
-                                       srcset="/media/photos_960/zine4.png,
-                                               /media/photos_1920/zine4.png x2,
-                                               /media/photos_3840/zine4.png x4"
-                                       src="/media/photos_3840/zine4.png" />
+                                       srcset="/media/photos_960/zine4.jpg,
+                                               /media/photos_1920/zine4.jpg x2,
+                                               /media/photos_3840/zine4.jpg x4"
+                                       src="/media/photos_3840/zine4.jpg" />
                                <img
-                                       srcset="/media/photos_960/zine5.png,
-                                               /media/photos_1920/zine5.png x2,
-                                               /media/photos_3840/zine5.png x4"
-                                       src="/media/photos_3840/zine5.png" />
+                                       srcset="/media/photos_960/zine5.jpg,
+                                               /media/photos_1920/zine5.jpg x2,
+                                               /media/photos_3840/zine5.jpg x4"
+                                       src="/media/photos_3840/zine5.jpg" />
                                <img
-                                       srcset="/media/photos_960/zine6.png,
-                                               /media/photos_1920/zine6.png x2,
-                                               /media/photos_3840/zine6.png x4"
-                                       src="/media/photos_3840/zine6.png" />
+                                       srcset="/media/photos_960/zine6.jpg,
+                                               /media/photos_1920/zine6.jpg x2,
+                                               /media/photos_3840/zine6.jpg x4"
+                                       src="/media/photos_3840/zine6.jpg" />
                        </div>
 
                        <p><b>Memorabilia</b></p>

diff --git a/resize.sh b/resize.sh
index 5a92d2b4db64c658735ebff6875c0e021156ec7b..e677d0a21db59361af60c4e7e961cf6b0dfedba5 100755 (executable)
--- a/resize.sh
+++ b/resize.sh
@@ -3,10 +3,14 @@ mkdir media/photos_1920
 mkdir media/photos_960
 mkdir media/photos_480
 
+
 for f in media/photos/*;
     do
-    convert -resize 3840 $f "media/photos_3840/$(basename $f)"
-    convert -resize 1920 $f "media/photos_1920/$(basename $f)"
-    convert -resize 960 $f "media/photos_960/$(basename $f)"
-    convert -resize 480 $f "media/photos_480/$(basename $f)";
+    filename=$(basename -- "$f")
+       filename="${filename%.*}"
+
+    convert -resize 3840 $f -interlace plane "media/photos_3840/${filename}.jpg"
+    convert -resize 1920 $f -interlace plane "media/photos_1920/${filename}.jpg"
+    convert -resize 960 $f -interlace plane "media/photos_960/${filename}.jpg"
+    convert -resize 480 $f -interlace plane "media/photos_480/${filename}.jpg";
 done

diff --git a/style.css b/style.css
index 0f285cb1a0a2a5543c0e03f20c1cc045add15b6e..c4a596de11458a2d0b3674347433631132010f31 100644 (file)
--- a/style.css
+++ b/style.css
@@ -133,7 +133,7 @@ blockquote {
        display: flex;
 }
 .slideshow.full {
-       --full-overhang: 8vw;
+       --full-overhang: 12vw;
        margin-right: calc(-1 * var(--full-overhang));
        width: calc(55vw - 25px + var(--full-overhang));
        height: calc((55vw - 25px + var(--full-overhang)) / 1.5);