From c56020be63121366d0af809f4c536e0d91305633 Mon Sep 17 00:00:00 2001
From: Alessandro Bahgat <ale.bahgat@gmail.com>
Date: Thu, 11 Jul 2019 16:57:10 -0400
Subject: [PATCH] fix: improve HTML5 validation: remove nested `<p>`s

Blackfriday automatically wraps Markdown `Content` text in `<p>` tags.
No need to wrap in additional `<p>` tags (which is also invalid HTML).

See #1197
---
 layouts/partials/widgets/accomplishments.html | 2 +-
 layouts/partials/widgets/contact.html         | 2 +-
 layouts/partials/widgets/experience.html      | 2 +-
 layouts/partials/widgets/featured.html        | 2 +-
 layouts/partials/widgets/featurette.html      | 2 +-
 layouts/partials/widgets/pages.html           | 2 +-
 layouts/partials/widgets/people.html          | 2 +-
 layouts/partials/widgets/portfolio.html       | 2 +-
 layouts/partials/widgets/tag_cloud.html       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/layouts/partials/widgets/accomplishments.html b/layouts/partials/widgets/accomplishments.html
index 7a52a386..c9a8cf25 100644
--- a/layouts/partials/widgets/accomplishments.html
+++ b/layouts/partials/widgets/accomplishments.html
@@ -8,7 +8,7 @@
     {{ with $page.Params.subtitle }}<p>{{ . | markdownify }}</p>{{ end }}
   </div>
   <div class="col-12 col-lg-8">
-    {{ with $page.Content }}<p>{{ . | markdownify }}</p>{{ end }}
+    {{ with $page.Content }}{{ . }}{{ end }}
 
     {{ if $page.Params.item }}
     {{ range $idx, $key := sort $page.Params.item ".date_start" "desc" }}
diff --git a/layouts/partials/widgets/contact.html b/layouts/partials/widgets/contact.html
index c92ab9be..e48116dd 100644
--- a/layouts/partials/widgets/contact.html
+++ b/layouts/partials/widgets/contact.html
@@ -9,7 +9,7 @@
     {{ with $page.Params.subtitle }}<p>{{ . | markdownify }}</p>{{ end }}
   </div>
   <div class="col-12 col-lg-8">
-    {{ with $page.Content }}<p>{{ . | markdownify }}</p>{{ end }}
+    {{ with $page.Content }}{{ . }}{{ end }}
 
     {{ if $page.Params.email_form }}
 
diff --git a/layouts/partials/widgets/experience.html b/layouts/partials/widgets/experience.html
index cbfd5b2b..77bba116 100644
--- a/layouts/partials/widgets/experience.html
+++ b/layouts/partials/widgets/experience.html
@@ -8,7 +8,7 @@
     {{ with $page.Params.subtitle }}<p>{{ . | markdownify }}</p>{{ end }}
   </div>
   <div class="col-12 col-lg-8">
-    {{ with $page.Content }}<p>{{ . | markdownify }}</p>{{ end }}
+    {{ with $page.Content }}{{ . }}{{ end }}
 
     {{ if $page.Params.experience }}
     {{ $exp_len := len $page.Params.experience }}
diff --git a/layouts/partials/widgets/featured.html b/layouts/partials/widgets/featured.html
index c4e47364..1b5948e5 100644
--- a/layouts/partials/widgets/featured.html
+++ b/layouts/partials/widgets/featured.html
@@ -38,7 +38,7 @@
   </div>
   <div class="col-12 col-lg-8">
 
-    {{ with $st.Content }}<p>{{ . }}</p>{{ end }}
+    {{ with $st.Content }}{{ . }}{{ end }}
 
     {{ range $post := $query }}
       {{ if eq $st.Params.design.view 1 }}
diff --git a/layouts/partials/widgets/featurette.html b/layouts/partials/widgets/featurette.html
index 1aed522c..28e591ab 100644
--- a/layouts/partials/widgets/featurette.html
+++ b/layouts/partials/widgets/featurette.html
@@ -11,7 +11,7 @@
 
   {{ with $page.Content }}
   <div class="col-md-12">
-    <p>{{ . | markdownify }}</p>
+    {{ . }}
   </div>
   {{ end }}
 
diff --git a/layouts/partials/widgets/pages.html b/layouts/partials/widgets/pages.html
index f3de4bd6..9f9a1d14 100644
--- a/layouts/partials/widgets/pages.html
+++ b/layouts/partials/widgets/pages.html
@@ -72,7 +72,7 @@
   </div>
   <div class="col-12 col-lg-8">
 
-    {{ with $st.Content }}<p>{{ . }}</p>{{ end }}
+    {{ with $st.Content }}{{ . }}{{ end }}
 
     {{ range $post := $query }}
       {{ if eq $st.Params.design.view 1 }}
diff --git a/layouts/partials/widgets/people.html b/layouts/partials/widgets/people.html
index be3fdea9..bbb08ea1 100644
--- a/layouts/partials/widgets/people.html
+++ b/layouts/partials/widgets/people.html
@@ -11,7 +11,7 @@
 
   {{ with $page.Content }}
   <div class="col-md-12">
-    <p>{{ . }}</p>
+    {{ . }}
   </div>
   {{ end }}
 
diff --git a/layouts/partials/widgets/portfolio.html b/layouts/partials/widgets/portfolio.html
index 08990c26..84b0c21d 100644
--- a/layouts/partials/widgets/portfolio.html
+++ b/layouts/partials/widgets/portfolio.html
@@ -30,7 +30,7 @@
   <div>
 {{ end }}
 
-    {{ with $st.Content }}<p>{{ . }}</p>{{ end }}
+    {{ with $st.Content }}{{ . }}{{ end }}
 
     {{ if $st.Params.content.filter_button }}
 
diff --git a/layouts/partials/widgets/tag_cloud.html b/layouts/partials/widgets/tag_cloud.html
index 3b96a006..6bf26106 100644
--- a/layouts/partials/widgets/tag_cloud.html
+++ b/layouts/partials/widgets/tag_cloud.html
@@ -7,7 +7,7 @@
     {{ with $page.Params.subtitle }}<p>{{ . | markdownify | emojify }}</p>{{ end }}
   </div>
   <div class="col-12 col-lg-8">
-    {{ with $page.Content }}<p>{{ . }}</p>{{ end }}
+    {{ with $page.Content }}{{ . }}{{ end }}
 
     {{ if not (eq (len site.Taxonomies.tags) 0) }}
       {{ $fontSmall := 0.8 }}