diff --git a/_includes/footer.html b/_includes/footer.html
index 82de53336183d17ecbdfbbabe9959c532bb108b3..c9170a4c36cba625435cc269095b9a739516a84c 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,38 +1,39 @@
<footer class="site-footer">
- <div class="wrapper">
+ <div class="wrapper">
<h2 class="footer-heading">Free Software Labor</h2>
- <div class="footer-col-wrapper">
- <div class="footer-col footer-col-1">
- <ul class="contact-list">
+ <div class="footer-col-wrapper">
+ <div class="footer-col footer-col-1">
+ <ul class="contact-list">
<li>Hochschule Bonn-Rhein-Sieg</li>
<li>Raum A020</li>
- </ul>
- </div>
-
- <div class="footer-col footer-col-2">
- <ul class="social-media-list">
- <li>
- <a href="/wiki/">
+ </ul>
+ </div>
+
+ <div class="footer-col footer-col-2">
+ {% comment %}
+ <ul class="social-media-list">
+ <li>
+ <a href="/wiki/">
Wiki
- </a>
- </li>
- <li>
- <a href="/projects/">
+ </a>
+ </li>
+ <li>
+ <a href="/projects/">
Projekte
- </a>
- </li>
-
- </ul>
- </div>
-
- <div class="footer-col footer-col-3">
- <p class="text">{{ site.coolquote }}</p>
- </div>
- </div>
-
- </div>
+ </a>
+ </li>
+ </ul>
+ {% endcomment %}
+ </div>
+
+ <div class="footer-col footer-col-3">
+ <p class="text">{{ site.coolquote }}</p>
+ </div>
+ </div>
+
+ </div>
</footer>
diff --git a/_includes/header.html b/_includes/header.html
index 7f84753b84717cd1a25a4dffa7bf320b48d4be34..c1c8fd5aa7e0d2d9f4de0ce3ed1782876ee65c46 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -1,20 +1,17 @@
<header class="site-header">
-
<div class="wrapper">
<a class="site-title" href="{{ site.baseurl }}/">{{ site.title }}</a>
<a href="https://h-brs.de"><img class="hbrs-logo" src="/images/hbrs_logo.svg" /></a>
</div>
+</header>
-
-{% comment %}
-<div class="trigger">
- {% for page in site.pages %}
- {% if page.title %}
- <a class="page-link" href="{{ page.url | prepend: site.baseurl }}">{{ page.title }}</a>
- {% endif %}
- {% endfor %}
+<div class="navbar-wrapper">
+ <div class="navbar">
+ <a class="page-link" href="/wiki">Wiki</a>
+ <a class="page-link" href="/projects">Projekte</a>
+ <a class="page-link" href="/info/faq">FAQ</a>
+ </div>
</div>
-{% endcomment %}
-</header>
+
diff --git a/_layouts/default.html b/_layouts/default.html
index e4ab96fb0b93f94b18e15f00917f31bbe0ceeaa2..a2dab45098a819801f076f3b61a80344cddfa692 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -1,20 +1,20 @@
<!DOCTYPE html>
<html>
- {% include head.html %}
+ {% include head.html %}
- <body>
+ <body>
- {% include header.html %}
+ {% include header.html %}
- <div class="page-content">
- <div class="wrapper">
- {{ content }}
- </div>
- </div>
+ <div class="page-content">
+ <div class="wrapper">
+ {{ content }}
+ </div>
+ </div>
- {% include footer.html %}
+ {% include footer.html %}
- </body>
+ </body>
</html>
diff --git a/_sass/_custom.scss b/_sass/_custom.scss
index aa8b5277b15a82c11aeba54dd109e0352a800485..1b0c5459739606d95330592e8e1d024b2bc9174a 100644
--- a/_sass/_custom.scss
+++ b/_sass/_custom.scss
@@ -1,3 +1,24 @@
+div.navbar-wrapper {
+ width: 100%;
+ background:linear-gradient($grey-color-dark, $background-color);
+}
+
+div.navbar {
+ line-height: 22px;
+ width: 858px;
+ margin-left: auto;
+ margin-right: auto;
+ text-align: right;
+}
+
+div.navbar a {
+ &,
+ &:visited {
+ padding: 5px 10px;
+ color: $brand-color;
+ }
+}
+
div.welcome {
width: 100%;
margin-bottom: 10px;
diff --git a/_sass/_layout.scss b/_sass/_layout.scss
index daf66d4d21d63dcfa2defa062a318be5fe9c27cb..ab98319fbd34ebe7a85ca02ec8c6a5d57e57d00f 100644
--- a/_sass/_layout.scss
+++ b/_sass/_layout.scss
@@ -2,8 +2,8 @@
* Site header
*/
.site-header {
- border-top: 5px solid $grey-color-dark;
- border-bottom: 1px solid $grey-color-light;
+ margin-top: 5px;
+ border-bottom: 1px solid $grey-color-dark;
min-height: 56px;
// Positioning context for the mobile navigation icon
@@ -103,7 +103,8 @@
* Page content
*/
.page-content {
- padding: $spacing-unit 0;
+ padding-top: 10px;
+ padding-bottom: 30px;
}
.page-heading {
diff --git a/css/main.scss b/css/main.scss
index 173cad2e0f497f778d0181b604ebbbfa296ad2c6..86fd1a77c6c93305de4550c612e112753b5a0349 100755
--- a/css/main.scss
+++ b/css/main.scss
@@ -14,12 +14,13 @@ $base-line-height: 1.5;
$spacing-unit: 30px;
$text-color: #111;
-$background-color: #fdfdfd;
-$brand-color: #2a7ae2;
+$brand-color: #009ee0;
+
+$background-color: #ffffff;
$grey-color: #828282;
-$grey-color-light: lighten($grey-color, 40%);
-$grey-color-dark: darken($grey-color, 25%);
+$grey-color-dark: #ecefee;
+$grey-color-light: #fdfdfd;
$on-palm: 600px;
$on-laptop: 800px;
diff --git a/favicon.ico b/favicon.ico
index 9223b4c22a5b31825b24a7a9ffe2f42125719f93..d1bd99e65b7e4b35b2068fcadfe05732f318cc49 100644
Binary files a/favicon.ico and b/favicon.ico differ
diff --git a/favicon.png b/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..bbd5f91a975039cff5610eaaa3aa7411a444b7f9
Binary files /dev/null and b/favicon.png differ
diff --git a/favicon.xcf b/favicon.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..694f650293e9adfc79a401bbbb91f79bdc2589a3
Binary files /dev/null and b/favicon.xcf differ
diff --git a/index.html b/index.html
index 6930837b1c38ab0421ca30c2fc54f1b433735817..61ae86ec5e80255c1678fa328d78ba315bb46f0a 100644
--- a/index.html
+++ b/index.html
@@ -21,7 +21,7 @@ layout: default
<p>Du findest uns in Raum A020 an der Hochschule Bonn-Rhein-Sieg,<br />
schau doch einfach mal vorbei und ebne den Weg für mehr Freie Software!</p>
- <p class="welcome-more"><a href="/wiki/Das_Labor">Mehr erfahren</a></p>
+ <p class="welcome-more"><a href="/info/labor">Mehr erfahren</a></p>
<br class="clearfix" />
</div>
diff --git a/info/das_labor.md b/info/labor/index.md
similarity index 96%
rename from info/das_labor.md
rename to info/labor/index.md
index 51817c2087ca223bed30b1b0bae4dafe202b4a99..006723e579fa15bf8f6e2b8e32a2bf2e8a051e80 100644
--- a/info/das_labor.md
+++ b/info/labor/index.md
@@ -3,7 +3,7 @@ layout: page
title: Das Labor
---
-<img src="/images/labor.jpg" class="right" width="400px" />
+<img src="labor.jpg" class="right" width="400px" />
Du glaubst daran, dass Freie Software wichtig ist? Dann bist du richtig bei uns!
Das Free Software Lab fungiert als Ratgeber für die Entwicklung Freier Software.
diff --git a/images/labor.jpg b/info/labor/labor.jpg
similarity index 100%
rename from images/labor.jpg
rename to info/labor/labor.jpg