Fixed placeholder for map (pair programming)
authorErik Haider Forsén <erikhf@ifi.uio.no>
Thu, 12 Nov 2015 10:24:01 +0000 (11:24 +0100)
committerErik Haider Forsén <erikhf@ifi.uio.no>
Thu, 12 Nov 2015 10:24:01 +0000 (11:24 +0100)
src/components/app.html
src/components/map/map.html
src/index.html

index 43c0a4c..265e722 100644 (file)
@@ -1,4 +1,12 @@
-Hello world!
+<div class="container">
+    <div class="nav">
+        Navbar
+        <mou-search></mou-search>
+        <mou-filter></mou-filter>
+    </div>
+
+    <mou-map></mou-map>
+
+</div>
 
 
-<mou-map></mou-map>
\ No newline at end of file
index 58d14d4..2dc2687 100644 (file)
@@ -1 +1,3 @@
-<div>Her kommer et fint kart</div>
\ No newline at end of file
+<div class="col-md-12" style="background: green; height: 200px; width: 200px;  ">
+
+</div>
\ No newline at end of file
index 5fdf54e..9946342 100644 (file)
     <script src="../node_modules/angular2/bundles/angular2.dev.js"></script>
     <script src="../node_modules/angular2/bundles/http.dev.js"></script>
     <script src="../node_modules/angular2/bundles/router.dev.js"></script>
+    <script src="http://code.jquery.com/jquery-1.11.3.min.js"></script>
+    <script src="../node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
+    <link type="text/css" href="../node_modules/bootstrap/dist/css/bootstrap.min.css">
 
 
 
-    <script src="http://code.jquery.com/jquery-1.11.3.min.js"></script>
     <script>
         System.config({
             packages: {'components': {defaultExtension: 'js'}}