From 8afcd8365c56a6fe91753804db8613d38cd5eaa2 Mon Sep 17 00:00:00 2001
From: Hanzei <hanzei@mailbox.org>
Date: Sat, 23 Jun 2018 11:59:46 +0200
Subject: [PATCH] Cleanup code

---
 layouts/index.html        |  2 +-
 layouts/partials/nav.html | 41 +++++++++++++++++++++------------------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/layouts/index.html b/layouts/index.html
index 770531d..dafb04c 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -127,7 +127,7 @@
 
 <!-- Bitty scrolling links script -->
 <script>
-$('a[href^="/#"]').click(function(e) {
+$('a[href^="#"]').click(function(e) {
     e.preventDefault();
     var target = this.hash;
     $('html, body').animate({
diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html
index 61e98f0..5fdd97c 100644
--- a/layouts/partials/nav.html
+++ b/layouts/partials/nav.html
@@ -14,38 +14,41 @@
       <a class="nav-item" href="{{ "/" | relURL }}">Main</a>
       {{ end }}
 
-      <a class="nav-item" href="{{ "/#about" | relURL }}">About</a>
+      <a class="nav-item" href="#about">About</a>
 
       {{ if and (.Site.Params.showProjects) (not (and (eq .Page.Section "projects") (eq .Page.Kind "section") )) }}
-        {{ if .IsHome }}
-        <a class="nav-item" href="{{ "/#projects" | relURL }}">Projects</a>
-        {{ else}}
-          {{ if ne .Section "projects" }}
-          <a class="nav-item" href="{{ "/projects" | relURL }}">Projects</a>
-          {{ else }}
-          <a class="nav-item" href="{{ "/projects" | relURL }}">Back to Projects</a>
-          {{ end }}
+      {{ if .IsHome }}
+      <a class="nav-item" href="#projects">Projects</a>
+      {{ else }}
+      <a class="nav-item" href="{{ "/projects" | relURL }}">
+        {{ if eq .Section "projects" }}
+        Back to Projects
+        {{ else }}
+        Projects
         {{ end }}
+      </a>
+      {{ end }}
       {{ end }}
 
       {{ if and (.Site.Params.showBlog) (not (and (eq .Page.Section "blog") (eq .Page.Kind "section") )) }}
-        {{ if .IsHome }}
-        <a class="nav-item" href="{{ "/#blog" | relURL }}">Blog</a>
+      {{ if .IsHome }}
+      <a class="nav-item" href="#blog">Blog</a>
+      {{ else }}
+      <a class="nav-item" href="{{ "/blog" | relURL }}">
+        {{ if eq .Section "blog" }}
+        Back to Blog
         {{ else }}
-          {{ if ne .Section "blog" }}
-          <a class="nav-item" href="{{ "/blog" | relURL }}">Blog</a>
-          {{ else }}
-          <a class="nav-item" href="{{ "/blog" | relURL }}">Back to Blog</a>
-          {{ end }}
-        {{ end}}
+        Blog
+        {{ end }}
+      </a>
+      {{ end }}
       {{ end }}
 
-      <a class="nav-item" href="{{ "/#contact" | relURL }}">Contact</a>
+      <a class="nav-item" href="#contact">Contact</a>
 
       {{ if and .Site.Params.showRSSButton .Site.RSSLink  }}
       <a class="nav-item" href="{{ .Site.RSSLink }}"><i class="fa fa-rss"></i></a>
       {{ end }}
-      
     {{ if not .Page.IsHome }}
     </div>
     {{ end }}