From 8c35dd16fb31036e31d288dde7525b296e67bc25 Mon Sep 17 00:00:00 2001 From: jonathan Date: Thu, 23 Mar 2023 12:39:28 +1030 Subject: [PATCH] add a logo.webp and implement in index --- src/_includes/layout/base.njk | 58 ++--------------------- src/_includes/layout/blog.njk | 11 +++-- src/_includes/layout/core.njk | 50 ++++++++++++++++++++ src/_includes/partials/link_tiles.njk | 2 +- src/_includes/styles.css | 66 +++++++++++++++++++++------ 5 files changed, 115 insertions(+), 72 deletions(-) create mode 100644 src/_includes/layout/core.njk diff --git a/src/_includes/layout/base.njk b/src/_includes/layout/base.njk index 30f3a1d..bdab618 100644 --- a/src/_includes/layout/base.njk +++ b/src/_includes/layout/base.njk @@ -1,53 +1,5 @@ - - - - - - - - {# #} - {# #} - - {% set normalise %} - {% include "normalize.css" %} - {% endset %} - - {% set css %} - {% include "styles.css" %} - {% endset %} - - {% if title %} - {{ site.title }} - {{ title }} - {% else %} - {{ site.title }} - {% endif %} - {% if description %} - - {% else %} - - {% endif %} - - -
-
- {#
{% include 'partials/header.njk' %}
#} - {#
#} -
-

{{ title }}

- {{ content | safe }} -
-
-
-
- {% include 'partials/footer.njk' %} -
-
- - - - - \ No newline at end of file +--- +layout: layout/core.njk +--- +

{{ title }}

+{{ content | safe}} \ No newline at end of file diff --git a/src/_includes/layout/blog.njk b/src/_includes/layout/blog.njk index c377482..4e32044 100644 --- a/src/_includes/layout/blog.njk +++ b/src/_includes/layout/blog.njk @@ -1,11 +1,16 @@ --- -layout: layout/base.njk +layout: layout/core.njk --- {% set previousPost = collections.post | getPreviousCollectionItem(page) %} {% set nextPost = collections.post | getNextCollectionItem(page) %} -{{ page.date.toLocaleDateString("en-UK") }} +
+{% if nextPost %}<== next{% else %}x=={% endif %} +{% if previousPost %}prev ==>{% else %}==x{% endif %} +
+

{{ title }}

+{{ page.date.toLocaleDateString("en-UK") }}
{{ content | safe}}
-
+
{% if nextPost %}<== next{% else %}x=={% endif %} {% if previousPost %}prev ==>{% else %}==x{% endif %}
\ No newline at end of file diff --git a/src/_includes/layout/core.njk b/src/_includes/layout/core.njk new file mode 100644 index 0000000..fee7362 --- /dev/null +++ b/src/_includes/layout/core.njk @@ -0,0 +1,50 @@ + + + + + + + + {# #} + {# #} + + {% set normalise %} + {% include "normalize.css" %} + {% endset %} + + {% set css %} + {% include "styles.css" %} + {% endset %} + + {% if title %} + {{ site.title }} - {{ title }} + {% else %} + {{ site.title }} + {% endif %} + {% if description %} + + {% else %} + + {% endif %} + + +
+
+ {#
{% include 'partials/header.njk' %}
#} + {#
#} + {{ content | safe }} +
+
+
+ {% include 'partials/footer.njk' %} +
+
+ +
+ + + \ No newline at end of file diff --git a/src/_includes/partials/link_tiles.njk b/src/_includes/partials/link_tiles.njk index e1284ca..433d838 100644 --- a/src/_includes/partials/link_tiles.njk +++ b/src/_includes/partials/link_tiles.njk @@ -1,5 +1,5 @@
- + Mitsuami from the Splatoon manga saying 'pyo'. The image links to the most recent post on the website. newest! diff --git a/src/_includes/styles.css b/src/_includes/styles.css index a200a65..15d503d 100644 --- a/src/_includes/styles.css +++ b/src/_includes/styles.css @@ -15,7 +15,7 @@ "Nimbus Sans L", Roboto, Noto, "Segoe UI", Arial, Helvetica, "Helvetica Neue", sans-serif; --mono-font: Consolas, Menlo, Monaco, "Andale Mono", "Ubuntu Mono", monospace; - + --bg: #6a826a; --container: #fffbef; --accent-bg: #b99b6c; @@ -68,7 +68,7 @@ a:visited { a:hover { text-decoration: none; - transform: translate(0px,-2px); + transform: translate(0px, -2px); } hr { @@ -192,14 +192,14 @@ nav { margin-top: 0; padding-top: 5px; } - + .sidebar-contents { border-radius: 0; width: 100%; z-index: 0; } - .sidebar-contents>img{ + .sidebar-contents>img { display: none; } @@ -232,16 +232,29 @@ nav { } /* switch to two tiles when it gets really small */ - @media all and (max-width: 545px) { - .link_tiles_grid>a, - .link_tiles_grid>a>img { - width: calc((100vw - 85px)/2); - } + @media all and (max-width: 545px) { - .link_tiles_grid>a>img { - height: calc((100vw - 100px)/2); - } + .link_tiles_grid>a, + .link_tiles_grid>a>img { + width: calc((100vw - 85px)/2); } + + .link_tiles_grid>a>img { + height: calc((100vw - 100px)/2); + } + } +} + +.page-content { + /* TODO fix this magic number */ + min-height: calc(100vh - 95px); + display: flex; + flex-direction: column; + justify-content: flex-start; +} + +.date-tag { + font-size: smaller; } article>p { @@ -256,7 +269,7 @@ details { max-width: 100%; } -.pages-article>p{ +.pages-article>p { margin-top: 0; margin-bottom: 0; } @@ -279,7 +292,30 @@ footer { display: flex; flex-direction: row; justify-content: space-between; - +} + +.nav-buttons-bottom { + justify-self: flex-end; +} + +.bouncy { + animation: bounce 1s cubic-bezier(0.45, 0.05, 0.55, 0.95) infinite; +} + +@keyframes bounce { + 0%, 100% { + transform: translateY(0); + } + 50% { + transform: translateY(-5px); + } + 75% { + transform: translateY(0); + } + 100% { + transform: translateY(0); + animation-delay: 3s; /* add a 3 second delay before restarting the animation */ + } } /* body > footer { @@ -354,4 +390,4 @@ footer { // h2 { // font-size: 2.1rem; // } -// } */ +// } */ \ No newline at end of file