2 files changed, 10 insertions, 12 deletions
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 694d8a0..56e582c 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -5,12 +5,10 @@
   <meta name="yandex-xverification" content="fc9dd63070a12909">
   <meta charset="UTF-8" />
   <meta author="Mateja Maric" />
-
-  <!--<meta name="description"-->
-  <!--content="I am Mateja Maric and this is my personal web site. I am a student from Belgrade, Serbia. I am primarily interested in Unix-like operating systems and free(as in freedom) software.">-->
-  <!--<meta name="keywords" content="mateja, maric, homepage, site, blog, contact">-->
-  <!--<link rel="canonical" href="https://matejamaric.com" />-->
-
+  {{ if .Description }}
+  <meta name="description" content="{{ .Description }}">
+  {{ end }}
+  <link rel="canonical" href="{{ .Permalink }}" />
   <meta name="viewport" content="width=device-width initial-scale=1.0" />
   <link href="/style.css" rel="stylesheet" type="text/css" />
   <title>{{ .Title }}</title>
@@ -19,11 +17,11 @@
 <body>
   <nav>
     <div class="mm">Mateja Maric</div>
-    <a class="{{ if eq .URL `/`}}active{{ end }}" href="/">Home</a>
-    <a class="{{ if eq .URL `/blog/`}}active{{ end }}" href="/blog/">Blog</a>
-    <a href="https://github.com/MatejaMaric">GitHub</a>
-    <a href="https://git.matejamaric.com">Git server</a>
-    <a class="{{ if eq .URL `/contact/`}}active{{ end }}" href="/contact/">Contact</a>
+    <a {{ if eq .RelPermalink "/" }} class="active" {{ end }} href="/">Home</a>
+    <a {{ if eq .RelPermalink "/blog/" }} class="active" {{ end }} href="/blog/">Blog</a>
+    <a target="_blank" href="https://github.com/MatejaMaric">GitHub</a>
+    <a target="_blank" href="https://git.matejamaric.com">Git server</a>
+    <a {{ if eq .RelPermalink "/contact/" }} class="active" {{ end }} href="/contact/">Contact</a>
   </nav>
   <main>
     {{ block "main" . }}{{ end }}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 2fcfeba..2051961 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -3,7 +3,7 @@
 <h3>Posts</h3>
 <ul>
   {{ range .Pages }}
-  <li>{{ .Date.Format "2 Jan 2006" }} - <a href="{{ .URL }}">{{ .Title }}</a></li>
+  <li>{{ .Date.Format "2 Jan 2006" }} - <a href="{{ .RelPermalink }}">{{ .Title }}</a></li>
   {{ end }}
 </ul>
 {{ end }}