From fb0719db658c4cfcdfe69956462e999a7bce46e7 Mon Sep 17 00:00:00 2001 From: gil Date: Sun, 23 Jun 2024 23:01:58 -0500 Subject: [PATCH] Major refactor, redoing entire layout system with flexbox --- README.md | 15 +- src/404.md | 10 ++ src/_includes/layouts/article.njk | 19 +++ src/_includes/layouts/base.njk | 20 ++- src/_includes/layouts/blank.njk | 9 ++ src/_includes/layouts/default.njk | 6 +- src/_includes/layouts/home.njk | 18 +-- src/_includes/partials/footer.njk | 18 ++- src/_includes/partials/header.njk | 2 +- src/_includes/partials/meta.njk | 4 +- src/_includes/partials/nav.njk | 3 + src/_includes/partials/navbar.njk | 3 - src/about.md | 4 +- src/css/global.css | 220 +++++++++++++++++++++--------- src/css/global.css.map | 2 +- src/css/reset.css | 32 ++++- src/css/theme-default.css.map | 1 + src/index.md | 6 +- src/poems/hey-girl.md | 3 +- src/poems/index.md | 13 +- src/poems/self-effacing.md | 2 +- src/scss/_components.scss | 11 +- src/scss/_themes.scss | 77 +++++++++++ src/scss/_vars.scss | 10 +- src/scss/global.scss | 97 ++++++------- 25 files changed, 416 insertions(+), 189 deletions(-) create mode 100644 src/404.md create mode 100644 src/_includes/layouts/article.njk create mode 100644 src/_includes/layouts/blank.njk create mode 100644 src/_includes/partials/nav.njk delete mode 100644 src/_includes/partials/navbar.njk create mode 100644 src/css/theme-default.css.map create mode 100644 src/scss/_themes.scss diff --git a/README.md b/README.md index f189a8e..1f65dd9 100644 --- a/README.md +++ b/README.md @@ -21,14 +21,15 @@ ## 0.0.2 -- Change to layout based on CSS grid -- Switch to [include-media](https://github.com/eduardoboucas/include-media) to simplify media queries -- Add blog/lib sections (empty for now) -- Partial reorganizing of SCSS files +- Changed to layout based on CSS grid +- Switched to [include-media](https://github.com/eduardoboucas/include-media) to simplify media queries +- Added blog/lib sections (empty for now) +- Partially reorganized of SCSS files ## 0.0.3 -- Add pagination to blog -- Add `home` layout +- Added pagination to blog +- Added `home` layout - Refactored base template -- Switch layout back to CSS flex +- Switched layout back to CSS flex +- Created `theme-default`, which provides default theming based on browser preference diff --git a/src/404.md b/src/404.md new file mode 100644 index 0000000..7f8d739 --- /dev/null +++ b/src/404.md @@ -0,0 +1,10 @@ +--- +title: Not found +permalink: 404.html +--- + +# 404 - Not found + +There's nothing here. + +<- Home page diff --git a/src/_includes/layouts/article.njk b/src/_includes/layouts/article.njk new file mode 100644 index 0000000..c3f8dcb --- /dev/null +++ b/src/_includes/layouts/article.njk @@ -0,0 +1,19 @@ +--- +layout: layouts/base.njk +--- + +
+
+
+ {% if page.date -%} + + {%- endif %} + {% if title -%} +

{{ title }}

+ {%- endif %} +
+ {{ content | safe }} +
+
diff --git a/src/_includes/layouts/base.njk b/src/_includes/layouts/base.njk index 5d3496f..453b05d 100644 --- a/src/_includes/layouts/base.njk +++ b/src/_includes/layouts/base.njk @@ -1,12 +1,8 @@ - - - {% include "partials/meta.njk" %} - -
- {% include "partials/header.njk" %} - {% include "partials/navbar.njk" %} - {{ content | safe }} - {% include "partials/footer.njk" %} -
- - +--- +layout: layouts/blank.njk +--- + +{% include "partials/header.njk" %} +{% include "partials/nav.njk" %} +{{ content | safe }} +{% include "partials/footer.njk" %} diff --git a/src/_includes/layouts/blank.njk b/src/_includes/layouts/blank.njk new file mode 100644 index 0000000..4110bc5 --- /dev/null +++ b/src/_includes/layouts/blank.njk @@ -0,0 +1,9 @@ + + + {% include "partials/meta.njk" %} + +
+ {{ content | safe }} +
+ + diff --git a/src/_includes/layouts/default.njk b/src/_includes/layouts/default.njk index 2e8ef8a..38fc032 100644 --- a/src/_includes/layouts/default.njk +++ b/src/_includes/layouts/default.njk @@ -2,6 +2,8 @@ layout: layouts/base.njk --- -
-
{{ content | safe }}
+
+
+ {{ content | safe }} +
\ No newline at end of file diff --git a/src/_includes/layouts/home.njk b/src/_includes/layouts/home.njk index 2a2379d..d3a2bf0 100644 --- a/src/_includes/layouts/home.njk +++ b/src/_includes/layouts/home.njk @@ -1,21 +1,9 @@ --- layout: layouts/base.njk --- -
-
+ +
+
{{ content | safe }}
- -
diff --git a/src/_includes/partials/footer.njk b/src/_includes/partials/footer.njk index 700978c..b37eb07 100644 --- a/src/_includes/partials/footer.njk +++ b/src/_includes/partials/footer.njk @@ -1,6 +1,14 @@ -