From e5c62c99b1b7c0ce8fa1a6ee0b0c4364d1c3ac55 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Mon, 10 Jul 2017 09:33:18 +0100 Subject: [PATCH] Remove double page wrapper --- layouts/_default/list.html | 32 +++++++++++++++----------------- layouts/_default/single.html | 8 +++----- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/layouts/_default/list.html b/layouts/_default/list.html index dfc4211..72d9460 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,20 +1,18 @@ {{ partial "page_start.html" . }} -
-
- {{ partial "content.html" . }} - {{ if ne .Params.hide_pages "true" }} -
- {{ $parent := . }} - {{ $valid_pages := where .Site.Pages.ByTitle ".Parent" "!=" nil }} - {{ range where $valid_pages ".Parent.UniqueID" $parent.UniqueID }} - {{ if $parent.Params.show_images }} - {{ partial "box_image.html" . }} - {{ else }} - {{ partial "box.html" . }} - {{ end }} +
+ {{ partial "content.html" . }} + {{ if ne .Params.hide_pages "true" }} +
+ {{ $parent := . }} + {{ $valid_pages := where .Site.Pages.ByTitle ".Parent" "!=" nil }} + {{ range where $valid_pages ".Parent.UniqueID" $parent.UniqueID }} + {{ if $parent.Params.show_images }} + {{ partial "box_image.html" . }} + {{ else }} + {{ partial "box.html" . }} {{ end }} -
- {{ end }} -
-
+ {{ end }} +
+ {{ end }} + {{ partial "page_end.html" . }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 5fc58b8..ba52ebf 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,7 +1,5 @@ {{ partial "page_start.html" . }} -
-
- {{ partial "content.html" . }} -
-
+
+ {{ partial "content.html" . }} +
{{ partial "page_end.html" . }}