Improve formating of generated code

4 files changed, 21 insertions, 23 deletions

diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index ee88371..934ccc9 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -23,18 +23,18 @@
 
     {{- range .AllTranslations -}}
     <link rel="alternate" hreflang="{{ .Lang }}" href="{{ .Permalink }}">
-    {{ end -}}
+    {{- end }}
 
     <meta name="theme-color" content="#ffffff">
 
-    {{ block "custom-head" . }}{{ partial "custom-head.html" . }}{{ end }}
-    {{ block "custom-scripts" . }}{{ partial "custom-scripts.html" . }}{{ end }}
+    {{- block "custom-head" . }}{{ partial "custom-head.html" . }}{{ end }}
+    {{- block "custom-scripts" . }}{{ partial "custom-scripts.html" . }}{{ end }}
 
     {{- /* Misc */}}
-    {{ template "partials/templates/opengraph.html" . }}
-    {{ template "partials/templates/twitter_cards.html" . }}
-    {{ template "partials/templates/schema_json.html" . }}
+    {{- template "partials/templates/opengraph.html" . }}
+    {{- template "partials/templates/twitter_cards.html" . }}
+    {{- template "partials/templates/schema_json.html" . }}
 
     {{- /* SEO */}}
-    {{ partial "partials/seo/ga.html" . }}
+    {{- partial "partials/seo/ga.html" . }}
 </head>
diff --git a/layouts/partials/schema.org/article.html b/layouts/partials/schema.org/article.html
index 821a1c8..05c8358 100644
--- a/layouts/partials/schema.org/article.html
+++ b/layouts/partials/schema.org/article.html
@@ -1,14 +1,14 @@
 {{- /* Get schema type. */}}
-{{ $schemaType := "Article" }}
-{{ if or (eq .Type "post") (eq .Type "posts") }}
-    {{ $schemaType = "BlogPosting" }}
-{{ end -}}
+{{- $schemaType := "Article" -}}
+{{- if or (eq .Type "post") (eq .Type "posts") -}}
+    {{- $schemaType = "BlogPosting" -}}
+{{- end -}}
 
-{{- $publisher := site.Params.seo.publisher | default site.Title }}
-{{ $logo := resources.Get (site.Params.assets.logo | default "/img/open-graph-logo.png") }}
-{{ $logo = $logo.Resize "96x96" -}}
+{{- $publisher := site.Params.seo.publisher | default site.Title -}}
+{{- $logo := resources.Get (site.Params.assets.logo | default "/img/open-graph-logo.png") -}}
+{{- $logo = $logo.Resize "96x96" }}
 
-<script type="application/ld+json">
+<script type="application/ld+json" id="schema-data">
     {
         "@context": "https://schema.org",
         "@type": {{ $schemaType }},
@@ -62,5 +62,3 @@
         "description": {{ partial "description.html" . }}
     }
 </script>
-
-
diff --git a/layouts/partials/schema.org/website.html b/layouts/partials/schema.org/website.html
index a84d110..c06bd76 100644
--- a/layouts/partials/schema.org/website.html
+++ b/layouts/partials/schema.org/website.html
@@ -1,4 +1,4 @@
-<script type="application/ld+json">
+<script type="application/ld+json" id="schema-data">
     {
         "@context": "https://schema.org",
         "@type": "WebSite",
diff --git a/layouts/partials/templates/twitter_cards.html b/layouts/partials/templates/twitter_cards.html
index ff5412a..23c033b 100644
--- a/layouts/partials/templates/twitter_cards.html
+++ b/layouts/partials/templates/twitter_cards.html
@@ -10,10 +10,10 @@
     {{- $logo := resources.Get (site.Params.assets.logo | default "/img/open-graph-logo.png" ) -}}
 
     {{- if and .IsPage .Params.featured_image }}
-        {{- $image := .Resources.GetMatch .Params.featured_image }}
-        <meta name="twitter:card" content="summary_large_image">
-        <meta name="twitter:image" content="{{ $image.Permalink }}">
+    {{- $image := .Resources.GetMatch .Params.featured_image }}
+    <meta name="twitter:card" content="summary_large_image">
+    <meta name="twitter:image" content="{{ $image.Permalink }}">
     {{- else }}
-        <meta name="twitter:card" content="summary_large_image">
-        <meta name="twitter:image" content="{{ $logo.Permalink }}">
+    <meta name="twitter:card" content="summary_large_image">
+    <meta name="twitter:image" content="{{ $logo.Permalink }}">
     {{- end -}}