From 004ebf016a7177b86a340acd0f62bb4a7548893b Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Wed, 26 Jan 2022 22:33:01 +0100
Subject: [PATCH] feat: make menu working properly again

---
 layouts/404.html                     |  4 +---
 layouts/_default/list.html           |  1 -
 layouts/_default/single.html         |  1 -
 layouts/doc/single.html              |  1 -
 layouts/features/single.html         |  9 ---------
 layouts/home/single.html             | 17 ----------------
 layouts/index.html                   |  2 +-
 layouts/partials/header.html         |  2 ++
 layouts/partials/navbar-blank.html   |  3 ---
 layouts/partials/navbar-content.html | 25 ------------------------
 layouts/partials/navbar.html         | 29 +++++++++++++++++++++++++---
 layouts/post/list.html               |  1 -
 layouts/post/single.html             |  1 -
 tailwind.config.js                   |  2 ++
 14 files changed, 32 insertions(+), 66 deletions(-)
 delete mode 100644 layouts/features/single.html
 delete mode 100644 layouts/home/single.html
 delete mode 100644 layouts/partials/navbar-blank.html
 delete mode 100644 layouts/partials/navbar-content.html

diff --git a/layouts/404.html b/layouts/404.html
index 01eae79..f8f7592 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -2,11 +2,9 @@
 
 <section class="hero is-warning is-fullheight">
 	<div class="hero-body">
-		<div class="container">
 			<h1 class="title">
 				Not found
 			</h1>
-			<a href="/">Go home</a>
-		</div>
+			<a href="/">Back to home page</a>
 	</div>
 </section>
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 6579599..2312e55 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,5 +1,4 @@
 {{ partial "header.html" . }}
-{{ partial "navbar.html" . }}
 
 <div class="container is-centered page">
 	<div class="columns">
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index eaa25b1..79c4fb4 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,5 +1,4 @@
 {{ partial "header.html" . }}
-{{ partial "navbar.html" . }}
 
 <div class="max-w-screen-xl mx-auto">
 	<article class="prose prose-a:text-primary prose-a:no-underline hover:prose-a:underline">
diff --git a/layouts/doc/single.html b/layouts/doc/single.html
index 5e3a519..7e4311d 100644
--- a/layouts/doc/single.html
+++ b/layouts/doc/single.html
@@ -1,5 +1,4 @@
 {{ partial "header.html" . }}
-{{ partial "navbar.html" . }}
 
 <div class="container is-centered page">
 	<div class="columns">
diff --git a/layouts/features/single.html b/layouts/features/single.html
deleted file mode 100644
index f67c0d2..0000000
--- a/layouts/features/single.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{{ partial "header.html" . }}
-
-<div class="features">
-{{ partial "navbar.html" . }}
-
-	{{ .Content }}
-
-{{ partial "footer.html" . }}
-</div>
\ No newline at end of file
diff --git a/layouts/home/single.html b/layouts/home/single.html
deleted file mode 100644
index b7d3341..0000000
--- a/layouts/home/single.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{{ partial "header.html" . }}
-
-<section class="homepage-hero hero is-dark is-medium">
-	<!-- Hero head: will stick at the top -->
-	<div class="hero-head">
-		{{ partial "navbar-blank.html" . }}
-	</div>
-
-	<!-- Hero content: will be in the middle -->
-	<div class="hero-body">
-		<div class="container has-text-centered">
-			{{ .Content }}
-		</div>
-	</div>
-</section>
-
-{{ partial "footer.html" . }}
diff --git a/layouts/index.html b/layouts/index.html
index 88ccb1e..3d2b703 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -3,7 +3,6 @@
 <section class="homepage-hero hero is-dark is-medium">
 	<!-- Hero head: will stick at the top -->
 	<div class="hero-head">
-		{{ partial "navbar-blank.html" . }}
 	</div>
 
 	<!-- Hero content: will be in the middle -->
@@ -25,6 +24,7 @@
 				{{end}}
 			{{end}}
 
+
 			{{ .Content | markdownify}}
 		</div>
 	</div>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index aeb4191..01a51ed 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -63,3 +63,5 @@
 		<link rel="icon" type="image/x-icon" href="{{ .Site.BaseURL }}favicon.ico">
 	</head>
 	<body class="antialiased bg-gray-50">
+
+	{{ partial "navbar.html" . }}
diff --git a/layouts/partials/navbar-blank.html b/layouts/partials/navbar-blank.html
deleted file mode 100644
index b3fd046..0000000
--- a/layouts/partials/navbar-blank.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<nav class="navbar">
-	{{ partial "navbar-content.html" . }}
-</nav>
\ No newline at end of file
diff --git a/layouts/partials/navbar-content.html b/layouts/partials/navbar-content.html
deleted file mode 100644
index 5349b3f..0000000
--- a/layouts/partials/navbar-content.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="container">
-	<div class="navbar-brand">
-		<a class="navbar-item" href="{{ .Site.BaseURL }}">
-			<img src="{{ .Site.BaseURL }}images/vikunja-logo-white.svg" alt="{{ .Site.Title }}">
-		</a>
-		<span class="navbar-burger burger" data-target="navMenu" aria-label="menu" aria-expanded="false">
-              <span></span>
-              <span></span>
-              <span></span>
-            </span>
-	</div>
-	<div class="navbar-menu" id="navMenu">
-		<div class="navbar-end">
-				<span class="navbar-item logo">
-					<img src="{{ .Site.BaseURL }}images/vikunja-logo-white.svg" alt="{{ .Site.Title }}">
-				</span>
-			{{ $currentNode := .Page }}{{ range .Site.Menus.page }}
-			<a class="navbar-item{{ if $currentNode.IsMenuCurrent "page" . }} is-active{{ end }}" href="{{ .URL }}">
-			{{ .Name }}
-			</a>
-			{{ end }}
-		</div>
-	</div>
-	<div class="navbar-background" id="navbar-background"></div>
-</div>
\ No newline at end of file
diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html
index c66d6c9..aa0518e 100644
--- a/layouts/partials/navbar.html
+++ b/layouts/partials/navbar.html
@@ -1,3 +1,26 @@
-<nav class="navbar is-primary">
-	{{ partial "navbar-content.html" . }}
-</nav>
\ No newline at end of file
+<nav class="w-full bg-primary">
+	<div class="flex justify-between max-w-screen-2xl mx-auto">
+<!--		<div class="navbar-brand">-->
+<!--			<a class="navbar-item" href="{{ .Site.BaseURL }}">-->
+<!--				<img src="{{ .Site.BaseURL }}images/vikunja-logo-white.svg" alt="{{ .Site.Title }}">-->
+<!--			</a>-->
+<!--			<span class="navbar-burger burger" data-target="navMenu" aria-label="menu" aria-expanded="false">-->
+<!--	        <span></span>-->
+<!--	        <span></span>-->
+<!--	        <span></span>-->
+<!--		</span>-->
+<!--		</div>-->
+		<a class="navbar-item" href="/">
+			<img src="{{ .Site.BaseURL }}images/vikunja-logo-white.svg" alt="{{ .Site.Title }}" class="h-10 my-2"/>
+		</a>
+		<div id="navMenu" class="text-white flex">
+			{{ $currentNode := .Page }}{{ range .Site.Menus.page }}
+				<a class="block h-full py-4 px-2 hover:bg-primary-darker {{ if $currentNode.IsMenuCurrent "page" . }}bg-primary-darker{{ end }}" href="{{ .URL }}">
+					{{ .Name }}
+				</a>
+			{{ end }}
+		</div>
+	</div>
+</nav>
+
+<div class="navbar-background" id="navbar-background"></div>
diff --git a/layouts/post/list.html b/layouts/post/list.html
index d4b8c90..ace627b 100644
--- a/layouts/post/list.html
+++ b/layouts/post/list.html
@@ -1,5 +1,4 @@
 {{ partial "header.html" . }}
-{{ partial "navbar.html" . }}
 
 <div class="container content page">
 	{{ $paginator := .Paginate (where .Data.Pages "Type" "post") }}{{ range $paginator.Pages }}
diff --git a/layouts/post/single.html b/layouts/post/single.html
index 8d3ce64..f93f828 100644
--- a/layouts/post/single.html
+++ b/layouts/post/single.html
@@ -1,5 +1,4 @@
 {{ partial "header.html" . }}
-{{ partial "navbar.html" . }}
 
 <div class="max-w-xl mx-auto">
 	<div class="content">
diff --git a/tailwind.config.js b/tailwind.config.js
index 198e677..047847c 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -7,7 +7,9 @@ module.exports = {
     extend: {
         colors: {
             primary: {
+                lighter: '#3b7aec',
                 DEFAULT: '#196aff',
+                darker: '#0064ff',
             }
         }
     },