From e816a4186e2479dba031a254d4721896bd6a44d5 Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Mon, 24 Jul 2017 09:19:35 +0100
Subject: [PATCH] Reformat templates

---
 layouts/_default/list.html           | 32 ++++++------
 layouts/_default/single.html         |  6 +--
 layouts/partials/head.html           |  2 +-
 layouts/partials/navbar.html         | 78 ++++++++++++++--------------
 layouts/partials/page_end.html       |  2 +-
 layouts/partials/page_start.html     |  6 +--
 layouts/partials/summary_string.html |  1 -
 layouts/shortcodes/flickr.html       |  8 +--
 8 files changed, 66 insertions(+), 69 deletions(-)

diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 0e3e0d2..b019fe6 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,19 +1,19 @@
 {{ partial "page_start.html" . }}
-<section id="main" class="container">
-  {{ partial "content.html" . }}
-  {{ if ne .Params.hide_pages "true" }}
-    <div class="row">
-      {{ $parent := . }}
-      {{ $valid_pages :=  where .Site.Pages.ByTitle ".Parent" "!=" nil }}
-      {{ $valid_pages :=  where $valid_pages ".Params.hide_in_list" "!=" "true" }}
-      {{ range where $valid_pages ".Parent.UniqueID" $parent.UniqueID }}
-        {{ if $parent.Params.show_images }}
-          {{ partial "box_image.html" . }}
-        {{ else }}
-          {{ partial "box.html" . }}
+  <section id="main" class="container">
+    {{ partial "content.html" . }}
+    {{ if ne .Params.hide_pages "true" }}
+      <div class="row">
+        {{ $parent := . }}
+        {{ $valid_pages :=  where .Site.Pages.ByTitle ".Parent" "!=" nil }}
+        {{ $valid_pages :=  where $valid_pages ".Params.hide_in_list" "!=" "true" }}
+        {{ range where $valid_pages ".Parent.UniqueID" $parent.UniqueID }}
+          {{ if $parent.Params.show_images }}
+            {{ partial "box_image.html" . }}
+          {{ else }}
+            {{ partial "box.html" . }}
+          {{ end }}
         {{ end }}
-      {{ end }}
-    </div>
-  {{ end }}
-</section>
+      </div>
+    {{ end }}
+  </section>
 {{ partial "page_end.html" . }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index ba52ebf..e410abd 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,5 +1,5 @@
 {{ partial "page_start.html" . }}
-<section id="main" class="container">
-	{{ partial "content.html" . }}
-</section>
+	<section id="main" class="container">
+		{{ partial "content.html" . }}
+	</section>
 {{ partial "page_end.html" . }}
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index f7a8e14..cd40dd2 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -5,7 +5,7 @@
   <link rel="alternate" type="application/rss+xml" href="{{ .Site.RSSLink }}" />
   <meta name="superfish" content="nofish" />
   <meta name="application-name" content="{{ .Site.Title }}" />
-  <link rel="icon" type="image/png" href="/img/logo-transparent.png" /s>
+  <link rel="icon" type="image/png" href="/img/logo-transparent.png" />
 
   <link rel="stylesheet" href="/css/style.css" />
 
diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html
index 96fdae3..4f49e87 100644
--- a/layouts/partials/navbar.html
+++ b/layouts/partials/navbar.html
@@ -1,42 +1,42 @@
-  <header id="header" {{ if .IsHome }}class="alt"{{ end }}>
-    <h1><a href="/" class="navbar-brand">{{ title .Site.Title }}</a></h1>
-    <nav id="nav">
-      <ul>
-        {{ $home := .Site.GetPage "home" }}
-        {{ range where .Site.Pages.ByTitle "Kind" "section" }}
-          {{ if eq .Parent $home }}
-            {{ $valid_children :=  where .Site.Pages.ByTitle ".Parent" "!=" nil }}
-            {{ $children := where $valid_children ".Parent.UniqueID" .UniqueID }}
-            {{ $children := where $children ".Params.hide_in_nav" "!=" "true" }}
-            <li class="top-level">
-              <a href="{{ .Permalink }}">{{ .LinkTitle }}</a>
-              {{ if $children }}
-                <ul>
-                  {{ range first .Site.Params.nav_items $children }}
-                    <li>
-                      <a href="{{ .Permalink }}">{{ .LinkTitle }}</a>
-                      <ul>
-                        {{ range .Pages }}
-                        <li><a href="{{ .Permalink }}">{{ .LinkTitle }}</a></li>
-                        {{ end }}
-                      </ul>
-                    </li>
-                  {{ end }}
-                  {{ if ge (len $children) .Site.Params.nav_items }}
-                    <li><a href="{{ .Permalink }}"><i>See more</i></a></li>
-                  {{ end }}
-                </ul>
-              {{ end }}
-            </li>
-          {{ end }}
+<header id="header" {{ if .IsHome }}class="alt"{{ end }}>
+  <h1><a href="/" class="navbar-brand">{{ title .Site.Title }}</a></h1>
+  <nav id="nav">
+    <ul>
+      {{ $home := .Site.GetPage "home" }}
+      {{ range where .Site.Pages.ByTitle "Kind" "section" }}
+        {{ if eq .Parent $home }}
+          {{ $valid_children :=  where .Site.Pages.ByTitle ".Parent" "!=" nil }}
+          {{ $children := where $valid_children ".Parent.UniqueID" .UniqueID }}
+          {{ $children := where $children ".Params.hide_in_nav" "!=" "true" }}
+          <li class="top-level">
+            <a href="{{ .Permalink }}">{{ .LinkTitle }}</a>
+            {{ if $children }}
+              <ul>
+                {{ range first .Site.Params.nav_items $children }}
+                  <li>
+                    <a href="{{ .Permalink }}">{{ .LinkTitle }}</a>
+                    <ul>
+                      {{ range .Pages }}
+                      <li><a href="{{ .Permalink }}">{{ .LinkTitle }}</a></li>
+                      {{ end }}
+                    </ul>
+                  </li>
+                {{ end }}
+                {{ if ge (len $children) .Site.Params.nav_items }}
+                  <li><a href="{{ .Permalink }}"><i>See more</i></a></li>
+                {{ end }}
+              </ul>
+            {{ end }}
+          </li>
         {{ end }}
+      {{ end }}
 
-        {{ range where .Site.Pages.ByTitle "Kind" "page" }}
-          {{ if eq .Section "" }}
-            <li class="top-level"><a href="{{ .Permalink }}">{{ title .LinkTitle }}</a></li>
-          {{ end }}
+      {{ range where .Site.Pages.ByTitle "Kind" "page" }}
+        {{ if eq .Section "" }}
+          <li class="top-level"><a href="{{ .Permalink }}">{{ title .LinkTitle }}</a></li>
         {{ end }}
-        <li class="top-level"><a class="show-mobile" href="/">Home</a></li>
-      </ul>
-    </nav>
-  </header>
+      {{ end }}
+      <li class="top-level"><a class="show-mobile" href="/">Home</a></li>
+    </ul>
+  </nav>
+</header>
diff --git a/layouts/partials/page_end.html b/layouts/partials/page_end.html
index 5c1759a..1a1a61a 100644
--- a/layouts/partials/page_end.html
+++ b/layouts/partials/page_end.html
@@ -1,5 +1,5 @@
       {{ partial "footer.html" . }}
     </div>
     {{ partial "scripts.html" . }}
-	</body>
+  </body>
 </html>
diff --git a/layouts/partials/page_start.html b/layouts/partials/page_start.html
index f181998..b4b3ed1 100644
--- a/layouts/partials/page_start.html
+++ b/layouts/partials/page_start.html
@@ -7,7 +7,5 @@
 {{ else }}
   <body>
 {{ end }}
-
-{{ partial "navbar.html" . }}
-
-<div id="page-wrapper">
+  {{ partial "navbar.html" . }}
+  <div id="page-wrapper">
diff --git a/layouts/partials/summary_string.html b/layouts/partials/summary_string.html
index 7f0f091..8917f49 100644
--- a/layouts/partials/summary_string.html
+++ b/layouts/partials/summary_string.html
@@ -1,7 +1,6 @@
 {{ if eq .Section "posts" }}
   {{ .Summary | truncate .Site.Params.summary_length "..." }}
 {{ else }}
-
   {{ if .Params.subtitle }}
     {{ .Params.subtitle | markdownify }}
   {{ else if .Params.repo }}
diff --git a/layouts/shortcodes/flickr.html b/layouts/shortcodes/flickr.html
index 279e7e3..7ccc2fc 100644
--- a/layouts/shortcodes/flickr.html
+++ b/layouts/shortcodes/flickr.html
@@ -9,10 +9,10 @@
 
 <div id="light-gallery" class="row">
 {{ range $index, $element := $photoset_orig.photo }}
-    {{ $thumb := (index $photoset_thumb.photo $index).url_sq }}
-    <a href="{{ $element.url_o }}" title="{{ $element.title }}" class="col-2">
-      <img src="{{ $thumb }}" alt="{{ $element.title }}"/>
-    </a>
+  {{ $thumb := (index $photoset_thumb.photo $index).url_sq }}
+  <a href="{{ $element.url_o }}" title="{{ $element.title }}" class="col-2">
+    <img src="{{ $thumb }}" alt="{{ $element.title }}"/>
+  </a>
 {{ end }}
 </div>