From eaa26ae28ba242e50ea9e9c3731962f6eeef55e1 Mon Sep 17 00:00:00 2001
From: norrinorri <noora.vanttine@gmail.com>
Date: Sat, 27 May 2017 16:25:49 +0300
Subject: rebaseee

---
 _includes/header.html | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to '_includes')

diff --git a/_includes/header.html b/_includes/header.html
index 729ddc0..4cdb0be 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -1,15 +1,20 @@
 <header class="site-header">
 
-  <div class="wrapper">
+
 
     <div class="header__title">
       <h1>
-        <img src="/static/aswhite.png"/ height="40px" style="margin:20px "><a class="site-title" href="{{ site.baseurl }}/">{{ site.title }}</a>
+        <a class="site-title" href="{{ site.baseurl }}/"><img src="/static/aswhite.png"/ height="40px" style="margin:20px ">{{ site.title }}</a>
       </h1>
     </div>
     <nav class="navigation header__navigation">
       <ul>
+<<<<<<< b9aea514b507fe98e351c54dcd95f58b6342d8be
         <li class="navigation__item"><a href="{{ site.baseurl }}/">Etusivu</a></li>
+=======
+        <li class="navigation__item"><a href="{{ '/home/' | prepend: site.baseurl}}">Etusivu</a></li>
+        <li class="navigation__item"><a href="{{ '/hallitus/' | prepend: site.baseurl }}">Hallitus</a></li>
+>>>>>>> rebaseee
         <li class="navigation__item"><a href="{{ '/kilta/' | prepend: site.baseurl }}">Kilta</a></li>
         <li class="navigation__item"><a href="{{ '/opiskelu/' | prepend: site.baseurl }}">Opiskelu</a></li>
         <li class="navigation__item"><a href="{{ '/phuksit/' | prepend: site.baseurl }}">Uudet opiskelijat</a></li>
@@ -20,6 +25,6 @@
       </ul>
     </nav>
 
-  </div>
+
 
 </header>
-- 
cgit v1.3