diff --git a/layouts/_default/_markup/render-image.html b/layouts/_default/_markup/render-image.html
index a79cddf..b92397e 100644
--- a/layouts/_default/_markup/render-image.html
+++ b/layouts/_default/_markup/render-image.html
@@ -1,10 +1,10 @@
{{- if .Title -}}
- {{- dict "Src" .Destination "Title" .Text "Caption" .Title "Linked" true "Resources" .Page.Resources | partial "plugin/image.html" -}}
+ {{- dict "Src" .Destination "Title" .Text "Caption" .Title "Linked" true "Resources" .Page.Resources | partial "plugin/img.html" -}}
{{- .Title | safeHTML -}}
{{- else -}}
- {{- dict "Src" .Destination "Title" .Text "Resources" .Page.Resources | partial "plugin/image.html" -}}
+ {{- dict "Src" .Destination "Title" .Text "Resources" .Page.Resources | partial "plugin/img.html" -}}
{{- end -}}
diff --git a/layouts/_default/_markup/render-link.html b/layouts/_default/_markup/render-link.html
index 0c05396..f10d441 100644
--- a/layouts/_default/_markup/render-link.html
+++ b/layouts/_default/_markup/render-link.html
@@ -3,4 +3,4 @@
{{- $destination = .RelPermalink -}}
{{- end -}}
{{- $options := dict "Destination" $destination "Title" .Title "Content" .Text -}}
-{{- partial "plugin/link.html" $options -}}
+{{- partial "plugin/a.html" $options -}}
diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html
index 6d40d6a..3689b71 100644
--- a/layouts/_default/summary.html
+++ b/layouts/_default/summary.html
@@ -12,7 +12,7 @@
{{- with $image -}}
{{- end -}}
@@ -28,7 +28,7 @@
{{- $authorLink := $params.authorlink | default .Site.Author.link | default .Site.Home.RelPermalink -}}
{{- $options := dict "Class" "author" "Destination" $authorLink "Title" "Author" "Rel" "author" "Icon" (dict "Class" "fas fa-user-circle fa-fw") "Content" $author -}}
- {{- partial "plugin/link.html" $options -}}
+ {{- partial "plugin/a.html" $options -}}
{{- with .Site.Params.dateFormat | default "2006-01-02" | .PublishDate.Format -}}
diff --git a/layouts/partials/head/link.html b/layouts/partials/head/link.html
index 0473ce9..e944cdd 100644
--- a/layouts/partials/head/link.html
+++ b/layouts/partials/head/link.html
@@ -30,17 +30,17 @@
{{- end -}}
{{- /* style.min.css */ -}}
-{{- $style := dict "Source" "css/style.scss" "Fingerprint" $fingerprint -}}
-{{- $options := dict "targetPath" "css/style.min.css" "enableSourceMap" true -}}
-{{- $style = dict "Context" . "ToCSS" $options | merge $style -}}
-{{- partial "plugin/style.html" $style -}}
+{{- $options := dict "Source" "css/style.scss" "Fingerprint" $fingerprint -}}
+{{- $toCSS := dict "targetPath" "css/style.min.css" "enableSourceMap" true -}}
+{{- $options = dict "Context" . "ToCSS" $toCSS | merge $options -}}
+{{- partial "plugin/style.html" $options -}}
{{- /* Font Awesome */ -}}
{{- $source := $cdn.fontawesomeFreeCSS | default "lib/fontawesome-free/all.min.css" -}}
-{{- $style := dict "Source" $source "Fingerprint" $fingerprint -}}
-{{- partial "plugin/style.html" $style -}}
+{{- $options := dict "Source" $source "Fingerprint" $fingerprint "Preload" true -}}
+{{- partial "plugin/style.html" $options -}}
{{- /* Animate.css */ -}}
{{- $source := $cdn.animateCSS | default "lib/animate/animate.min.css" -}}
-{{- $style := dict "Source" $source "Fingerprint" $fingerprint -}}
-{{- partial "plugin/style.html" $style -}}
+{{- $options := dict "Source" $source "Fingerprint" $fingerprint "Preload" true -}}
+{{- partial "plugin/style.html" $options -}}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 9817779..092f474 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -5,7 +5,7 @@
{{- with .Site.Params.header.title -}}
{{- with .logo -}}
- {{- dict "Src" . "Class" "logo" | partial "plugin/image.html" -}}
+ {{- dict "Src" . "Class" "logo" | partial "plugin/img.html" -}}
{{- end -}}
{{- with .pre -}}
@@ -92,7 +92,7 @@
{{- with .Site.Params.header.title -}}
{{- with .logo -}}
- {{- dict "Src" . "Class" "logo" | partial "plugin/image.html" -}}
+ {{- dict "Src" . "Class" "logo" | partial "plugin/img.html" -}}
{{- end -}}
{{- with .pre -}}
diff --git a/layouts/partials/home/profile.html b/layouts/partials/home/profile.html
index b453fad..db715db 100644
--- a/layouts/partials/home/profile.html
+++ b/layouts/partials/home/profile.html
@@ -13,10 +13,10 @@
{{- $url = .RelPermalink -}}
{{- end -}}
- {{- dict "Src" $avatar | partial "plugin/image.html" -}}
+ {{- dict "Src" $avatar | partial "plugin/img.html" -}}
{{- else -}}
- {{- dict "Src" $avatar | partial "plugin/image.html" -}}
+ {{- dict "Src" $avatar | partial "plugin/img.html" -}}
{{- end -}}
{{- end -}}
diff --git a/layouts/partials/plugin/link.html b/layouts/partials/plugin/a.html
similarity index 98%
rename from layouts/partials/plugin/link.html
rename to layouts/partials/plugin/a.html
index 83da75f..ceaefc6 100644
--- a/layouts/partials/plugin/link.html
+++ b/layouts/partials/plugin/a.html
@@ -6,4 +6,4 @@
{{- with .Content -}}
{{- . | safeHTML -}}
{{- end -}}
-
+
\ No newline at end of file
diff --git a/layouts/partials/plugin/image.html b/layouts/partials/plugin/img.html
similarity index 100%
rename from layouts/partials/plugin/image.html
rename to layouts/partials/plugin/img.html
diff --git a/layouts/partials/plugin/script.html b/layouts/partials/plugin/script.html
index e12e74e..9b9fa37 100644
--- a/layouts/partials/plugin/script.html
+++ b/layouts/partials/plugin/script.html
@@ -1,25 +1,41 @@
-{{- if .Content -}}
-
-{{- else if strings.HasPrefix .Source "
{{- else -}}
- {{- $src := .Source -}}
- {{- $integrity := .Integrity -}}
- {{- if (urls.Parse $src).Host | not -}}
- {{- $resource := resources.Get $src -}}
- {{- with .Template -}}
- {{- $resource = $resource | resources.ExecuteAsTemplate . $.Context -}}
+ {{- if strings.HasPrefix .Source "
{{- end -}}
-
{{- end -}}
diff --git a/layouts/partials/plugin/social.html b/layouts/partials/plugin/social.html
index e6d2005..67a27b7 100644
--- a/layouts/partials/plugin/social.html
+++ b/layouts/partials/plugin/social.html
@@ -8,4 +8,4 @@
{{- end -}}
{{- $destination = printf (string $template) .Id -}}
{{- end -}}
-{{- dict "Destination" $destination "Rel" "me" | merge . | partial "plugin/link.html" -}}
+{{- dict "Destination" $destination "Rel" "me" | merge . | partial "plugin/a.html" -}}
diff --git a/layouts/partials/plugin/style.html b/layouts/partials/plugin/style.html
index 9c9c989..c6e42a0 100644
--- a/layouts/partials/plugin/style.html
+++ b/layouts/partials/plugin/style.html
@@ -27,5 +27,20 @@
{{- end -}}
{{- $href = $resource.RelPermalink -}}
{{- end -}}
-
+ {{- $attrs := printf `href="%v"` $href -}}
+ {{- if .Crossorigin -}}
+ {{- $attrs = ` crossorigin="anonymous"` | add $attrs -}}
+ {{- end -}}
+ {{- with $integrity -}}
+ {{- $attrs = printf ` integrity="%v"` . | add $attrs -}}
+ {{- end -}}
+ {{- with .Attr -}}
+ {{- $attrs = add " " . | add $attrs -}}
+ {{- end -}}
+ {{- if .Preload -}}
+
+
+ {{- else -}}
+
+ {{- end -}}
{{- end -}}
diff --git a/layouts/posts/single.html b/layouts/posts/single.html
index 56e816f..d37ed47 100644
--- a/layouts/posts/single.html
+++ b/layouts/posts/single.html
@@ -34,7 +34,7 @@
{{- $authorLink := $params.authorlink | default .Site.Author.link | default .Site.Home.RelPermalink -}}
{{- $options := dict "Class" "author" "Destination" $authorLink "Title" "Author" "Rel" "author" "Icon" (dict "Class" "fas fa-user-circle fa-fw") "Content" $author -}}
- {{- partial "plugin/link.html" $options -}}
+ {{- partial "plugin/a.html" $options -}}
{{- $categories := slice -}}
@@ -70,7 +70,7 @@
{{- end -}}
{{- with $image -}}
- {{- dict "Src" . "Title" $.Description "Resources" $.Resources | partial "plugin/image.html" -}}
+ {{- dict "Src" . "Title" $.Description "Resources" $.Resources | partial "plugin/img.html" -}}
{{- end -}}
diff --git a/layouts/shortcodes/image.html b/layouts/shortcodes/image.html
index 4bb365a..ec010f0 100644
--- a/layouts/shortcodes/image.html
+++ b/layouts/shortcodes/image.html
@@ -19,11 +19,11 @@
{{- with $caption -}}
- {{- partial "plugin/image.html" $options -}}
+ {{- partial "plugin/img.html" $options -}}
{{- . | safeHTML -}}
{{- else -}}
- {{- partial "plugin/image.html" $options -}}
+ {{- partial "plugin/img.html" $options -}}
{{- end -}}
diff --git a/layouts/shortcodes/link.html b/layouts/shortcodes/link.html
index cac09e9..ab11a49 100644
--- a/layouts/shortcodes/link.html
+++ b/layouts/shortcodes/link.html
@@ -12,4 +12,4 @@
{{- $options = dict "Content" (.Get 1 | default (.Get 0)) | merge $options -}}
{{- $options = dict "Title" (.Get 2) | merge $options -}}
{{- end -}}
-{{- partial "plugin/link.html" $options -}}
+{{- partial "plugin/a.html" $options -}}
diff --git a/layouts/shortcodes/version.html b/layouts/shortcodes/version.html
index 904be2d..d987558 100644
--- a/layouts/shortcodes/version.html
+++ b/layouts/shortcodes/version.html
@@ -9,5 +9,5 @@
{{- $resource = $resource | resources.ExecuteAsTemplate $path (dict "version" $version "label" $label "color" $color) | minify -}}
{{- $alt := printf "LoveIt %v | %v" $label $version -}}
- {{- dict "Src" $resource.RelPermalink "Alt" $alt "Class" "version" | partial "plugin/image.html" -}}
+ {{- dict "Src" $resource.RelPermalink "Alt" $alt "Class" "version" | partial "plugin/img.html" -}}
\ No newline at end of file