Merge pull request #1493 from gethinode/develop

Develop

layouts/_partials/assets/helpers/image-definition.html

@@ -77,10 +77,10 @@
         {{- with $wrapper }}<div class="{{ . }}">{{ end }}
     {{- end -}}
     {{- if $data -}}
-        {{- if site.Params.debugging.includeSVGOrigin -}}
+        {{- if and site.Params.debugging.includeSVGOrigin $.url -}}
             {{- printf "{{/* <svg src=\"%s\"> */}}" $.url | safeHTML -}}
         {{- end -}}
-        {{- $data = replace $data "<svg" (printf "<svg class=\"%s\"" $args.class) -}}
+        {{- with $args.class }}{{ $data = replace $data "<svg" (printf "<svg class=\"%s\"" .) }}{{ end -}}
         {{- $data | safeHTML -}}
     {{- else if not $fileAnchor -}}
         <img class="img-fluid {{ $args.class }}"

layouts/_partials/assets/helpers/image-dimension.html

@@ -67,7 +67,9 @@
 {{- if hasSuffix $src "svg" -}}
     {{- $res = partial "utilities/GetResource.html" (dict "url" $src "page" $args.page) -}}
     {{ if not $res }}
-        {{- $targetURL := partial "utilities/GetStaticURL" (dict "url" (strings.TrimPrefix "/static" $src)) -}}
+        {{- $targetURL := strings.TrimPrefix "/static" $src -}}
+        {{- $u := urls.Parse site.BaseURL }}
+        {{- $targetURL = strings.TrimPrefix $u.Path $src -}}
         {{- if not (fileExists (path.Join "/static" $targetURL)) -}}
             {{ warnf "Cannot find vector image resource: %q" $src -}}
         {{ else }}