From 0099a4f007f4a96950f4efc7ae4c053b2bbe798d Mon Sep 17 00:00:00 2001
From: henu <henri.varjotie@aalto.fi>
Date: Tue, 31 Oct 2017 19:51:47 +0200
Subject: [PATCH] Refactor navigation

---
 static/css/footer.css            |  4 +-
 webapp/static/css/main_nav.css   |  4 +-
 webapp/templates/navigation.html | 64 ++++++++++++++++----------------
 3 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/static/css/footer.css b/static/css/footer.css
index 61bca94..970436c 100644
--- a/static/css/footer.css
+++ b/static/css/footer.css
@@ -1,6 +1,6 @@
 footer {
-    position: absolute;
-    bottom: 0;
+    /*position: absolute;
+    bottom: 0;*/
     background-color: #f5f5f5;
 }
 
diff --git a/webapp/static/css/main_nav.css b/webapp/static/css/main_nav.css
index 73402fc..1b0168a 100644
--- a/webapp/static/css/main_nav.css
+++ b/webapp/static/css/main_nav.css
@@ -1,3 +1,3 @@
-.main_navigation .navbar-border .navbar-nav .nav-item {
+/*.main_navigation .navbar-border .navbar-nav .nav-item {
     display: block;
-}
+}*/
diff --git a/webapp/templates/navigation.html b/webapp/templates/navigation.html
index b49b4fb..42359fe 100644
--- a/webapp/templates/navigation.html
+++ b/webapp/templates/navigation.html
@@ -1,36 +1,34 @@
 {% load i18n %}
 <link rel="stylesheet" href="/static/css/main_nav.css">
-<div class="main_navigation">
-    <nav class="navbar-border navbar navbar-toggleable-md navbar-light bg-faded">
-        <ul class="navbar-nav">
-            <li class="nav-item">
-                <a class="nav-link" href="/guild">{% trans "Guild" %}</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="/freshmen">{% trans "Freshmen" %}</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="/event_calendar">{% trans "Event calendar" %}</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="/international">{% trans "International" %}</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="/sosso">{% trans "Sössö" %}</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-item nav-link" href="/contact">{% trans "Contact" %}</a>
-            </li>
-            <li class="nav-item btn-group">
-                <a class="dropdown-toggle nav-link" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+<nav class="navbar navbar-toggleable-md navbar-light bg-faded">
+    <ul class="navbar-nav mx-auto">
+        <li class="nav-item text-center">
+            <a class="nav-link" href="/guild">{% trans "Guild" %}</a>
+        </li>
+        <li class="nav-item text-center">
+            <a class="nav-link" href="/freshmen">{% trans "Freshmen" %}</a>
+        </li>
+        <li class="nav-item text-center">
+            <a class="nav-link" href="/event_calendar">{% trans "Event calendar" %}</a>
+        </li>
+        <li class="nav-item text-center">
+            <a class="nav-link" href="/international">{% trans "International" %}</a>
+        </li>
+        <li class="nav-item text-center">
+            <a class="nav-link" href="/sosso">{% trans "Sössö" %}</a>
+        </li>
+        <li class="nav-item text-center">
+            <a class="nav-item nav-link" href="/contact">{% trans "Contact" %}</a>
+        </li>
+        <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" id="corpDropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 {% trans "Corporate" %}
-                </a>
-                <div class="dropdown-menu" aria-labelledby="corpDropdown">
-                    <a class="dropdown-item" href="/jobs">{% trans "Jobs" %}</a>
-                    <a class="dropdown-item" href="/">Yritysdadaa</a>
-                    <a class="dropdown-item" href="/">Something else here</a>
-                </div>
-            </li>
-        </ul>
-    </nav>
-</div>
+            </a>
+            <div class="dropdown-menu" aria-labelledby="corpDropdown">
+                <a class="dropdown-item" href="/jobs">{% trans "Jobs" %}</a>
+                <a class="dropdown-item" href="/">Yritysdadaa</a>
+                <a class="dropdown-item" href="/">Something else here</a>
+            </div>
+        </li>
+    </ul>
+</nav>