From f1e02b0820963cb96eeaea72da281feed89577df Mon Sep 17 00:00:00 2001 From: Tatjana Dehler Date: Fri, 23 Apr 2021 14:29:21 +0200 Subject: [PATCH] Move head element to `default.html` Signed-off-by: Tatjana Dehler --- _includes/footer.html | 57 +++++++--------------- _layouts/default.html | 18 ++++++- _layouts/home.html | 110 +++++++++++++++++------------------------- 3 files changed, 77 insertions(+), 108 deletions(-) diff --git a/_includes/footer.html b/_includes/footer.html index fc12eb3..56c7b9e 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,43 +1,20 @@ -
- - - - - - -
-
-

{{ site.description | escape }}

-
- - CC BY SA 4.0 - -
-
- - Join us on Slack! - - - GitHub - -
- - - +
+
+

{{ site.description | escape }}

+
+ + CC BY SA 4.0 + +
+
+ + Join us on Slack! + + + GitHub + +
+
diff --git a/_layouts/default.html b/_layouts/default.html index 58e141b..b63a3e3 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -1,6 +1,22 @@ - + + + {%- include head.html -%} diff --git a/_layouts/home.html b/_layouts/home.html index b30e557..9bced1d 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -3,87 +3,65 @@ ---
- {%- if page.title -%} -

{{ page.title }}

- {%- endif -%} - - {{ content }} + {%- if page.title -%} +

{{ page.title }}

+ {%- endif -%} - {% if site.paginate %} - {% assign posts = paginator.posts %} - {% assign minutes = paginator.minutes %} - {% else %} - {% assign posts = site.posts %} - {% assign minutes = site.minutes %} - {% endif %} + {{ content }} - - - - - -
-
- {%- 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 posts -%} -
  • - {{ post.date | date: date_format }} -

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

    - {%- if site.show_excerpts -%} - {{ post.excerpt }} - {%- endif -%} -
    • - {%- endfor -%} -
-
-
- {%- if minutes.size > 0 -%} -

Meeting minutes

+
+
+ {%- if posts.size > 0 -%} + {%- if page.list_title -%} +

{{ page.list_title }}

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

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

    {%- if site.show_excerpts -%} - {{ minutes.excerpt }} + {{ post.excerpt }} {%- endif -%}
    • {%- endfor -%}
-
- - +
+ {%- if minutes.size > 0 -%} +

Meeting minutes

+ {%- endif -%} +
    + {%- assign date_format = site.minima.date_format | default: "%b %-d, %Y" -%} + {%- for minutes in minutes -%} +
  • + {{ minutes.date | date: date_format }} +

    + + {{ minutes.title | escape }} + +

    + {%- if site.show_excerpts -%} + {{ minutes.excerpt }} + {%- endif -%} +
    • + {%- endfor -%} +
+
+
{% if site.paginate %}
@@ -102,7 +80,5 @@

{%- endif %} - {%- endif -%} -