From 1ff0b81ed676d05cb77864dcab62eff16811ac45 Mon Sep 17 00:00:00 2001 From: madrilene Date: Tue, 30 Jan 2024 18:42:27 +0100 Subject: [PATCH] updated pages, layouts --- src/_layouts/base.njk | 63 ++++++++++++++++++++++------------- src/_layouts/home.njk | 71 +++++++++++++++++++++------------------- src/_layouts/page.njk | 11 ++++--- src/pages/blog.md | 8 ++++- src/pages/built-with.njk | 45 +++++++++++++++---------- 5 files changed, 117 insertions(+), 81 deletions(-) diff --git a/src/_layouts/base.njk b/src/_layouts/base.njk index 3b86484..f5caeef 100644 --- a/src/_layouts/base.njk +++ b/src/_layouts/base.njk @@ -1,16 +1,15 @@ -{% set assetHash = global.random() %} +{% set assetHash = helpers.random() %} - - {% if seo.title %} {{ seo.title }} + {% if discover.title %} {{ discover.title }} {% elif title %} {{ title }} {% else %} @@ -18,23 +17,32 @@ {% endif %} + + + {% set jsthemetoggle %} {% include "theme-toggle-inline.js" %} {% endset %} + + + + + {% include "schemas/base-schema.njk" %} + + + {% if schema == 'blog' %} {%- include "schemas/blogpost-schema.njk" %} {% endif %} + - + - - - {% include "partials/meta-info.njk" %} - - - - {% include "partials/header.njk" %} - -
{{ content | safe }}
- - {% include "partials/footer.njk" %} {% if youtube %} - + + {% if masonry %} + + {% endif %} {% if youtube %} + {% endif %} + + + {% if meta.easteregg %} + + {% endif %} + + + {% include "partials/meta-info.njk" %} + + + + {% include "partials/header.njk" %} + +
{{ content | safe }}
+ + {% include "partials/footer.njk" %} diff --git a/src/_layouts/home.njk b/src/_layouts/home.njk index 23e7ab3..63c6211 100644 --- a/src/_layouts/home.njk +++ b/src/_layouts/home.njk @@ -1,43 +1,46 @@ --- layout: base +masonry: true --- -
-
-
-

{{ title }}

+
+
+
+

{{ title }}

-
- {% include 'svg/divider-waves.svg' %} -
+ {% include 'svg/divider-waves.svg' %} + -
-
- {{ content | safe }} -
-
+
+
+ {{ content | safe }} +
+
-
-
-

{{ blog.title }}

- - {% if blog.intro %} -

{{ blog.intro }}

- {% endif %} -
- +
+
+

{{ blog.title }}

+ -
    - {% set postslist = collections.posts %} {% for post in postslist.slice(0, 4) %} + {% if blog.intro %} +

    {{ blog.intro }}

    + {% endif %} -
  • -

    - {{ post.data.title }} -

    - {% set definedDate = post.date %} {% include "partials/date.njk" %} -

    {{ post.data.description }}

    -
    • - - {% endfor %} -
-
+ + + + diff --git a/src/_layouts/page.njk b/src/_layouts/page.njk index 90a8f53..466bdad 100644 --- a/src/_layouts/page.njk +++ b/src/_layouts/page.njk @@ -2,9 +2,10 @@ layout: base --- -
-
-

{{ title }}

- {{ content | safe }} -
+
+

{{ title }}

+ {{ content | safe }}
diff --git a/src/pages/blog.md b/src/pages/blog.md index aa0740d..4bb1a01 100644 --- a/src/pages/blog.md +++ b/src/pages/blog.md @@ -2,5 +2,11 @@ title: Blog description: 'All blog posts can be found here' layout: blog -permalink: /blog/index.html +pagination: + data: collections.posts + size: 6 +permalink: 'blog/page-{{ pagination.pageNumber }}/index.html' +redirectFrom: ['/blog/', '/blog/page-0/'] --- + +This blog has a pagination of {{ pagination.size }} posts per page. diff --git a/src/pages/built-with.njk b/src/pages/built-with.njk index 890ef5b..859a866 100644 --- a/src/pages/built-with.njk +++ b/src/pages/built-with.njk @@ -3,27 +3,36 @@ title: Built with permalink: /built-with/index.html description: Websites built with this starter layout: page +grid: + sizes: "(max-width: 615px) 50vw, 100vw" + widths: [400, 520] --- -

- A list of sites based on / built with Eleventy Excellent. Add your site by submitting a - pull request! :) -

+

A list of Add your site by submitting a pull request! :)

- + + + {% include 'svg/divider-soft-bottom.svg' %} +