diff --git a/assets/css/article.css b/assets/css/article.css index 480f412..2d76b86 100644 --- a/assets/css/article.css +++ b/assets/css/article.css @@ -5,12 +5,12 @@ article { grid-template-rows: repeat(3, auto); } -article > header { +article > #header { grid-area: header; margin-bottom: 2rem; } -article > header > i { +article > #header > i { color: var(--accent); display: block; font-size: 1rem; diff --git a/assets/css/landing.css b/assets/css/landing.css index 542c57b..738b761 100644 --- a/assets/css/landing.css +++ b/assets/css/landing.css @@ -2,24 +2,24 @@ body { width: min(95vw, 52rem); } -header > img { +#header > img { height: 15vh; margin: .5rem auto; box-shadow: none; } -header > h1, -header > p { +#header > h1, +#header > p { margin-top: 0; font-family: 'Manrope XLight'; color: var(--text); } -header > h1 > span { +#header > h1 > span { font: inherit; } -nav { +#nav { display: flex; justify-content: center; flex-wrap: wrap; @@ -28,7 +28,7 @@ nav { width: 100%; } -nav > a { +#nav > a { color: var(--text); border-bottom: .05rem solid var(--text); @@ -41,7 +41,7 @@ nav > a { transition: color .3s, border-bottom .3s, padding .3s; } -nav > a:hover { +#nav > a:hover { color: var(--primary); border-bottom: .05rem solid var(--primary); } @@ -177,7 +177,7 @@ nav > a:hover { color: var(--accent); } -footer { +#footer { display: flex; flex-direction: column; align-items: center; @@ -190,8 +190,8 @@ footer { border-top: .1rem solid var(--accent); } -footer > p, -footer > p > a { +#footer > p, +#footer > p > a { font-size: .65rem; } diff --git a/assets/css/theme.css b/assets/css/theme.css index b5b1013..9d81961 100644 --- a/assets/css/theme.css +++ b/assets/css/theme.css @@ -26,7 +26,7 @@ body { color: var(--text); } -header { +#header { color: var(--primary); font-size: 3rem; text-align: center; diff --git a/content/pages/articles.njk b/content/pages/articles.njk index e13b603..d11c34c 100644 --- a/content/pages/articles.njk +++ b/content/pages/articles.njk @@ -1,14 +1,14 @@ - - + + {% include "templates/defaultTags.njk" %} - + Site Map -
+
+

Here's a list of all articles:

diff --git a/content/pages/articles/graphical-profile/colours.njk b/content/pages/articles/graphical-profile/colours.njk index e7c3dc5..5f7378b 100644 --- a/content/pages/articles/graphical-profile/colours.njk +++ b/content/pages/articles/graphical-profile/colours.njk @@ -3,12 +3,12 @@ {% import "components/color.njk" as color with context %} {% block head %} - + qwik - colours {% endblock %} {% block header %} - A promotional image for our colour scheme. + A promotional image for our colour scheme. Colours Last updated 10th August 2021 {% endblock %} diff --git a/content/pages/articles/graphical-profile/intro.njk b/content/pages/articles/graphical-profile/intro.njk index b94f5cc..cbd9a50 100644 --- a/content/pages/articles/graphical-profile/intro.njk +++ b/content/pages/articles/graphical-profile/intro.njk @@ -6,7 +6,7 @@ {% endblock %} {% block header %} - A promotional image for our graphical resources. + A promotional image for our graphical resources. Graphical Resources Last updated 10th August 2021 {% endblock %} diff --git a/content/pages/index.njk b/content/pages/index.njk index d1cd599..1cc0f84 100644 --- a/content/pages/index.njk +++ b/content/pages/index.njk @@ -1,8 +1,8 @@ - - + + {% include "templates/defaultTags.njk" %} - + qwik @@ -27,24 +27,26 @@

#} -
- +
+ + -
-

TOOLBOX

+

+ + TOOLBOX +

Nitter

@@ -81,9 +83,11 @@
-
-

SERVICES

+

+ + SERVICES +

These services requires an account, which you can create here.

@@ -132,9 +136,11 @@
-
-

CONTACT

+

+ + CONTACT +

If you have any questions, feedback, ideas, or anything else, feel free to contact us.

@@ -156,7 +162,7 @@
-
+
+
diff --git a/content/templates/article.njk b/content/templates/article.njk index 7294c78..227e102 100644 --- a/content/templates/article.njk +++ b/content/templates/article.njk @@ -1,18 +1,18 @@ - - + + {% include "./defaultTags.njk" %} - - + + {% block head %} {{ serverName }} {% endblock %}
-
+
+
diff --git a/content/templates/article_md.njk b/content/templates/article_md.njk index ccec1f9..b71d9f4 100644 --- a/content/templates/article_md.njk +++ b/content/templates/article_md.njk @@ -1,18 +1,18 @@ - - + + {% include "./defaultTags.njk" %} - - + + {% block head %} {{ serverName }} {% endblock %}
-
+
+
diff --git a/content/templates/defaultTags.njk b/content/templates/defaultTags.njk index 86513ed..8e86a15 100644 --- a/content/templates/defaultTags.njk +++ b/content/templates/defaultTags.njk @@ -1,17 +1,17 @@ - - + + - - - - - - - - - + + + + + + + + + - - - - + + + + diff --git a/content/templates/external_md.njk b/content/templates/external_md.njk index 0d71aaf..761a93c 100644 --- a/content/templates/external_md.njk +++ b/content/templates/external_md.njk @@ -1,17 +1,17 @@ - - + + {% include "templates/defaultTags.njk" %} - - + + {{ externalMeta.title if externalMeta.title else serverName }}
-
+
+
diff --git a/libs/generateContext.js b/libs/generateContext.js index a8b8d18..9850613 100644 --- a/libs/generateContext.js +++ b/libs/generateContext.js @@ -11,7 +11,7 @@ function generateToc(dom) { // Generate links to lead to those anvhors. let tocLinks = [] - tocAnchors.forEach(anchor => tocLinks.push(`${anchor.getAttribute('data-orig-text')}`)) + tocAnchors.forEach(anchor => tocLinks.push(`${anchor.getAttribute('data-orig-text')}`)) return tocLinks } diff --git a/libs/markedRenderer.js b/libs/markedRenderer.js index f98fc8b..61bf08e 100644 --- a/libs/markedRenderer.js +++ b/libs/markedRenderer.js @@ -4,7 +4,7 @@ export const markedRenderer = { // Rendering of headings (add an anchor above all headings). heading(text, level) { return ` - + ${text} diff --git a/libs/nunjucksConfig.js b/libs/nunjucksConfig.js index d313d63..3c4b173 100644 --- a/libs/nunjucksConfig.js +++ b/libs/nunjucksConfig.js @@ -23,7 +23,8 @@ export function nunjacksConfig(njk, express, Config) { // Configure marked (markdown parser) marked.use({ gfm: true, // Use GitHub formatting? - renderer: markedRenderer // Use my own custom rendering for som tags + renderer: markedRenderer, // Use my own custom rendering for som tags + xhtml: true // Use XHTML for extra GAINZ! }) // Let nunjucks use markdown.