Made the navbar great again, added more people, evicted unwanted spaces

LunarWatcher · LunarWatcher · commit 423fdec9b599 · 2019-03-27T20:38:50.000+01:00
diff --git a/_config.yml b/_config.yml
@@ -145,6 +145,11 @@ servers:
 contributors: 
   regulars: 
     - geisterfurz007: "https://stackoverflow.com/users/6707985/"
-    - "Baum mit Augen": "https://chat.stackoverflow.com/users/3002139/"
-    
+    - "Baum mit Augen": "https://stackoverflow.com/users/3002139/"
+    - "Petter Friberg": "https://stackoverflow.com/users/5292302/"
+    - "Shree": "https://stackoverflow.com/users/965146"
+    - "Floern": "https://stackoverflow.com/users/559745"
+    - "Zoe": "https://stackoverflow.com/users/6296561"
+    - "Jonathan": "https://stackoverflow.com/users/2263949"
+    - "double-beep": "https://stackoverflow.com/users/10607772"
   #coders:
diff --git a/_includes/head.html b/_includes/head.html
@@ -1,5 +1,5 @@
 <head>
-    <title>{{page.title}}</title>
+    <title>{% if page.title %}{{page.title}} | {% endif %}SOBotics</title>
 
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta charset="utf-8">
diff --git a/_includes/header.html b/_includes/header.html
@@ -8,7 +8,7 @@
         <div class="topnav right">
             {% include nav.html %}
         </div>
-        <span class="sidenav-trigger" onclick="openSidenav()">&#9776</span>
+        <span class="sidenav-trigger" onclick="openSidenav()">&#9776;</span>
     </div>
 
 </header>
diff --git a/_includes/nav.html b/_includes/nav.html
@@ -1,3 +1 @@
-<a href="/">Contributors</a>
-<a href="/servers/">Server hosts</a>
-
+<a href="/" {% if page.active and page.active == "contributors" %} class="active" {% endif %}>Contributors</a><a href="/servers/" {% if page.active and page.active == "servers" %} class="active" {% endif %}>Server hosts</a>
diff --git a/assets/css/style.scss b/assets/css/style.scss
@@ -5,6 +5,7 @@
 
 // Colors
 $background-primary: #222;
+$background-primary-active: #2c2c2c;
 $color-primary-dark: #ffffff;
 $color-link-dark: #ee4444;
 
@@ -128,8 +129,11 @@ main {
 .topnav {
     font-size: 20px;
     a {
-        padding-left: 10px;
-        padding-right: 10px;
+        padding: 15px;
+    }
+    a:hover {
+
+        background-color: $background-primary-active;
     }
 }
 
@@ -157,4 +161,6 @@ main {
     }
 }
 
-
+.active {
+    background-color: $background-primary-active; 
+}
diff --git a/index.html b/index.html
@@ -1,5 +1,7 @@
 ---
 layout: default
+active: contributors
+title: Contributors
 ---
 
 <!-- Maybe this should be moved to a separate file? -->
@@ -15,4 +17,4 @@ <h2>Regulars</h2>
             {% endfor %}
         {% endfor %}
     </ul>
-</div>
+</div>
diff --git a/servers/index.html b/servers/index.html
@@ -1,5 +1,7 @@
 ---
 layout: default
+active: servers
+title: Project host locations
 ---
 
 <div id="hosts">

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`
`6`	`6`	`// Colors`
`7`	`7`	`$background-primary: #222;`
	`8`	`+$background-primary-active: #2c2c2c;`
`8`	`9`	`$color-primary-dark: #ffffff;`
`9`	`10`	`$color-link-dark: #ee4444;`
`10`	`11`
`@@ -128,8 +129,11 @@ main {`
`128`	`129`	`.topnav {`
`129`	`130`	`font-size: 20px;`
`130`	`131`	`a {`
`131`		`- padding-left: 10px;`
`132`		`- padding-right: 10px;`
	`132`	`+ padding: 15px;`
	`133`	`+ }`
	`134`	`+ a:hover {`
	`135`	`+`
	`136`	`+ background-color: $background-primary-active;`
`133`	`137`	`}`
`134`	`138`	`}`
`135`	`139`
`@@ -157,4 +161,6 @@ main {`
`157`	`161`	`}`
`158`	`162`	`}`
`159`	`163`
`160`		`-`
	`164`	`+.active {`
	`165`	`+ background-color: $background-primary-active;`
	`166`	`+}`