From 99f493dec37fc256a8f56bc026722e46aab65fec Mon Sep 17 00:00:00 2001 From: Henk Kalkwater Date: Wed, 24 Jun 2020 17:40:20 +0200 Subject: [PATCH] Restructured parts of the website --- public/static/style/base.css | 29 ++++++++++++++++++++++++----- source/constants.d | 4 ++++ views/pages/article-list.dt | 1 - views/pages/article.dt | 6 ++++-- views/pages/error.dt | 1 - views/pages/page.dt | 3 +-- views/pages/project-list.dt | 3 +-- views/pages/project.dt | 1 - views/parts/footer.dt | 5 +++++ views/parts/menu.dt | 13 ------------- views/parts/page.dt | 25 +++++++++++++++++++++++-- 11 files changed, 62 insertions(+), 29 deletions(-) create mode 100644 source/constants.d create mode 100644 views/parts/footer.dt diff --git a/public/static/style/base.css b/public/static/style/base.css index 5edf08c..7e87da1 100644 --- a/public/static/style/base.css +++ b/public/static/style/base.css @@ -7,11 +7,24 @@ min-width: calc(100% - 2px - 4em); } - body > nav { + body > section.header-navigation, body > footer { width: 100%; flex-grow: 1 !important; } + + .hide-small { + display: none; + } + + .hide-big { + display: block !important; + } } + +.hide-big { + display: none; +} + :root { font-family: "sans-serif"; --colour-bg: #f0f0f0; @@ -40,17 +53,23 @@ body { color: var(--colour-fg); } -body > nav { - flex: 0 0 160px; +body > section.header-navigation { + flex: 0 0 200px; padding: 2em; } -body > nav > header { +body > footer { + flex: 0 0 200px; + padding: 2em; + border: none; +} + +body > section.header-navigation > header { text-align: center; } -body > nav > header > img { +body > section.header-navigation > header > img { width: 100%; max-width: 160px; } diff --git a/source/constants.d b/source/constants.d new file mode 100644 index 0000000..4a955e9 --- /dev/null +++ b/source/constants.d @@ -0,0 +1,4 @@ +class Constants { + public static immutable string SITE_NAME = "Chris Netsoj.nl"; + public static immutable string COPYRIGHT = "© Chris Josten, 2020"; +} diff --git a/views/pages/article-list.dt b/views/pages/article-list.dt index dbacf14..3e731d9 100644 --- a/views/pages/article-list.dt +++ b/views/pages/article-list.dt @@ -4,7 +4,6 @@ block header title Posts - Netsoj.nl block sidebar - include /parts/menu.dt block content header diff --git a/views/pages/article.dt b/views/pages/article.dt index 97ea58e..7c3d434 100644 --- a/views/pages/article.dt +++ b/views/pages/article.dt @@ -1,9 +1,11 @@ extends /parts/page block header - title #{content.title} - Netsoj.nl + title #{content.title} - Chris Netsoj.nl + meta(name="og:title", content="#{content.title}") + meta(name="og:type", content="article") + meta(name="og:article", content="article") block sidebar - include /parts/menu.dt block content article diff --git a/views/pages/error.dt b/views/pages/error.dt index 9aa5ae5..7dbc7e2 100644 --- a/views/pages/error.dt +++ b/views/pages/error.dt @@ -4,7 +4,6 @@ block header title #{error.message} - Netsoj.nl block sidebar - include /parts/menu.dt block content header diff --git a/views/pages/page.dt b/views/pages/page.dt index 1b102c0..a1afa5e 100644 --- a/views/pages/page.dt +++ b/views/pages/page.dt @@ -1,10 +1,9 @@ extends /parts/page.dt block header - title #{content.title} - Netsoj.nl + title #{content.title} - Chris Netsoj.nl block sidebar - include /parts/menu.dt block content header diff --git a/views/pages/project-list.dt b/views/pages/project-list.dt index cdbe170..d127a3e 100644 --- a/views/pages/project-list.dt +++ b/views/pages/project-list.dt @@ -1,10 +1,9 @@ extends /parts/page.dt block header - title Projects - Netsoj.nl + title Projects - Chris Netsoj.nl block sidebar - include /parts/menu.dt block content header diff --git a/views/pages/project.dt b/views/pages/project.dt index 009ae36..65b8822 100644 --- a/views/pages/project.dt +++ b/views/pages/project.dt @@ -3,7 +3,6 @@ block header title #{content.title} - Netsoj.nl block sidebar - include /parts/menu.dt block content section diff --git a/views/parts/footer.dt b/views/parts/footer.dt new file mode 100644 index 0000000..b4a9fa1 --- /dev/null +++ b/views/parts/footer.dt @@ -0,0 +1,5 @@ +p + small + | © Chris Josten, 2020. If not specified otherwise, all content on this + | website is + | licensed under the CC-BY 4.0. diff --git a/views/parts/menu.dt b/views/parts/menu.dt index 695bd47..8b13789 100644 --- a/views/parts/menu.dt +++ b/views/parts/menu.dt @@ -1,14 +1 @@ -- void menuItem(string text, string link) - li - a(href="#{link}") #{text} -header - img.logo(src="/static/img/logo.png", alt="The logo of the website: the letter C drawn in an inprofessional manner with wobbley eyes on top") - p Chris's webstekkie -ul - - menuItem("home", "/"); - - menuItem("posts", "/posts/"); - - menuItem("projects", "/projects/"); - -footer - p ©Chris Josten, 2020 diff --git a/views/parts/page.dt b/views/parts/page.dt index 83a4f36..337e735 100644 --- a/views/parts/page.dt +++ b/views/parts/page.dt @@ -1,5 +1,6 @@ doctype html -html +html(prefix="og: http://ogp.me/ns#") + - import constants; head meta(name="viewport", content="width=device-width; initial-scale=1") link(rel="stylesheet", href="/static/style/base.css") @@ -7,10 +8,30 @@ html link(rel="alternate stylesheet", href="/static/style/old.css", title="1999") link(rel="shortcut icon", href="/static/img/logo.png") meta(name="theme-color", content="#7f0602") + meta(name="og:site_name", content="#{Constants.SITE_NAME}") block header body - nav + - void menuItem(string text, string link) + li + a(href="#{link}") #{text} + + section.header-navigation + header + img.logo(src="/static/img/logo.png", alt="The logo of the website: the letter C drawn in an unprofessional manner with wobbly eyes on put on top") + p Chris's webstekkie + nav + ul + - menuItem("home", "/"); + - menuItem("posts", "/posts/"); + - menuItem("projects", "/projects/"); block sidebar + footer.hide-small + block footer + include /parts/footer.dt main block content + + footer.hide-big + block footer + include /parts/footer.dt