From 57954c8c06096e5ee0771d63711166e43edcc8ed Mon Sep 17 00:00:00 2001 From: Chris Date: Sun, 7 Jan 2018 13:38:56 -0500 Subject: [PATCH] Rearranged structure for partials for easier access. --- layouts/404.html | 7 ++++++ layouts/_default/baseof.html | 8 +++--- layouts/_default/list.html | 2 +- layouts/index.html | 8 +----- layouts/partials/header_homepage.html | 1 - layouts/partials/home_hero.html | 25 +++++++++++++++++++ .../navbar_contents.html} | 0 layouts/partials/{ => layout}/pagination.html | 0 layouts/partials/{ => layout}/sidebar.html | 0 layouts/partials/navbar.html | 4 --- 10 files changed, 38 insertions(+), 17 deletions(-) delete mode 100644 layouts/partials/header_homepage.html create mode 100644 layouts/partials/home_hero.html rename layouts/partials/{nav_contents.html => layout/navbar_contents.html} (100%) rename layouts/partials/{ => layout}/pagination.html (100%) rename layouts/partials/{ => layout}/sidebar.html (100%) delete mode 100644 layouts/partials/navbar.html diff --git a/layouts/404.html b/layouts/404.html index e69de29..a24abe7 100644 --- a/layouts/404.html +++ b/layouts/404.html @@ -0,0 +1,7 @@ +{{ define "main" }} +
+
+ 404 - Page not found +
+
+{{ end }} \ No newline at end of file diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 82ac691..770ee48 100755 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -26,10 +26,10 @@ - {{- if .IsHome }} - {{ partial "header_homepage" . }} - {{- else }} - {{ partial "navbar" . }} + {{- if not .IsHome }} + {{- end }} {{ block "main" . }}{{ end }} diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 17dd4cc..2529465 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -7,5 +7,5 @@ {{ end }} -{{ partial "pagination" . }} +{{ partial "layout/pagination" . }} {{ end }} \ No newline at end of file diff --git a/layouts/index.html b/layouts/index.html index ebf71cd..48d951d 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,13 +1,7 @@ {{ define "main" }}
-
- {{ range sort .Site.Data.twitter "order" }} -
- {{ partial "widget/tweet.html" . }} -
- {{ end }} -
+ 
Cannot find override file: `./layouts/index.html`
{{ end }} \ No newline at end of file diff --git a/layouts/partials/header_homepage.html b/layouts/partials/header_homepage.html deleted file mode 100644 index f3b998b..0000000 --- a/layouts/partials/header_homepage.html +++ /dev/null @@ -1 +0,0 @@ -Cannot find override file: `./layouts/partials/header_homepage.html` \ No newline at end of file diff --git a/layouts/partials/home_hero.html b/layouts/partials/home_hero.html new file mode 100644 index 0000000..8de8a21 --- /dev/null +++ b/layouts/partials/home_hero.html @@ -0,0 +1,25 @@ +
+
+ +
+ +
+
+
+ +
+ {{ partial "home_hero_contents" . }} +
+ + +
+
+ +
+
+
+
+
+
\ No newline at end of file diff --git a/layouts/partials/nav_contents.html b/layouts/partials/layout/navbar_contents.html similarity index 100% rename from layouts/partials/nav_contents.html rename to layouts/partials/layout/navbar_contents.html diff --git a/layouts/partials/pagination.html b/layouts/partials/layout/pagination.html similarity index 100% rename from layouts/partials/pagination.html rename to layouts/partials/layout/pagination.html diff --git a/layouts/partials/sidebar.html b/layouts/partials/layout/sidebar.html similarity index 100% rename from layouts/partials/sidebar.html rename to layouts/partials/layout/sidebar.html diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html deleted file mode 100644 index 0a465be..0000000 --- a/layouts/partials/navbar.html +++ /dev/null @@ -1,4 +0,0 @@ - -