From b5be385ea5210b1bbda9ca2cef590133fe4ba3e4 Mon Sep 17 00:00:00 2001
From: "Felix W. Dekker" <felix@fwdekker.com>
Date: Wed, 28 Apr 2021 12:19:46 +0200
Subject: [PATCH] Simplify code for visibility toggle

---
 package-lock.json                | Bin 214017 -> 214017 bytes
 package.json                     |   4 ++--
 src/main/css/snippets/common.css |  21 +++++++++------------
 src/main/js/main.js              |  13 ++-----------
 4 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f0a959b36e2d93db1c73009154b1323129da26d5..ef4894474b8981e8747b27b9b81aef9aa2705b8c 100644
GIT binary patch
delta 561
zcmZqd;BD;SonXdnq-QkIa{BZ~?-+$QK4xNKG@HDUQEc)CUH;A7%+Cy_H>ojMP1ZIM
zn7-&QlXhs8xuIEdL9S^?gh^?Yf0d_Cg+)MOnZK)<vzd!`afXLWxnW|UpQ(|rex+Y<
zp{r%FslP?AZ(3!BvvZoWm$64~h>w9^c9?&rwnd`8scDFLq?2*d<c$k;reE04DA{DX
z&6M#--t<NTW=DQ~UH$UZq=LlcY+X}5W3%aw@0hehQv5S~BAjzVUCTrAssi(>3WD7&
zGkpvUQnQSV^Rvp*^4tsDOe~WU4Scgp9Yc%?wZk(4GjlxL+`K&eJ;Q>W3X`f5vjYvw
zoWlddjJ&l2eIg73CoeqWH#vZfeR+TmGb6~qLX#9&xBp+tsO3!;-zRb!wX1$&+^+hG
jiQAISexKf0$>fFA^S7BMD=>>rUvI(8u|3{^d66&x{`<H;

delta 525
zcmZqd;BD;SonXdnsAoLUa{BZo3d}+qA2BmAnoi!xC^mV6F8^k3=4S?znI>6H);1BC
ze5qSI#3$U@O+P%(ATQ0sKiA8$s4CF0z&)=buPi++$iK=xGbh->(%7u1&`&=nEjcnf
z($Y6Fsw%~|&`;aQ&&wn@CnQ-r*VH33I8i&>FU_UI)668LeEP!UOuExA>}Qm0GTmm%
zcqEU}bh@E7vmekMfs?dC6HATLOHEBHBi-~f%={wUiVVD?0-_uvD}v4Za*|CgO`WPD
z1F};s@(i4V)6z`CBa-toD@w95Onsd7Epj7D^Rk1yD>5o`Ga_=GA`P^&U6X>$vL<g_
z=r=iljeU854m0EANz=r)|6j_e<xLmA%C!r8V%#q9iAlkd4nCc3xRc2X!>hNMCMz(D
QPG4`q%&|S*fO(NH0B$F;5&!@I

diff --git a/package.json b/package.json
index 3f0892b..caf31c5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@fwdekker/template",
-    "version": "2.2.2",
+    "version": "2.2.3",
     "description": "The base template for pages on fwdekker.com.",
     "author": "Felix W. Dekker",
     "license": "MIT",
@@ -35,7 +35,7 @@
         "grunt-contrib-watch": "^1.1.0",
         "grunt-focus": "^1.0.0",
         "grunt-webpack": "^4.0.3",
-        "webpack": "^5.35.0",
+        "webpack": "^5.36.0",
         "webpack-cli": "^4.6.0"
     }
 }
diff --git a/src/main/css/snippets/common.css b/src/main/css/snippets/common.css
index 2459db5..11a4df7 100644
--- a/src/main/css/snippets/common.css
+++ b/src/main/css/snippets/common.css
@@ -9,7 +9,16 @@ body {
     color: black;
 }
 
+main {
+    /* Flex-based footer positioning, taken from https://stackoverflow.com/a/12253099 */
+    display: flex;
+    flex-direction: column;
+    min-height: 100%;
+}
+
 #contents {
+    flex: 1;
+
     margin-top: 5rem;
     margin-bottom: 5rem;
 }
@@ -24,18 +33,6 @@ noscript p {
 }
 
 
-/* Main element display state */
-main.pageVisible {
-    display: flex;
-    flex-direction: column;
-    min-height: 100%;
-}
-
-.pageContents.pageVisible {
-    flex: 1;
-}
-
-
 /* Header */
 header .container {
     text-align: center;
diff --git a/src/main/js/main.js b/src/main/js/main.js
index 59f6800..fcfc144 100644
--- a/src/main/js/main.js
+++ b/src/main/js/main.js
@@ -193,19 +193,10 @@ const footerLink = function(prefix, text, url, suffix) {
  * Unhides the main element on the page and applies default display styling.
  */
 const showPage = function() {
-    // Flex-based footer positioning, taken from https://stackoverflow.com/a/12253099
     const main = $("main");
-    // TODO: Remove .style commands once all pages are migrated
-    main.style.display = "flex";
-    main.style.flexDirection = "column";
-    main.style.minHeight = "100%";
+    // TODO: Remove .style command once all pages are migrated
+    main.style.display = null;
     main.classList.remove("hidden");
-    main.classList.add("pageVisible");
-
-    // TODO: Remove .style commands once all pages are migrated
-    const contents = $("#contents");
-    contents.style.flex = "1";
-    contents.classList.add("pageVisible");
 }