From 26c7db12364e8eba08e2f8e85bb534ed735a0be8 Mon Sep 17 00:00:00 2001 From: Bradley Taunt Date: Thu, 13 Jun 2024 14:57:38 -0400 Subject: Major overhaul and cleanups --- _layouts/all_posts.html | 64 +++++++--------------------------------------- _layouts/base.html | 20 --------------- _layouts/default.html | 17 +++++++++++++ _layouts/home.html | 67 +++++++------------------------------------------ _layouts/page.html | 13 +++------- _layouts/post.html | 42 +++---------------------------- 6 files changed, 42 insertions(+), 181 deletions(-) delete mode 100644 _layouts/base.html create mode 100644 _layouts/default.html (limited to '_layouts') diff --git a/_layouts/all_posts.html b/_layouts/all_posts.html index c81df2f..9c29be9 100644 --- a/_layouts/all_posts.html +++ b/_layouts/all_posts.html @@ -1,61 +1,15 @@ --- -layout: base +layout: default --- -
- {%- if page.title -%} -

{{ page.title }}

- {%- endif -%} +

{{ page.title }}

- {{ content }} - - - {% if site.paginate %} - {% assign posts = paginator.posts %} - {% else %} - {% assign posts = site.posts %} - {% endif %} - - - {%- if posts.size > 0 -%} - {%- if page.list_title -%} -

{{ page.list_title }}

- {%- endif -%} - - - {% if site.paginate %} -
- -
- {%- endif %} - - {%- endif -%} +{{ content }} +{% for post in site.posts %} +
+

{{ post.title }}

+ {{ post.date | date: "%B %-d, %Y" }}
+{% endfor %} + diff --git a/_layouts/base.html b/_layouts/base.html deleted file mode 100644 index 58e141b..0000000 --- a/_layouts/base.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - {%- include head.html -%} - - - - {%- include header.html -%} - -
-
- {{ content }} -
-
- - {%- include footer.html -%} - - - - diff --git a/_layouts/default.html b/_layouts/default.html new file mode 100644 index 0000000..8e7dae7 --- /dev/null +++ b/_layouts/default.html @@ -0,0 +1,17 @@ + + + + {%- include head.html -%} + + +
+ {%- include header.html -%} +
+ {{ content }} +
+ {%- include sidebar.html -%} + {%- include footer.html -%} +
+ + + diff --git a/_layouts/home.html b/_layouts/home.html index 44b51e6..5fea726 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -1,63 +1,14 @@ --- -layout: base +layout: default --- -
- {%- if page.title -%} -

{{ page.title }}

- {%- endif -%} - - {{ content }} - - - {% if site.paginate %} - {% assign posts = paginator.posts %} - {% else %} - {% assign posts = site.posts %} - {% endif %} - - - {%- if posts.size > 0 -%} - {%- if page.list_title -%} -

{{ page.list_title }}

- {%- endif -%} -
    - {%- assign date_format = site.minima.date_format | default: "%b %-d, %Y" -%} - {%- for post in site.posts limit:5 -%} -
  • - {{ post.date | date: date_format }} -

    - - {{ post.title | escape }} - -

    - {%- if site.show_excerpts -%} - {{ post.excerpt }} - {%- endif -%} -
    • - {%- endfor -%} -
- - {% if site.paginate %} -
- -
- {%- endif %} - - See All Posts → - - {%- endif -%} +{{ content }} +{% for post in site.posts limit:5 %} +
+

{{ post.title }}

+ {{ post.date | date: "%B %-d, %Y" }} + {{ post.excerpt }}
+{% endfor %} + diff --git a/_layouts/page.html b/_layouts/page.html index 18544b4..80476ae 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -1,14 +1,7 @@ --- -layout: base +layout: default --- -
-
-

{{ page.title | escape }}

-
+

{{ page.title }}

-
- {{ content }} -
- -
+{{ content }} diff --git a/_layouts/post.html b/_layouts/post.html index 2eaedf4..50545e8 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -1,42 +1,8 @@ --- -layout: base +layout: default --- -
-
-

{{ page.title | escape }}

-

- {%- assign date_format = site.minima.date_format | default: "%b %-d, %Y" -%} - - {%- if page.modified_date -%} - ~ - {%- assign mdate = page.modified_date | date_to_xmlschema -%} - - {%- endif -%} - {%- if page.author -%} - • {% for author in page.author %} - - {%- if forloop.last == false %}, {% endif -%} - {% endfor %} - {%- endif -%}

-
+

{{ page.title }}

+

{{ page.date | date: "%B %-d, %Y" }}

-
- {{ content }} -
- -
-
- {% if page.previous.url %} - - {% endif %} - {% if page.next.url %} - - {% endif %} -
-
+{{ content }} -- cgit v1.2.3-54-g00ecf