From ce073b0f1a006b990f84caa619fb805dbbbb506b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laure=CE=B7t?= Date: Fri, 8 Oct 2021 19:14:30 +0200 Subject: [PATCH] refactor: reworked the layout system --- src/_includes/chaffle.njk | 25 ++++++++ src/_includes/footer.njk | 4 ++ src/_includes/head.njk | 7 +++ src/_includes/header.njk | 4 ++ src/_includes/layout.njk | 45 +++----------- src/_includes/layout_eportfolio.njk | 92 +++++++---------------------- src/scss/resume.scss | 7 ++- src/scss/style.scss | 1 + 8 files changed, 75 insertions(+), 110 deletions(-) create mode 100644 src/_includes/chaffle.njk create mode 100644 src/_includes/footer.njk create mode 100644 src/_includes/head.njk create mode 100644 src/_includes/header.njk diff --git a/src/_includes/chaffle.njk b/src/_includes/chaffle.njk new file mode 100644 index 0000000..0282a79 --- /dev/null +++ b/src/_includes/chaffle.njk @@ -0,0 +1,25 @@ + diff --git a/src/_includes/footer.njk b/src/_includes/footer.njk new file mode 100644 index 0000000..bb4b140 --- /dev/null +++ b/src/_includes/footer.njk @@ -0,0 +1,4 @@ + diff --git a/src/_includes/head.njk b/src/_includes/head.njk new file mode 100644 index 0000000..1fdd8f1 --- /dev/null +++ b/src/_includes/head.njk @@ -0,0 +1,7 @@ + + +{{ username }} + + + + diff --git a/src/_includes/header.njk b/src/_includes/header.njk new file mode 100644 index 0000000..8a8681f --- /dev/null +++ b/src/_includes/header.njk @@ -0,0 +1,4 @@ +
+ {{ username }} + _ +
diff --git a/src/_includes/layout.njk b/src/_includes/layout.njk index 587754a..88a40cf 100755 --- a/src/_includes/layout.njk +++ b/src/_includes/layout.njk @@ -13,50 +13,19 @@ username: Laureηt + {% block head %}{% endblock head %} - -
- {{ username }} - _ -
- + {% include "header.njk" %} + {% block precontent %}{% endblock precontent %}
{{ content | safe }}
- - - - - + {% block postcontent %}{% endblock postcontent %} + {% include "footer.njk" %} + {% include "chaffle.njk" %} + {% block foot %}{% endblock foot %} diff --git a/src/_includes/layout_eportfolio.njk b/src/_includes/layout_eportfolio.njk index fc4011d..204b943 100755 --- a/src/_includes/layout_eportfolio.njk +++ b/src/_includes/layout_eportfolio.njk @@ -1,77 +1,27 @@ --- -username: Laureηt +layout: layout.njk --- - - +{% block head %} + +{% endblock head %} - - - - {{ username }} - - - - - - +{% block precontent %} + +{% endblock precontent %} - +{{ content | safe }} -
- {{ username }} - _ -
- - - -
- {{ content | safe }} -
- - - - - - - - - - +{% block postcontent %} + +{% endblock postcontent %} diff --git a/src/scss/resume.scss b/src/scss/resume.scss index 0c1d2d6..eb238ce 100755 --- a/src/scss/resume.scss +++ b/src/scss/resume.scss @@ -1,6 +1,11 @@ body { font-size: 20px; - max-width: 60em; + width: 80rem; +} + +h1, +h2 { + height: auto; } .row { diff --git a/src/scss/style.scss b/src/scss/style.scss index 6a5aaf5..2c0556c 100755 --- a/src/scss/style.scss +++ b/src/scss/style.scss @@ -28,6 +28,7 @@ body { a { color: $foreground-text; text-decoration: underline; + text-decoration-thickness: 2px; text-decoration-color: #283593; &:hover {