Merge remote-tracking branch 'origin/master' into pr/45

# Conflicts:
#	layouts/index.html

exampleSite/content/_index.md

@@ -3,6 +3,7 @@
 header_image: "images/cover-image.jpg"
 # Optional header logo. CSS: `#blog-logo`, with max-height defined, optimize to prevent scaling
 header_logo: "images/chef-hat.png"
+# Headers are safeHTML, you can use HTML tags such as b,i,u,br
 header_headline: "Jane Doe"
-header_subheadline: "Hi there , I am a Nutrition Coach & Chef Consultant"
+header_subheadline: "<b>Nutrition</b> Coach & <b>Chef</b> Consultant"
 ---

layouts/index.html

@@ -10,13 +10,13 @@
             {{ with .Params.header_logo }}<img id="blog-logo" src="{{ . }}" />{{ end }}
             {{ if .Site.Params.title_guard }}<div class="title-and-description-guard">{{ end }}
             {{ with .Params.header_headline }}<h1 class="blog-title">{{ . | safeHTML }}</h1>{{ end }}
-            {{ with .Params.header_subheadline }}<h2 class="blog-description">{{ . }}</h2>{{ end }}
+            {{ with .Params.header_subheadline }}<h2 class="blog-description">{{ . | safeHTML }}</h2>{{ end }}
             {{ if .Site.Params.title_guard }}</div>{{ end }}
             {{ range where $sections ".Params.header_menu" "eq" true }}
                 {{ $button_title := .Title }}
                 {{ with .Params.header_menu_title }}{{ $button_title = . }}{{ end }}
               {{ if isset .Params "external" }}
-                 <a class='btn site-menu' href='{{ .Params.external }}'>{{ $button_title }} <icon class="fa fa-external-link"></icon></a>
+                 <a class='btn site-menu' href='{{ .Params.external  }}'>{{ $button_title }} <icon class="fa fa-external-link"></icon></a>
               {{ else }}
                  <a class='btn site-menu' data-title-anchor='{{ anchorize .Title }}'>{{ $button_title }}</a>
               {{ end }}
@@ -35,7 +35,7 @@
         <div class='post-holder'>
             <article id='{{ anchorize .Title }}' class='post {{ if eq $index_val 0 }}first{{ end }} {{ if eq (add $index_val 1) (len $sections) }}last{{ end }}'>
                 <header class="post-header">
-                    <h2 class="post-title" data-fnav-title="{{ safeHTMLAttr $fnav_title }}">{{ .Title }}</h2>
+                    <h2 class="post-title" data-fnav-title="{{ $fnav_title | safeHTMLAttr }}">{{ .Title | safeHTML }}</h2>
                 </header>
                 <section class="post-content">
                     {{ .Content }}

layouts/partials/footer.html

@@ -1,14 +1,16 @@
 <footer class="site-footer">
   <div class="inner">
     {{ with .Site.Params.copyright }}
-      <section class="copyright">{{ . | markdownify }}</section>{{ end }}
+      <section class="copyright">{{ . | safeHTML }}</section>
-
+    {{ end }}
 
     <section>{{ echoParam .Site.Params "hidebyline" }}</section>
+
     {{ if ne .Site.Params.hidedesignbyline true }}
       <section>
         <a href="https://themes.gohugo.io/hugo-scroll/">Hugo Scroll</a> template
-      </section>{{ end }}
+      </section>
+    {{ end }}
 
   </div>
 </footer>