From da27da80a7cf1ef24e5e60e2d91ef44f46f55bbd Mon Sep 17 00:00:00 2001
From: Halfdan <halm@itu.dk>
Date: Tue, 15 Nov 2022 18:17:19 +0100
Subject: [PATCH] Tweak tweak tweak tweak

---
 themes/datacoop2020/assets/static/css/style.scss |  6 +-----
 themes/datacoop2020/layouts/_default/baseof.html | 15 ++++++++-------
 themes/datacoop2020/layouts/_default/single.html |  1 -
 themes/datacoop2020/layouts/partials/nav.html    | 14 +++++++-------
 4 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/themes/datacoop2020/assets/static/css/style.scss b/themes/datacoop2020/assets/static/css/style.scss
index 11c69c2..bd28542 100644
--- a/themes/datacoop2020/assets/static/css/style.scss
+++ b/themes/datacoop2020/assets/static/css/style.scss
@@ -191,6 +191,7 @@ aside header a img {
     body {
         flex-direction      : column;
         border              : 0;
+        line-height         : 2rem;
     }
 
     aside {
@@ -208,11 +209,6 @@ aside header a img {
         margin              : calc(var(--base-grid) / 2) var(--base-grid);
     }
 
-    aside header a {
-        width               : 35%;
-        max-width           : 35%;
-    }
-
     aside nav {
         display             : none;
     }
diff --git a/themes/datacoop2020/layouts/_default/baseof.html b/themes/datacoop2020/layouts/_default/baseof.html
index 7445feb..98a3d45 100644
--- a/themes/datacoop2020/layouts/_default/baseof.html
+++ b/themes/datacoop2020/layouts/_default/baseof.html
@@ -5,6 +5,7 @@
         <aside>
             <header>
                 <a href="index.html"><img src="{{ printf "/static/img/logo_%s.svg" .Site.Language.Lang | absURL }}" alt="data coop logo" width="240" height="140"></a>
+
                 <div class="nav-toggle" id="nav-toggle-header">
                     <span id="nav-toggle-a"></span> 
                     <span id="nav-toggle-b"></span> 
@@ -19,20 +20,20 @@
             </article>
         </main>
         <script>
-            var menu = document.getElementById("nav-toggle-header")
-            var nav = document.getElementsByTagName('nav')[0] 
+            var menu = document.getElementById("nav-toggle-header");
+            var nav = document.getElementsByTagName('nav')[0];
 
             function toggleMenu() {
                 if ( menu.classList.contains("display") ) {
-                    menu.classList.remove("display")
-                    nav.classList.remove("display")
+                    menu.classList.remove("display");
+                    nav.classList.remove("display");
                 } else {
-                    menu.classList.add("display")
-                    nav.classList.add("display")
+                    menu.classList.add("display");
+                    nav.classList.add("display");
                 }
             }
 
-            menu.addEventListener( "click", toggleMenu )
+            menu.addEventListener("click", toggleMenu);
         </script>
     </body>
 </html>
diff --git a/themes/datacoop2020/layouts/_default/single.html b/themes/datacoop2020/layouts/_default/single.html
index 48d24ce..b1a1732 100644
--- a/themes/datacoop2020/layouts/_default/single.html
+++ b/themes/datacoop2020/layouts/_default/single.html
@@ -3,5 +3,4 @@
 <h1>{{ .Title | markdownify }}</h1>
 {{ .Content }}
 
-
 {{- end -}}
diff --git a/themes/datacoop2020/layouts/partials/nav.html b/themes/datacoop2020/layouts/partials/nav.html
index 88e6053..26e1d09 100644
--- a/themes/datacoop2020/layouts/partials/nav.html
+++ b/themes/datacoop2020/layouts/partials/nav.html
@@ -1,16 +1,16 @@
 <nav>
     <ol>
-      {{ range .Site.Menus.nav }}
-        <li><a href="{{ .URL }}">{{ .Name }}</a></li>
-      {{ end }}
+        {{ $currentPage := . }}  
+        {{ range .Site.Menus.nav }}
+            <li><a href="{{ .URL }}" class="{{ if $currentPage.IsMenuCurrent "nav" . }}active{{ end }}">{{ .Name }}</a></li>
+        {{ end }}
     </ol>
 
     <footer>
         <ol>
-          {{ range $.Site.Home.AllTranslations }}
-          <li><a href="{{ .Permalink }}">{{ .Language.LanguageName }}</a></li>
-          {{ end }}
+            {{ range $.Site.Home.AllTranslations }}
+                <li><a href="{{ .Permalink }}">{{ .Language.LanguageName }}</a></li>
+            {{ end }}
         </ol>
     </footer>
 </nav>
-