Fix gohugoio/hugoThemes#858

author: Ralf Geschke <ralf@kuerbis.org> 2020-05-31 16:13:06 +0300
committer: Ralf Geschke <ralf@kuerbis.org> 2020-05-31 16:13:06 +0300
commit: 85fa1db81690ec236fdbcfb097344b2ef3e301c6 (patch)
tree: 875d35203f30e2b3c4e5a09390fe8d44509ca0d0
parent: af5722f1f525a931388f8118e0f29c45ebfb214a (diff)
8 files changed, 23 insertions, 13 deletions
diff --git a/exampleSite/content/sections/footer/column01.md b/exampleSite/content/sections/footer/column01.md
index 5e95969..586d504 100644
--- a/exampleSite/content/sections/footer/column01.md
+++ b/exampleSite/content/sections/footer/column01.md
@@ -1,3 +1,5 @@
+---
+---
 <div>
 This is a placeholder for a content file of the footer. You can use Markdown or HTML here. Just place your content files into a folder "sections/footer" in your content directory, make the page bundle "headless" and enable the footer in the site config file.
 </div>
diff --git a/exampleSite/content/sections/footer/column02.md b/exampleSite/content/sections/footer/column02.md
index 56e1085..6d18327 100644
--- a/exampleSite/content/sections/footer/column02.md
+++ b/exampleSite/content/sections/footer/column02.md
@@ -1 +1,4 @@
+---
+---
+
 More content. 
 \ No newline at end of file
diff --git a/exampleSite/content/sections/footer/column03.md b/exampleSite/content/sections/footer/column03.md
index 90a55bf..ae541fb 100644
--- a/exampleSite/content/sections/footer/column03.md
+++ b/exampleSite/content/sections/footer/column03.md
@@ -1,3 +1,6 @@
+---
+---
+
 Again more content. And an example of creating links in the footer area. 
 <br/>
 [About](/about/)
diff --git a/exampleSite/content/sections/subfooter/content.md b/exampleSite/content/sections/subfooter/content.md
index a4fd3ec..7265009 100644
--- a/exampleSite/content/sections/subfooter/content.md
+++ b/exampleSite/content/sections/subfooter/content.md
@@ -1 +1,3 @@
+---
+---
 Powered by [Hugo](https://gohugo.io). Theme [Tikva](https://github.com/geschke/hugo-tikva) by [Ralf Geschke](https://www.kuerbis.org). As you can see, this is an example of the area below the footer. You can change this.
 \ No newline at end of file
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index d291ac1..dadb15f 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{- default "" .Site.LanguageCode -}}">
+<html lang="{{- .Site.LanguageCode | default "" -}}">
 {{ partial "head.html" . }}
 
 <body>
@@ -14,13 +14,13 @@
         <div class="container">
             <div class="row">
 
-                {{- if and (default false .Site.Params.Sidebar.Enabled) (eq "left" (default "right" .Site.Params.Sidebar.Style)) }}
+                {{- if and (default false .Site.Params.Sidebar.Enabled) (eq "left" (.Site.Params.Sidebar.Style | default "right" )) }}
                 {{ partial "sidebar_container.html" . }}
                 {{- end -}}  
                 <div class="col-md" id="content">
                     {{- block "main" . }}{{- end }}
                 </div>
-                {{- if and (default false .Site.Params.Sidebar.Enabled) (eq "right" (default "right" .Site.Params.Sidebar.Style)) }}
+                {{- if and (default false .Site.Params.Sidebar.Enabled) (eq "right" (.Site.Params.Sidebar.Style | default "right" )) }}
                     {{ partial "sidebar_container.html" . }}
                 {{- end -}}                
             </div>
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 2cc83cf..3319bdd 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,6 +1,6 @@
 {{ define "main" }}
 
-{{ $dateFormat := default "Mon Jan 2, 2006" .Site.Params.DateFormat }}
+{{ $dateFormat := .Site.Params.DateFormat | default "Mon Jan 2, 2006" }}
 {{ $author :=  .Params.author | default .Site.Params.author }}
 {{ $showNumberOfWords := .Params.ShowNumberOfWords | default .Site.Params.ShowNumberOfWords  }}
 
diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html
index 6a75cb0..41bf339 100644
--- a/layouts/_default/summary.html
+++ b/layouts/_default/summary.html
@@ -1,4 +1,4 @@
-{{ $dateFormat := default "Mon Jan 2, 2006" .Site.Params.DateFormat }}
+{{ $dateFormat := .Site.Params.DateFormat | default "Mon Jan 2, 2006"}}
 {{ $author :=  .Params.author | default .Site.Params.author }}
 
 <article class="mb-5 post">
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 56e85a0..a895452 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -48,7 +48,7 @@
 {{- $overlayBackgroundColor := printf " rgba(%d,%d,%d,%s)" $rr $gg $bb $overlayBackgroundTranspHex -}}
 
 <style>
-{{- $navbarStyle := default "fixed-top" .Site.Params.Navbar.Style -}}
+{{- $navbarStyle := .Site.Params.Navbar.Style | default "fixed-top" -}}
 
 body {
 
@@ -270,16 +270,16 @@ body {
     {{ if or .Site.Params.Theme.Header.OverlayDistanceVertical .Site.Params.Theme.Header.OverlayDistanceHorizontal }}
     <style type="text/css">
         #site-header-container-overlay {
-        {{ if (eq .Site.Params.Theme.Header.OverlayAlignment "lt") or (eq .Site.Params.Theme.Header.OverlayAlignment "lb") }}
+        {{ if or (eq .Site.Params.Theme.Header.OverlayAlignment "lt") (eq .Site.Params.Theme.Header.OverlayAlignment "lb") }}
             left: {{ .Site.Params.Theme.Header.OverlayDistanceHorizontal }}px;
-        {{ else if (eq .Site.Params.Theme.Header.OverlayAlignment "mt") or ( eq .Site.Params.Theme.Header.OverlayAlignment "mb") }}
+        {{ else if or (eq .Site.Params.Theme.Header.OverlayAlignment "mt") ( eq .Site.Params.Theme.Header.OverlayAlignment "mb") }}
             
-        {{ else if (eq .Site.Params.Theme.Header.OverlayAlignment "rt") or ( eq .Site.Params.Theme.Header.OverlayAlignment "rb") }}
+        {{ else if or (eq .Site.Params.Theme.Header.OverlayAlignment "rt") ( eq .Site.Params.Theme.Header.OverlayAlignment "rb") }}
             right: {{ .Site.Params.Theme.Header.OverlayDistanceHorizontal }}px;
         {{ end }}
-        {{ if (eq .Site.Params.Theme.Header.OverlayAlignment "lt") or (eq .Site.Params.Theme.Header.OverlayAlignment "mt") or (eq .Site.Params.Theme.Header.OverlayAlignment "rt") }}
+        {{ if or (eq .Site.Params.Theme.Header.OverlayAlignment "lt") (eq .Site.Params.Theme.Header.OverlayAlignment "mt") (eq .Site.Params.Theme.Header.OverlayAlignment "rt") }}
             top: {{ .Site.Params.Theme.Header.OverlayDistanceVertical }}px;
-        {{ else if ( eq .Site.Params.Theme.Header.OverlayAlignment "lb") or ( eq .Site.Params.Theme.Header.OverlayAlignment "mb") or ( eq .Site.Params.Theme.Header.OverlayAlignment "rb") }}
+        {{ else if or ( eq .Site.Params.Theme.Header.OverlayAlignment "lb") ( eq .Site.Params.Theme.Header.OverlayAlignment "mb")  ( eq .Site.Params.Theme.Header.OverlayAlignment "rb") }}
             bottom: {{ .Site.Params.Theme.Header.OverlayDistanceVertical }}px;
         {{ end }}
         }
@@ -289,8 +289,8 @@ body {
 {{ end }}
 {{ "<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->" | safeHTML }}
 {{ "<!--[if lt IE 9]>" | safeHTML }}
-        <script src="//oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-        <script src="//oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+        <script src="//cdn.jsdelivr.net/npm/html5shiv@3.7.3/dist/html5shiv.min.js"></script>
+        <script src="//cdn.jsdelivr.net/npm/respond.js@1.4.2/dest/respond.min.js"></script>
 {{ "<![endif]-->" | safeHTML }}
 {{- partial "head_includes.html" . }}
author	Ralf Geschke <ralf@kuerbis.org>	2020-05-31 16:13:06 +0300
committer	Ralf Geschke <ralf@kuerbis.org>	2020-05-31 16:13:06 +0300
commit	85fa1db81690ec236fdbcfb097344b2ef3e301c6 (patch)
tree	875d35203f30e2b3c4e5a09390fe8d44509ca0d0
parent	af5722f1f525a931388f8118e0f29c45ebfb214a (diff)