Merge branch 'master' of https://github.com/anavgagneja/node-clowning…

…-around Merging final product after updating readme
anavgagneja · Oct 9, 2016 · bb1e108 · bb1e108
2 parents 2c2e37d + c6230d1
commit bb1e108
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/hello-ngi/index.html b/hello-ngi/index.html
@@ -22,8 +22,9 @@
       </div>
       <img class="img-responsive" id="top" src="src/images/text.png">
       <ul class="nav navbar-nav navbar-right">
+       <li ><a href="#title">Map</a></li>
         <li ><a href="#about">About</a></li>
-        <li><a href="#">Credits</a></li>
+        <li><a href="#about5">Credits</a></li>
 
       </ul>
     </div>
@@ -38,7 +39,7 @@
         <div id="map"></div>
 
         <div class="col-xs-12" style="text-align:center;">
-        <a href="#about"><button id="more" href="#about">Learn More</button></a>
+        <a href="http://devpost.com/software/node-clowning-around-9cmqsp"><button id="more" >Learn More</button></a>
         </div>
 
     </div>   

diff --git a/hello-ngi/webMap.css b/hello-ngi/webMap.css
@@ -53,7 +53,7 @@ header {
 
 	background: transparent;
     color: #fff;
-    font-family: Arial;
+
     font-weight: lighter;
     height: 50px;
     width: 200px;

diff --git a/hello-ngi/webMap.js b/hello-ngi/webMap.js
@@ -9,6 +9,14 @@ var sections = $('section')
     , nav_height = nav.outerHeight();
 $(document).ready(function(){       
 
+  if($(window).width() < 1073) {
+
+
+    $('body').hide();
+
+  }
+
+  alert($(window).innerWidth());
 
     nav.find('a').on('click', function () {
       var $el = $(this)
@@ -61,6 +69,12 @@ var firebaseRef = firebase.database().ref();
           lng: position.coords.longitude
         };
 
+        var contentString = '<div id="content">Clown Spotted</div>';
+        var infowindow = new google.maps.InfoWindow({
+        content: contentString
+      });
+
+
         marker2 = new google.maps.Marker({
           position: pos,
           map: map,
@@ -70,6 +84,7 @@ var firebaseRef = firebase.database().ref();
 
         map.setCenter(pos);
 
+       var markersArray = [];
         firebaseRef.on('child_added', function(data) {
 
           var lati = data.child("latitude").val();
@@ -81,10 +96,13 @@ var firebaseRef = firebase.database().ref();
 
           });
 
-
       });
 
 
+
+
+
+
       }, function() {
         handleLocationError(true, infoWindow, map.getCenter());
       });