From 2a03e5003a40546e9422b8bd0c1bd3ec7e52ffa3 Mon Sep 17 00:00:00 2001
From: henu <henri.varjotie@aalto.fi>
Date: Wed, 11 Oct 2017 22:39:42 +0300
Subject: [PATCH] Fix bootstrap on kaehmy navigation

---
 webapp/static/css/kaehmy_nav.css        |  3 +++
 webapp/templates/kaehmy_navigation.html | 32 ++++++++++---------------
 2 files changed, 16 insertions(+), 19 deletions(-)
 create mode 100644 webapp/static/css/kaehmy_nav.css

diff --git a/webapp/static/css/kaehmy_nav.css b/webapp/static/css/kaehmy_nav.css
new file mode 100644
index 0000000..0d58e5d
--- /dev/null
+++ b/webapp/static/css/kaehmy_nav.css
@@ -0,0 +1,3 @@
+.kaehmy_navigation {
+    margin-bottom: 10px;
+}
diff --git a/webapp/templates/kaehmy_navigation.html b/webapp/templates/kaehmy_navigation.html
index d2991dd..24c320a 100644
--- a/webapp/templates/kaehmy_navigation.html
+++ b/webapp/templates/kaehmy_navigation.html
@@ -1,22 +1,16 @@
 {% load i18n %}
-<div>
-    <nav class="navbar navbar-default sidebar" role="navigation">
-    <div class="container-fluid">
-        <div class="navbar-header">
-            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-sidebar-navbar-collapse-1">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            </button>
+<link rel="stylesheet" href="/static/css/kaehmy_nav.css">
+<div class="kaehmy_navigation">
+    <nav class="navbar navbar-toggleable-md navbar-light bg-faded">
+        <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#kaehmy_nav" aria-controls="kaehmy_nav" aria-expanded="false" aria-label="Toggle navigation">
+            Menu<span class="navbar-toggler-icon"></span>
+        </button>
+        <div class="collapse navbar-collapse" id="kaehmy_nav">
+            <div class="navbar-nav">
+                <a class="nav-item nav-link" href="/">SIK</a>
+                <a class="nav-item nav-link active" href="/kaehmy/new">{% trans "Apply" %} <span class="sr-only">(current)</span></a>
+                <a class="nav-item nav-link" href="/kaehmy/statistics">{% trans "Statistics" %}</a>
+            </div>
         </div>
-        <div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
-            <ul class="nav navbar-nav">
-                <li class="active"><a href="/">SIK<span style="font-size:16px;" class="pull-right hidden-xs showopacity glyphicon glyphicon-home"></span></a></li>
-                <li><a href="/kaehmy/new">{% trans "Apply" %}</a></li>
-                <li ><a href="/kaehmy/statistics">{% trans "Statistics" %}</a></li>
-            </ul>
-        </div>
-    </div>
     </nav>
-</div>
\ No newline at end of file
+</div>