initial draft for navbar, changed a few colors, moved das_labor page and labor.jpg, and more

33f93fbc · Lukas Schauer · 4e977190 · 33f93fbc · 33f93fbc · 33f93fbc
Commit 33f93fbc authored 9 years ago by Lukas Schauer
--- a/_includes/footer.html
+++ b/_includes/footer.html
 <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>
--- a/_includes/header.html
+++ b/_includes/header.html
 <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>
+
--- a/_layouts/default.html
+++ b/_layouts/default.html
 <!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>
--- a/_sass/_custom.scss
+++ b/_sass/_custom.scss
+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;

--- 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 {

--- 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;

--- a/favicon.ico
+++ b/favicon.ico
--- a/favicon.png
+++ b/favicon.png
--- a/favicon.xcf
+++ b/favicon.xcf
--- 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>


--- a/info/das_labor.md
+++ b/info/das_labor.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.

--- a/images/labor.jpg
+++ b/images/labor.jpg