From 4295b135f12beccf3cbda352afe771f5f59266df Mon Sep 17 00:00:00 2001 From: Jeremy Kidwell Date: Tue, 23 Jan 2018 12:28:55 +0000 Subject: [PATCH] small fixes and content updates --- layouts/index.html | 47 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/layouts/index.html b/layouts/index.html index 985c217..ff73ed0 100755 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,25 +1,25 @@ - - + + - {{ partial "meta.html" . }} + {{ partial "meta.html" . }} - - {{ .Site.Title }} - - + + {{ .Site.Title }} + + - {{ partial "head_includes.html" . }} - - -
-
-
- {{ partial "sidebar.html" . }} -
+ {{ partial "head_includes.html" . }} + + +
+
+
+ {{ partial "sidebar.html" . }} +
+
-
@@ -34,11 +34,7 @@

-<<<<<<< HEAD {{ range first 4 ((where .Data.Pages.ByDate "Section" "blog").Reverse) }} -======= - {{ range first 5 ((where .Data.Pages.ByDate "Section" "blog").Reverse) }} ->>>>>>> ad061bf5da969819ab07a42ecac5fa2069916a04

{{ .Title }}

@@ -53,8 +49,11 @@ {{ end }}
+ {{ end }} +
+
 
@@ -80,14 +79,14 @@

Recent & Upcoming Presentations