diff options
| author | norrinorri <noora.vanttine@gmail.com> | 2017-05-27 16:25:49 +0300 |
|---|---|---|
| committer | norrinorri <noora.vanttine@gmail.com> | 2017-05-27 17:45:33 +0300 |
| commit | eaa26ae28ba242e50ea9e9c3731962f6eeef55e1 (patch) | |
| tree | 66b8947af1e02afd066e9c0072140c49422a9ca2 /_includes/header.html | |
| parent | 2892a301be9baa15c8ea9511c65277ab80b95879 (diff) | |
rebaseee
Diffstat (limited to '_includes/header.html')
| -rw-r--r-- | _includes/header.html | 11 |
1 files changed, 8 insertions, 3 deletions
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> |