diff --git a/_config.yml b/_config.yml
index 38aa75b76488123839f813c4e172c8d8f0baf2a4..14f6f4d885cf22c7daf2304a20a1b7058e64e9d5 100644
--- a/_config.yml
+++ b/_config.yml
@@ -4,7 +4,7 @@ permalink: pretty
# Setup
title: KWARC
tagline: 'Knowledge Adaptation and Reasoning for Content '
-description: 'The Research Group of the Professorship for Knowledge Representation and Processing at FAU Erlangen-Nürnberg (previously Jacobs University). '
+description: 'The Research Group of the Professorship for Knowledge Representation and Processing at <a href="https://fau.de" class="black-text">FAU Erlangen-Nürnberg</a> - <a href="https://cs.fau.de" class="black-text">Computer Science</a> (previously <a href="https://jacobs-university.de/" class="black-text">Jacobs University</a>). '
url: https://kwarc.info
baseurl: ''
paginate: 10
diff --git a/_includes/footer.html b/_includes/footer.html
index 1d53c26e9666e2f53131db9dbbefbde29b35ffab..901603c321832d0486571783283a90c3face6be2 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,47 +1,49 @@
<footer class="page-footer">
<div class="container">
<div class="row">
- <div class="col l6 s12">
- {{ site.description }}
- </div>
-
- <div class="col l2 s12">
- <a href="https://fau.de/" title="fau">
- FAU Erlangen-Nürnberg
- </a>
- <br />
- <a href="https://cs.fau.de" title="email">
- Computer Science
- </a>
+ <div class="col l8 s12">
+ <h5 class="white-text">About</h5>
+ <p class="grey-text text-lighten-4">
+ {{ site.description }}
+ </p>
</div>
<div class="col l2 s12">
- <a href="https://github.com/{{ site.github.owner_name }}" title="github">
+ <h5 class="white-text">Updates</h5>
+ <a href="https://github.com/{{ site.github.owner_name }}" title="GitHub" class="waves-effect waves-teal btn-flat">
<i class="fa fa-github" aria-hidden="true"></i> GitHub
</a>
- <br />
- <a href="mailto:{{ site.author.email }}" title="email">
- <i class="fa fa-envelope" aria-hidden="true"></i> E-Mail
- </a>
- <br />
- <a href="{{ site.baseurl }}/atom.xml" title="feed">
+
+ <!--
+
+ -->
+
+ <a href="{{ site.baseurl }}/atom.xml" title="Atom Feed" class="waves-effect waves-teal btn-flat">
<i class="fa fa-rss" aria-hidden="true"></i> Atom Feed
</a>
</div>
- <div class="col l2 s12">
- <a href="{{ site.github.zip_url | replace: 'zipball','edit' }}/{% if page.source %}{{ page.source }}{% else %}{{ page.path }}{% endif %}" title="edit">
+
+ <div class="col l2 s12">
+ <h5 class="white-text">For editors</h5>
+ <a href="{{ site.github.zip_url | replace: 'zipball','edit' }}/{% if page.source %}{{ page.source }}{% else %}{{ page.path }}{% endif %}" title="Edit this page" class="waves-effect waves-teal btn-flat">
<i class="fa fa-pencil-square-o" aria-hidden="true"></i> Edit this page
</a>
- <br />
- <a href="https://gl.kwarc.info/kwarc/website/#repository-holding-the-sources-of-the-KWARC.info-website" title="howto">
+
+ <a href="https://gl.kwarc.info/kwarc/website/#repository-holding-the-sources-of-the-KWARC.info-website" title="How to edit" class="waves-effect waves-teal btn-flat">
How to edit
</a>
</div>
+
</div>
</div>
<div class="footer-copyright">
<div class="container">
© 2017 The KWARC Group
+ <span class="right">
+ <a href="mailto:{{ site.author.email }}" title="E-Mail" class="black-text">
+ <i class="fa fa-envelope" aria-hidden="true"></i> Contact E-Mail
+ </a>
+ </span>
</div>
</div>
</footer>
\ No newline at end of file
diff --git a/_includes/header.html b/_includes/header.html
index cc8cc85c2ad48d9bd69ce90fd32be66db362895a..f6df6464ba61810314d88a9892347bcab8dc39b6 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -62,7 +62,6 @@
</ul>
</li>
- <li><div class="divider"></div></li>
- <li><a class="waves-effect" href="{{ site.baseurl }}/news/">News</a></li>
- <li><a class="waves-effect" href="{{ site.baseurl }}/contact/">Contact</a></li>
+ <li {% if page.url == "/news/" %} class="active" {% endif %}><a href="{{ site.baseurl }}/news/">News</a></li>
+ <li {% if page.url == "/contact/" %} class="active" {% endif %}><a href="{{ site.baseurl }}/contact/">Contact</a></li>
</ul>
\ No newline at end of file
diff --git a/_includes/nav.html b/_includes/nav.html
deleted file mode 100644
index a0737b81b9caf0d2a54cf03809bcf2edab05cde3..0000000000000000000000000000000000000000
--- a/_includes/nav.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!-- Navigation -->
-<nav class="navbar navbar-default navbar-fixed-top">
- <div class="container" >
-
- <!-- Brand and toggle get grouped for better mobile display -->
- <div class="navbar-header page-scroll">
- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
- <span class="sr-only">Toggle navigation</span>
- <span class="icon-bar"/>
- <span class="icon-bar"/>
- <span class="icon-bar"/>
- </button>
- <a class="navbar-brand" href="{{ site.baseurl }}/">KWARC</a>
- </div>
-
-{% assign url_parts = page.url | split: '/' %}
-{% assign base_url = url_parts | last %}
-{% assign sorted_pages = site.pages | sort:"menu_order" %}
-
- <!-- Collect the nav links, forms, and other content for toggling -->
- <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
- <ul class="nav navbar-nav navbar-left">
- {% for node in site.menu %}
- <li class="dropdown" >
- <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ node.title }}<span class="caret"></span></a>
- <ul class="dropdown-menu" >
- {% for sub in sorted_pages %}
-
- {% assign sub_parts = sub.url | split: '/' %}
- {% assign sub_url = sub_parts | last %}
- {% assign sub_folder = sub_parts[1] %}
- {% if sub_folder == node.folder %}
- <li {% if sub_url == base_url %} class="active" {% endif %}>
- <a href="{{ sub.url }}">
- {% if sub.menu_title %}
- {{ sub.menu_title }}
- {% else %}
- {{ sub.title }}
- {% endif %}
- </a>
- </li>
- {% endif %}
- {% endfor %}
- </ul>
- </li>
- {% endfor %}
- <li><a href="{{ site.baseurl }}/news/">News</a></li>
- </ul>
- <ul class="nav navbar-nav navbar-right" >
- <li><a href="/contact/">Contact</a></li>
- <li>
- <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Quick links<span class="caret"></span></a>
- <ul class="dropdown-menu" >
- <li><a href="{{ site.github.zip_url | replace: 'zipball','edit' }}/{% if page.source %}{{ page.source }}{% else %}{{ page.path }}{% endif %}" >Edit this page</a></li>
- <li><a href="https://gl.kwarc.info/kwarc/website/#repository-holding-the-sources-of-the-KWARC.info-website">How to edit</a></li>
- </ul>
- </li>
- </ul>
- </div>
- </div>
-</nav>
-
-
diff --git a/public/css/main.css b/public/css/main.css
index efda8a54a81002d64c4d0ee38fcfae372f2d1542..75a34236e7eee443e0bdde3c40fbeddef6267bb1 100644
--- a/public/css/main.css
+++ b/public/css/main.css
@@ -99,8 +99,8 @@ footer {
font-size: .9rem;
}
-footer a, footer a:hover {
- color: #000;
+.page-footer .btn {
+ margin-bottom: 5px;
}
/* side bar */