Revert "Merge branch 'canary' into master" (#712)

Revert "Merge branch 'canary' into master (#711)"

This reverts commit 8a597a5c9c.

layouts/_default/_markup/render-codeblock.html

@@ -1,20 +0,0 @@
-{{- $class := .Attributes.class | default ""    -}}
-{{- $lang  := .Attributes.lang  | default .Type -}}
-<div class="codeblock">
-    <header>
-        <span class="codeblock-lang">{{ $lang }}</span>
-        <button 
-            class="codeblock-copy"
-            data-id="codeblock-id-{{ .Ordinal }}"
-            data-copied-text="{{ T `article.codeblock.copied` }}"
-        >
-            {{ T `article.codeblock.copy` }}
-        </button>
-    </header>
-    <code id="codeblock-id-{{ .Ordinal }}" style="display:none;">{{- .Inner -}}</code>
-    {{- if transform.CanHighlight $lang -}}
-    <div class="{{ $class }}">{{- highlight .Inner $lang -}}</div>
-    {{- else -}}
-    <pre><code class="{{ $class }}">{{- .Inner -}}</code></pre>
-    {{- end -}}
-</div>

layouts/_default/_markup/render-image.html

@@ -17,7 +17,7 @@
 		{{- $Height = $image.Height -}}
 		{{- $galleryImage = true -}}
 
-		{{- if .Page.Site.Params.imageProcessing.content.enabled -}}
+		{{- if (default true .Page.Site.Params.imageProcessing.content.enabled) -}}
 			{{- $small := $image.Resize `480x` -}}
 			{{- $big := $image.Resize `1024x` -}}
 			{{- $Srcset = printf `%s 480w, %s 1024w` $small.RelPermalink $big.RelPermalink -}}