From 94338fbab62b3da3f6b3f2883490c4eac98eff35 Mon Sep 17 00:00:00 2001 From: gil Date: Thu, 20 Jun 2024 20:34:06 -0500 Subject: [PATCH] Add home layout --- src/_data/meta.js | 2 +- src/_includes/layouts/base.njk | 12 +- src/_includes/layouts/default.njk | 5 +- src/_includes/layouts/home.njk | 21 ++++ src/_includes/layouts/landing.njk | 16 --- src/_includes/partials/footer.njk | 2 +- src/_includes/partials/header.njk | 1 - src/_includes/partials/meta.njk | 13 +- src/_includes/partials/navbar.njk | 3 + src/about.md | 2 +- src/css/global.css | 62 +++++----- src/css/global.css.map | 2 +- src/css/landing.css | 194 ------------------------------ src/css/landing.css.map | 1 - src/home.md | 19 --- src/index.md | 19 +-- src/poems/index.md | 6 +- src/scss/global.scss | 52 ++++---- src/scss/landing.scss | 82 ------------- 19 files changed, 109 insertions(+), 405 deletions(-) create mode 100644 src/_includes/layouts/home.njk delete mode 100644 src/_includes/layouts/landing.njk create mode 100644 src/_includes/partials/navbar.njk delete mode 100644 src/css/landing.css delete mode 100644 src/css/landing.css.map delete mode 100644 src/home.md delete mode 100644 src/scss/landing.scss diff --git a/src/_data/meta.js b/src/_data/meta.js index aaea915..5106c10 100644 --- a/src/_data/meta.js +++ b/src/_data/meta.js @@ -2,5 +2,5 @@ module.exports = { siteName: "Gil's Nexus", siteDescription: "", authorName: "Gil", - homepage: "/home/", + homepage: "/", }; diff --git a/src/_includes/layouts/base.njk b/src/_includes/layouts/base.njk index 92cab67..5d3496f 100644 --- a/src/_includes/layouts/base.njk +++ b/src/_includes/layouts/base.njk @@ -1,10 +1,12 @@ - - {% include "partials/meta.njk" %} - - + {% include "partials/meta.njk" %} - {{ content | safe }} +
+ {% include "partials/header.njk" %} + {% include "partials/navbar.njk" %} + {{ content | safe }} + {% include "partials/footer.njk" %} +
diff --git a/src/_includes/layouts/default.njk b/src/_includes/layouts/default.njk index 24bbe21..4abea22 100644 --- a/src/_includes/layouts/default.njk +++ b/src/_includes/layouts/default.njk @@ -1,8 +1,7 @@ --- layout: layouts/base.njk --- -{% include "partials/header.njk" %} +
{{ content | safe }} -
-{% include "partials/footer.njk" %} \ No newline at end of file + \ No newline at end of file diff --git a/src/_includes/layouts/home.njk b/src/_includes/layouts/home.njk new file mode 100644 index 0000000..d885687 --- /dev/null +++ b/src/_includes/layouts/home.njk @@ -0,0 +1,21 @@ +--- +layout: layouts/base.njk +--- + +
+

Blurb

+ {{ content | safe }} +
+ + \ No newline at end of file diff --git a/src/_includes/layouts/landing.njk b/src/_includes/layouts/landing.njk deleted file mode 100644 index d0563b0..0000000 --- a/src/_includes/layouts/landing.njk +++ /dev/null @@ -1,16 +0,0 @@ - - - - {% include "partials/meta.njk" %} - - - - -
-
{{ content | safe }}
-
- - - diff --git a/src/_includes/partials/footer.njk b/src/_includes/partials/footer.njk index 3d93592..0663ca0 100644 --- a/src/_includes/partials/footer.njk +++ b/src/_includes/partials/footer.njk @@ -1,4 +1,4 @@ -