diff --git a/src/_includes/components/burger-template.njk b/src/_includes/components/burger-template.njk deleted file mode 100644 index f4038ce..0000000 --- a/src/_includes/components/burger-template.njk +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/src/_includes/components/card.njk b/src/_includes/components/card.njk deleted file mode 100644 index acca62c..0000000 --- a/src/_includes/components/card.njk +++ /dev/null @@ -1,28 +0,0 @@ -
  • -
    - {% if headingContext === "h2" %} -

    - {{ item.data.title }} -

    - {% else %} -

    - {{ item.data.title }} -

    - {% endif %} -
    - {% set definedDate = item.date %} - {% include "components/date.njk" %} - {% - if - activateTags and item.data.tags.length > 1 - %} - {% for tag in item.data.tags %} - {% if tag != "posts" %} - - {% endif %} - {% endfor %} - {% endif %} -
    -

    {{ item.data.description }}

    -
    -
  • diff --git a/src/_includes/components/date.njk b/src/_includes/components/date.njk deleted file mode 100644 index 4599c93..0000000 --- a/src/_includes/components/date.njk +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/src/_includes/components/details.njk b/src/_includes/components/details.njk deleted file mode 100644 index 5728534..0000000 --- a/src/_includes/components/details.njk +++ /dev/null @@ -1,36 +0,0 @@ - - -{% for item in itemList %} -
    - {{ item.data.title }} - {{ item.templateContent | safe }} -
    -{% endfor %} - - diff --git a/src/_includes/components/gallery.njk b/src/_includes/components/gallery.njk deleted file mode 100644 index a647ebd..0000000 --- a/src/_includes/components/gallery.njk +++ /dev/null @@ -1,42 +0,0 @@ -
    - {% for item in gallery %} - - - {% eleventyImage item.image, item.alt, item.caption %} - - - - {% endfor %} -
    - - diff --git a/src/_includes/components/theme-switch.njk b/src/_includes/components/theme-switch.njk deleted file mode 100644 index 0e7bfc6..0000000 --- a/src/_includes/components/theme-switch.njk +++ /dev/null @@ -1,16 +0,0 @@ - diff --git a/src/_includes/head/css-inline.njk b/src/_includes/head/css-inline.njk new file mode 100644 index 0000000..f4a222d --- /dev/null +++ b/src/_includes/head/css-inline.njk @@ -0,0 +1,13 @@ + + {%- if eleventy.env.runMode === "serve" %} + + + {%- else %} + + + {%- endif %} + + {% css "global" %}{% include "css/global.css" %}{% endcss %} + + + diff --git a/src/_includes/head/js-defer.njk b/src/_includes/head/js-defer.njk new file mode 100644 index 0000000..2fdb955 --- /dev/null +++ b/src/_includes/head/js-defer.njk @@ -0,0 +1 @@ + diff --git a/src/_includes/head/js-inline.njk b/src/_includes/head/js-inline.njk new file mode 100644 index 0000000..a3037c1 --- /dev/null +++ b/src/_includes/head/js-inline.njk @@ -0,0 +1,7 @@ + + + +{%- js "inline" %} +{% include "scripts/is-land.js" %} +{% include "scripts/theme-toggle.js" %} +{% endjs %} diff --git a/src/_includes/partials/meta-info.njk b/src/_includes/head/meta-info.njk similarity index 87% rename from src/_includes/partials/meta-info.njk rename to src/_includes/head/meta-info.njk index 41f4b35..1669dc1 100644 --- a/src/_includes/partials/meta-info.njk +++ b/src/_includes/head/meta-info.njk @@ -1,18 +1,14 @@ - - - +{% set metaDescription %} + {%- if discover.description -%} + {{- discover.description -}} + {%- elif description -%} + {{- description -}} + {%- else -%} + {{- meta.siteDescription -}} + {%- endif -%} +{% endset %} + @@ -25,10 +21,8 @@ - - @@ -50,7 +44,6 @@ {{- meta.siteName -}} {%- endif -%}" /> - - + diff --git a/src/_includes/head/preloads.njk b/src/_includes/head/preloads.njk new file mode 100644 index 0000000..0319fa2 --- /dev/null +++ b/src/_includes/head/preloads.njk @@ -0,0 +1,25 @@ + + + + + +{%- if preloads -%} + + +{% endif %} diff --git a/src/_includes/head/schema.njk b/src/_includes/head/schema.njk new file mode 100644 index 0000000..ec856c2 --- /dev/null +++ b/src/_includes/head/schema.njk @@ -0,0 +1,5 @@ + +{% include "schemas/base-schema.njk" %} + + +{% if schema == 'blog' %}{%- include "schemas/blogpost-schema.njk" -%}{% endif %} diff --git a/src/_includes/partials/date.njk b/src/_includes/partials/date.njk new file mode 100644 index 0000000..5735269 --- /dev/null +++ b/src/_includes/partials/date.njk @@ -0,0 +1 @@ + diff --git a/src/_includes/partials/details.njk b/src/_includes/partials/details.njk new file mode 100644 index 0000000..805c378 --- /dev/null +++ b/src/_includes/partials/details.njk @@ -0,0 +1,20 @@ +
    +
    + + +
    + {%- for item in itemList | alphabetic -%} +
    + {{ item.data.title }} + {{- item.templateContent | safe -}} +
    + {%- endfor -%} +
    + +{% css "inline" %} + {% include "css/details.css" %} +{% endcss %} + +{% js "defer" %} + {% include "scripts/details.js" %} +{% endjs %} diff --git a/src/_includes/components/edit-on.njk b/src/_includes/partials/edit-on.njk similarity index 62% rename from src/_includes/components/edit-on.njk rename to src/_includes/partials/edit-on.njk index e879c0b..53645b8 100644 --- a/src/_includes/components/edit-on.njk +++ b/src/_includes/partials/edit-on.njk @@ -2,8 +2,7 @@

    {{ meta[page.lang].blog.githubEdit }} - {{ meta.viewRepo.infoText }}.

    diff --git a/src/_includes/partials/footer.njk b/src/_includes/partials/footer.njk index 0ec2f3f..26ac02d 100644 --- a/src/_includes/partials/footer.njk +++ b/src/_includes/partials/footer.njk @@ -1,13 +1,10 @@ -