From 647d2fad5ce69b84b29ea75dffe29315ef966c03 Mon Sep 17 00:00:00 2001
From: Alexis Tacnet <alexistacnet@gmail.com>
Date: Tue, 7 Feb 2017 01:38:05 +0100
Subject: [PATCH] Add choice for progressive images

---
 layouts/_default/single.html         | 6 +++++-
 layouts/blog/single.html             | 6 +++++-
 layouts/partials/footer_scripts.html | 8 +++++---
 layouts/partials/head_includes.html  | 4 +++-
 static/css/main.css                  | 8 +++++---
 5 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index dda9065..bd4d8a1 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -4,7 +4,11 @@
         <div class="content">
             {{ partial "page-heading.html" . }}
             <div class="markdown">
-                {{ .Content }}
+                {{ if .Site.Params.progressively }}
+                    {{ .Content | replaceRE "<img src=(.*)\\/(.*) alt=(.*)>" "<figure class=\"progressive\"><img class=\"progressive__img progressive--not-loaded\" data-progressive=$1/high/$2 src=$1/low/$2 alt=$3></figure>" | safeHTML }}
+                {{ else }}
+                    {{ .Content }}
+                {{ end }}
             </div>
         </div>
     </div>
diff --git a/layouts/blog/single.html b/layouts/blog/single.html
index cc92388..72fe358 100644
--- a/layouts/blog/single.html
+++ b/layouts/blog/single.html
@@ -13,7 +13,11 @@
                 </div>
             </div>
             <div class="markdown">
-                {{ .Content | replaceRE "<img src=(.*)\\/(.*) alt=(.*)>" "<figure class=\"progressive\"><img class=\"progressive__img progressive--not-loaded\" data-progressive=$1/high/$2 src=$1/low/$2 alt=$3></figure>" | safeHTML }}
+                {{ if .Site.Params.progressively }}
+                    {{ .Content | replaceRE "<img src=(.*)\\/(.*) alt=(.*)>" "<figure class=\"progressive\"><img class=\"progressive__img progressive--not-loaded\" data-progressive=$1/high/$2 src=$1/low/$2 alt=$3></figure>" | safeHTML }}
+                {{ else }}
+                    {{ .Content }}
+                {{ end }}
                 <br>
                 <p><a href="{{ .Section }}">Back to posts</a></p>
             </div>
diff --git a/layouts/partials/footer_scripts.html b/layouts/partials/footer_scripts.html
index 9ba77f4..940c311 100644
--- a/layouts/partials/footer_scripts.html
+++ b/layouts/partials/footer_scripts.html
@@ -9,7 +9,9 @@
   </script>
 {{ end }}
 
-<script src="{{ .Site.BaseURL }}js/progressively.min.js"></script>
-<script>
+{{ if .Site.Params.progressively }}
+  <script src="{{ .Site.BaseURL }}js/progressively.min.js"></script>
+  <script>
     progressively.init({delay: 50, throttle: 300});
-</script>
\ No newline at end of file
+  </script>
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/head_includes.html b/layouts/partials/head_includes.html
index c5faf9e..cbd4ac7 100644
--- a/layouts/partials/head_includes.html
+++ b/layouts/partials/head_includes.html
@@ -7,7 +7,9 @@
 <link rel="stylesheet" href="{{ .Site.BaseURL }}css/reset.css">
 <link rel="stylesheet" href="{{ .Site.BaseURL }}css/main.css">
 
-<link rel="stylesheet" href="{{ .Site.BaseURL }}css/progressively.min.css">
+{{ if .Site.Params.progressively }}
+  <link rel="stylesheet" href="{{ .Site.BaseURL }}css/progressively.min.css">
+{{ end }}
 
 {{range .Site.Params.extracssfiles}}
     <link rel="stylesheet" href="{{.}}">
diff --git a/static/css/main.css b/static/css/main.css
index de0416f..75923fa 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -583,9 +583,6 @@ a {
 a:hover {
   color: #2a6496;
 }
-img {
-  max-width: 100%;
-}
 img.profile {
   min-width: 100%;
 }
@@ -747,6 +744,7 @@ section.main .content .markdown figure {
 section.main .content .markdown figure img {
   height: 100%;
   width: auto;
+  max-width: 100%;
   display: block;
   position: static;
   margin: auto;
@@ -772,6 +770,10 @@ section.main .content .markdown figure img {
     width: 110%;
     margin-left: -5%;
   }
+  section.main .content .markdown img {
+    width: 110%;
+    margin-left: -5%;
+  }
 }
 section.main .content .markdown table {
   margin-bottom: 1rem;