From a22e33bca0efcac96a61985bdd64ac73fb44153b Mon Sep 17 00:00:00 2001
From: Oliver Schneider <oli@student.ethz.ch>
Date: Mon, 4 Apr 2016 16:03:39 +0200
Subject: [PATCH] Navbar Template for Mainsite

---
 public/bs/css/logo-nav.css | 27 ++++++++++++++++
 public/index.html          | 64 +++++++++++++++++++++++++++++++++++++-
 2 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 public/bs/css/logo-nav.css

diff --git a/public/bs/css/logo-nav.css b/public/bs/css/logo-nav.css
new file mode 100644
index 0000000..6048e39
--- /dev/null
+++ b/public/bs/css/logo-nav.css
@@ -0,0 +1,27 @@
+/*!
+ * Start Bootstrap - Logo Nav HTML Template (http://startbootstrap.com)
+ * Code licensed under the Apache License v2.0.
+ * For details, see http://www.apache.org/licenses/LICENSE-2.0.
+ */
+
+body {
+    padding-top: 70px; /* Required padding for .navbar-fixed-top. Change if height of navigation changes. */
+}
+
+.navbar-fixed-top .nav {
+    padding: 15px 0;
+}
+
+.navbar-fixed-top .navbar-brand {
+    padding: 0 15px;
+}
+
+@media(min-width:768px) {
+    body {
+        padding-top: 100px; /* Required padding for .navbar-fixed-top. Change if height of navigation changes. */
+    }
+
+    .navbar-fixed-top .navbar-brand {
+        padding: 0px 0;
+    }
+}
\ No newline at end of file
diff --git a/public/index.html b/public/index.html
index 53e82bb..7e87e7f 100644
--- a/public/index.html
+++ b/public/index.html
@@ -4,11 +4,70 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Admintool</title>
+    <title>AMIV</title>
 
     <link href="bs/css/bootstrap.min.css" rel="stylesheet">
+       <link href="bs/css/logo-nav.css" rel="stylesheet">
+
   </head>
+  
   <body>
+<!-- Navigation -->
+    <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+        <div class="container">
+            <!-- Brand and toggle get grouped for better mobile display -->
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-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>
+                <a class="navbar-brand" href="#">
+                    <img src="https://www.amiv.ethz.ch/sites/all/themes/amiv15/logo.png" alt="AMIV">
+                </a>
+            </div>
+            <!-- Collect the nav links, forms, and other content for toggling -->
+            <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+                <ul class="nav navbar-nav">
+                    <li>
+                        <a href="#">Home</a>
+                    </li>
+                    <li>
+                        <a href="#">Der AMIV</a>
+                    </li>
+                    <li>
+                        <a href="#">Studium</a>
+                    </li>
+                    <li>
+                        <a href="#">Events</a>
+                    </li>
+                    <li>
+                        <a href="#">Jobbörse</a>
+                    </li>
+                    <form class="navbar-form navbar-left" role="search">
+						<div class="form-group">
+							<input type="text" class="form-control" placeholder="Search">
+						</div>
+						<button type="submit" class="btn btn-default">Search</button>
+					</form>
+                </ul>
+            </div>
+            <!-- /.navbar-collapse -->
+        </div>
+        <!-- /.container -->
+    </nav>
+
+    <!-- Page Content -->
+    <div class="container">
+        <div class="row">
+            <div class="col-lg-12">
+                <h1>Fluid Containers full of Events floating around</h1>
+                <p>Note: AMIV is awesome</p>
+            </div>
+        </div>
+    </div>
+<!--
     <div class="row">
 	    <div class="col-sm-3"></div>
 	    <div class="col-sm-6">
@@ -29,8 +88,10 @@
 	    </div>
 	    <div class="col-sm-3"></div>
     </div>
+-->
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
     <script src="bs/js/bootstrap.min.js"></script>
+<!--
     <script>
 	  	'use strict';
 			
@@ -92,6 +153,7 @@
 	      });
 	    }
     </script>
+-->
 
     
   </body>
-- 
GitLab