diff --git a/package.json b/package.json index cd56b6c..6b1d19b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@fwdekker/template", - "version": "1.0.2", + "version": "1.0.3", "description": "The base template for pages on fwdekker.com.", "author": "Felix W. Dekker", "license": "MIT", diff --git a/src/main/css/common.css b/src/main/css/common.css index c656e33..f1af7cb 100644 --- a/src/main/css/common.css +++ b/src/main/css/common.css @@ -24,12 +24,12 @@ body { margin-bottom: 5rem; } -.footer { +footer { margin-bottom: 3rem; } -/* Custom styling */ +/* Override Milligram */ header .container { text-align: center; } diff --git a/src/main/css/nav.css b/src/main/css/nav.css index 5e54d4b..e228343 100644 --- a/src/main/css/nav.css +++ b/src/main/css/nav.css @@ -1,4 +1,4 @@ -.nav { +nav { margin: 0; width: 100%; @@ -8,12 +8,12 @@ --padding: calc(2em / 3); } -.nav * { +nav * { z-index: 10; vertical-align: middle; } -.nav a { +nav a { display: inline-block; margin: 0; padding: calc(var(--padding)) calc(var(--padding)); @@ -23,27 +23,27 @@ } -.nav .logo { +nav .logo { width: calc(1em + var(--padding)); height: calc(1em + var(--padding)); vertical-align: middle; filter: brightness(0) invert(1); } -.nav div.logo { +nav div.logo { display: inline-block; margin-right: calc(1em / 3); } -.nav ul { +nav ul { margin: 0; padding: 0; list-style: none; } -.nav ul li { +nav ul li { display: inline-block; margin: 0; padding: 0; @@ -52,35 +52,35 @@ background-color: var(--fwdekker-theme-color); } -.nav ul li:hover, -.nav ul li:focus-within { +nav ul li:hover, +nav ul li:focus-within { cursor: pointer; background-color: var(--fwdekker-theme-color-very-dark); } -.nav li.currentPage { +nav li.currentPage { background-color: var(--fwdekker-theme-color-dark); } -.nav ul li ul { +nav ul li ul { display: none; position: absolute; left: 0; } -.nav ul li ul li ul { +nav ul li ul li ul { left: 100%; top: 0; } -.nav ul li:hover > ul, -.nav ul li:focus-within > ul, -.nav ul li ul:hover { +nav ul li:hover > ul, +nav ul li:focus-within > ul, +nav ul li ul:hover { display: block; } -.nav ul li ul li { +nav ul li ul li { min-width: 7em; width: 100%; white-space: nowrap; diff --git a/src/main/js/main.js b/src/main/js/main.js index 752fe7c..fb50da8 100644 --- a/src/main/js/main.js +++ b/src/main/js/main.js @@ -5,8 +5,8 @@ * @param query the type of element to return * @returns {HTMLElement} the HTML element described by the given string */ -const stringToHtml = function (string, query) { - return new DOMParser().parseFromString(string, "text/html").body.querySelector(query); +const stringToHtml = function(string, query) { + return (new DOMParser()).parseFromString(string, "text/html").body.querySelector(query); } /** @@ -25,7 +25,7 @@ const $ = q => document.querySelector(q); * * @param fun {function(...*): *} the function to run */ -const doAfterLoad = function (fun) { +const doAfterLoad = function(fun) { if (document.readyState === "complete") { fun(); return; @@ -49,7 +49,7 @@ const doAfterLoad = function (fun) { * @param [highlightPath] {String} the path to highlight together with its parents * @returns {HTMLElement} a base navigation element that will eventually be filled with contents */ -const nav = function (highlightPath = "") { +const nav = function(highlightPath = "") { const base = stringToHtml( `