From e31babf0ef55476a7eeeca305edca6667b5f653c Mon Sep 17 00:00:00 2001
From: kolaente <konrad@kola-entertainments.de>
Date: Sun, 14 Oct 2018 18:54:25 +0200
Subject: [PATCH] Added two navbar designs

---
 src/themes/vikunja/layouts/home/single.html   |  2 +-
 src/themes/vikunja/layouts/page/single.html   | 11 ++------
 .../layouts/partials/navbar-blank.html        |  3 ++
 .../layouts/partials/navbar-content.html      | 25 +++++++++++++++++
 .../vikunja/layouts/partials/navbar.html      | 28 ++-----------------
 5 files changed, 33 insertions(+), 36 deletions(-)
 create mode 100644 src/themes/vikunja/layouts/partials/navbar-blank.html
 create mode 100644 src/themes/vikunja/layouts/partials/navbar-content.html

diff --git a/src/themes/vikunja/layouts/home/single.html b/src/themes/vikunja/layouts/home/single.html
index f425f10..b7d3341 100644
--- a/src/themes/vikunja/layouts/home/single.html
+++ b/src/themes/vikunja/layouts/home/single.html
@@ -3,7 +3,7 @@
 <section class="homepage-hero hero is-dark is-medium">
 	<!-- Hero head: will stick at the top -->
 	<div class="hero-head">
-		{{ partial "navbar.html" . }}
+		{{ partial "navbar-blank.html" . }}
 	</div>
 
 	<!-- Hero content: will be in the middle -->
diff --git a/src/themes/vikunja/layouts/page/single.html b/src/themes/vikunja/layouts/page/single.html
index ff8d56b..a94aa77 100644
--- a/src/themes/vikunja/layouts/page/single.html
+++ b/src/themes/vikunja/layouts/page/single.html
@@ -2,15 +2,8 @@
 {{ partial "navbar.html" . }}
 
 <div class="container is-centered page">
-	<div class="columns">
-		<div class="column is-one-quarter">
-			{{ partial "menu" . }}
-		</div>
-		<div class="column">
-			<div class="content">
-				{{ .Content }}
-			</div>
-		</div>
+	<div class="content">
+		{{ .Content }}
 	</div>
 </div>
 
diff --git a/src/themes/vikunja/layouts/partials/navbar-blank.html b/src/themes/vikunja/layouts/partials/navbar-blank.html
new file mode 100644
index 0000000..b3fd046
--- /dev/null
+++ b/src/themes/vikunja/layouts/partials/navbar-blank.html
@@ -0,0 +1,3 @@
+<nav class="navbar">
+	{{ partial "navbar-content.html" . }}
+</nav>
\ No newline at end of file
diff --git a/src/themes/vikunja/layouts/partials/navbar-content.html b/src/themes/vikunja/layouts/partials/navbar-content.html
new file mode 100644
index 0000000..5349b3f
--- /dev/null
+++ b/src/themes/vikunja/layouts/partials/navbar-content.html
@@ -0,0 +1,25 @@
+<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/src/themes/vikunja/layouts/partials/navbar.html b/src/themes/vikunja/layouts/partials/navbar.html
index fb32f6d..c66d6c9 100644
--- a/src/themes/vikunja/layouts/partials/navbar.html
+++ b/src/themes/vikunja/layouts/partials/navbar.html
@@ -1,27 +1,3 @@
-<nav class="navbar">
-	<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>
+<nav class="navbar is-primary">
+	{{ partial "navbar-content.html" . }}
 </nav>
\ No newline at end of file