Merge pull request #33 from AngeloStavrow/21-broken-div-in-404-html

Fixes broken </div> in 404.html

7 files changed, 49 insertions, 44 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5db3eb6..39a72da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - Better instructions for users that prefer a little more YAML in their lives, thanks to [@zwbetz-gh](https://github.com/zwbetz-gh)!
+- Fix for broken content div in 404.html ([#21](https://github.com/AngeloStavrow/indigo/issues/21))
 - The `src` URL for the site logo had an extra `/`, and now it doesn't, thanks to [@michimani](https://github.com/michimani)!
 
 ## [1.0.3]
diff --git a/layouts/404.html b/layouts/404.html
index fa59383..0a58c13 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -9,10 +9,12 @@
         {{ partial "pagenav.html" . }}
         <h1 class="post-title">404</h1>
     </header>
-    <section>
-        <h2>Whoops.</h2>
-        <p>
-            The page you were looking for doesn't exist. Would you like to <a href="{{ .Site.BaseURL }}">go to the home page</a>?
-        </p>
-    </section>
+    <div id="content">
+        <section>
+            <h2>Whoops.</h2>
+            <p>
+                The page you were looking for doesn't exist. Would you like to <a href="{{ .Site.BaseURL }}">go to the home page</a>?
+            </p>
+        </section>
+    </div>
 {{ partial "footer.html" . }}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 9125770..0f1abe2 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,8 +1,10 @@
 {{ partial "header.html" . }}
 <h2>{{ .Title }}</h2>
+<div id="content">
 {{ range $index, $page := (.Paginate (where .Data.Pages "Type" "post")).Pages }}
 {{ if ne $index 0 }}
 {{ end }}
 {{ .Render "li" }}
 {{ end }}
+</div>
 {{ partial "footer.html" . }}
\ No newline at end of file
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index e1f47f9..6892d74 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -4,38 +4,40 @@
 {{ if .Params.Author }}
     {{ $author = .Params.Author }}
 {{ end }}
-<article class="h-entry">
-    <header>
-        <h1 class="post-title p-name">{{ .Title }}</h1>
-        {{ if not .Params.Menu }}
-        <p class="post-date">Posted on
-            <time class="dt-published" datetime="{{ .Date.Format "2006-01-02T15:04:05Z07:00" | safeHTML }}">
-              {{ .PublishDate.Format "2 January, 2006 at 15:04 MST" }}
-            </time> {{ if $author }} by <a href="{{ .Site.BaseURL }}" class="p-author h-card" rel="author">{{ $author }}</a>{{ end }}
-        </p>
-        {{ end }}
-        {{ if .Params.categories }}
-        <p class="post-tag">Category: 
-            {{ range .Params.categories }}
-            <a href="{{ $baseurl }}/categories/{{ . | urlize }}" class="post-tag p-category">{{ . }}</a>
+<div id="content">
+    <article class="h-entry">
+        <header>
+            <h1 class="post-title p-name">{{ .Title }}</h1>
+            {{ if not .Params.Menu }}
+            <p class="post-date">Posted on
+                <time class="dt-published" datetime="{{ .Date.Format "2006-01-02T15:04:05Z07:00" | safeHTML }}">
+                {{ .PublishDate.Format "2 January, 2006 at 15:04 MST" }}
+                </time> {{ if $author }} by <a href="{{ .Site.BaseURL }}" class="p-author h-card" rel="author">{{ $author }}</a>{{ end }}
+            </p>
             {{ end }}
-        </p>
-        <hr class="post-underline">
-        {{ end }}
-    </header>
-    <section class="content e-content">
-        {{ .Content }}
-    </section>
-    <footer>
-        <a class="permalink u-url" href="{{ .Permalink }}">{{ .Site.Params.PermalinkText }}</a>
-        {{ if .Params.tags }}
-        <hr class="post-underline">
-        <p class="post-tag">Tags for this post: 
-        {{ range .Params.tags }}
-            <a href="{{ $baseurl }}/tags/{{ . | urlize }}" class="post-tag p-category">{{ . }}</a>
-        {{ end }}
-        </p>
-        {{ end }}
-    </footer>
-</article>
+            {{ if .Params.categories }}
+            <p class="post-tag">Category: 
+                {{ range .Params.categories }}
+                <a href="{{ $baseurl }}/categories/{{ . | urlize }}" class="post-tag p-category">{{ . }}</a>
+                {{ end }}
+            </p>
+            <hr class="post-underline">
+            {{ end }}
+        </header>
+        <section class="content e-content">
+            {{ .Content }}
+        </section>
+        <footer>
+            <a class="permalink u-url" href="{{ .Permalink }}">{{ .Site.Params.PermalinkText }}</a>
+            {{ if .Params.tags }}
+            <hr class="post-underline">
+            <p class="post-tag">Tags for this post: 
+            {{ range .Params.tags }}
+                <a href="{{ $baseurl }}/tags/{{ . | urlize }}" class="post-tag p-category">{{ . }}</a>
+            {{ end }}
+            </p>
+            {{ end }}
+        </footer>
+    </article>
+</div>
 {{ partial "footer.html" . }}
diff --git a/layouts/index.html b/layouts/index.html
index dbbbb8b..c39fbb5 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -2,12 +2,14 @@
 {{ partial "header.html" . }}
 
 <!-- Content goes here -->
+<div id="content">
 {{ range $index, $page := (.Paginate (where (where .Data.Pages "Type" "post") ".Params.hidden" "!=" "true" )).Pages }}
 {{ if ne $index 0 }}
 {{ end }}
 {{ .Render "li" }}
 {{ end }}
 {{ partial "pagination.html" .Paginator }}
+</div>
 
 <!-- Include the site info and footer -->
 {{ partial "footer.html" . }}
\ No newline at end of file
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index ba0cba1..6e227c0 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,6 +1,3 @@
-<!-- Close the 'content' div -->
-    </div>
-
 <!-- Footer content -->
     {{ if .Site.Params.ShowBio }}
     <div class="h-card">
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 073a7e5..fa0018f 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -17,5 +17,4 @@
             {{ end }}
         </div>
         {{ end }}
-    </header>
-    <div id="content">
\ No newline at end of file
+    </header>
\ No newline at end of file