Merge pull request #1600 from gethinode/develop

Develop

Author: markdumay

layouts/_partials/assets/featured-illustration.html

@@ -44,7 +44,7 @@
         {{ partial "assets/icon.html" (dict "icon" $icon "wrapper" $wrapper) -}}
     {{- end -}}
 {{- else if $image -}}
-    {{- if not (hasSuffix $image "svg") }}{{ $class = printf "%s rounded" $class }}{{ end -}}
+    {{- if not (hasSuffix $image "svg") }}{{ $class = strings.TrimSpace (printf "%s rounded" (or $class "")) }}{{ end -}}
     {{- partial "assets/live-image.html" (dict
         "src"      $image
         "anchor"   $args.anchor

layouts/_partials/assets/hero-image.html

@@ -17,7 +17,7 @@
 {{ end }}
 
 {{ if and (not $args.err) (or $args.image $args.icon) }}
-    <div class="hero-image-container {{ if $args.image }}{{ with $args.justify }}d-flex justify-content-center justify-content-md-{{ . }}{{ end }}{{ end }}">
+    <div class="hero-image-container {{ if $args.image }}d-flex justify-content-center {{ with $args.justify }} justify-content-md-{{ . }}{{ end }}{{ end }}">
         {{ partial "assets/featured-illustration.html" (dict 
             "page"    $args.page
             "icon"    $args.icon

layouts/_partials/assets/hero.html

@@ -31,7 +31,7 @@
 {{ $justify := $args.illustration.justify }}
 
 {{ if and $args.illustration.image $scale }}
-    {{ $class = trim (printf "%s col-%d text-center text-md-%s" $class $scale $justify) " " }}
+    {{ $class = trim (printf "%s col-%d text-center text-md-%s" $class $scale (or $justify "center")) " " }}
 {{ else }}
     {{ $scale = 12 }}
 {{ end }}
@@ -68,7 +68,7 @@
         </div>
     {{ end }}
 
-    {{ $imageWrapper := printf "mx-md-0 text-center text-md-%s %s" $justify $class }}
+    {{ $imageWrapper := printf "mx-md-0 text-center text-md-%s %s" (or $justify "center") $class }}
     {{ $imageJustify := "" }}
     {{ if eq $args.orientation "stacked" }}
         {{ $imageWrapper = printf "pt-%d text-center %s" $padding.y $class }}
@@ -96,7 +96,7 @@
     {{ end }}
 
     {{ $illustration := "" }}
-    {{ if or $args.illustration.image  $args.illustration.icon }}
+    {{ if or $args.illustration.image $args.illustration.icon }}
         {{ $illustration = partial $args.hook (dict
             "page"          $args.page
             "image"         $args.illustration.image
@@ -107,7 +107,7 @@
             "sizes"         $sizes
             "title"         (T "heroImage")
             "wrapper"       $imageWrapper
-            "class"         (printf "hero-image %s" $args.illustration.class)
+            "class"         (strings.TrimSpace (printf "hero-image %s" (or $args.illustration.class "")))
             "image-overlay" $args.imageOverlay
             "justify"       $imageJustify
         ) }}