Merge f9232b5 into 8baf796

codefortulsa · Sep 11, 2014 · 9140203 · 9140203
2 parents 8baf796 + f9232b5
commit 9140203
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/bpz/static/css/bpz.css b/bpz/static/css/bpz.css
@@ -1,4 +1,5 @@
 body {
+	padding-top: 70px;
   overflow:scroll;
   position:relative;
 }

diff --git a/bpz/templates/bpz/base.jinja2 b/bpz/templates/bpz/base.jinja2
@@ -22,6 +22,7 @@
   <body>
     <div class="navbar navbar-default navbar-fixed-top" role="navigation">
       <div class="container">
+
         <div class="navbar-header">
           <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
             <span class="sr-only">Toggle navigation</span>
@@ -31,7 +32,7 @@
           </button>
           <a class="navbar-brand" href="#">Neighborhood Plugin</a>
         </div>
-        <div class="collapse navbar-collapse">
+        <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
             <li><!-- if home page li class="active"--><a href="/">Home</a></li>
             <li><!-- if about page li class="active"--><a href="/about">About</a></li>
@@ -40,15 +41,18 @@
 
           </ul>
         </div><!--/.nav-collapse -->
-
-      </div>
-      <div class="row">
-        <div class="col-xs-12 col-sm-12 col-md-10 col-md-offset-1">
-          <div id="map-canvas">
-          </div>
-        </div>
       </div>
+
     </div>
+	<div class="container">
+
+    	<div class="row">
+      	  <div class="col-xs-12 col-sm-12 col-md-10 col-md-offset-1">
+        	  <div id="map-canvas"></div>
+      	  </div>
+    	</div>
+
+	</div>
 
     {% block body_container -%}
     {% block body_title_elem -%}

diff --git a/bpz/templates/bpz/home.jinja2 b/bpz/templates/bpz/home.jinja2
@@ -7,7 +7,7 @@
   <div class="row">
     <div class="col-xs-12 col-sm-12 col-md-10 col-md-offset-1">
 	<h3>Welcome to the Neighborhood Plugin!</h3>
-      <p class="lead"> This tool will help Tulsan's find their nearest neighborhood association and learn about pending zoning and planning cases in their area.  If you live in Tulsa and want to become more involved in your community then all you need to do is provide your location, to get started.</p>
+      <p class="lead"> The Neighborhood Plugin is a great way to help Tulsan's find their nearest neighborhood association and learn about pending zoning and planning cases in their area.  If you live in Tulsa and want to become more involved in your community, then all you need to do is provide your location to get started.  <a href="/about">Learn More&#62;&#62;</a> </p>
     </div>
   </div>
 </div><!-- /.container -->
@@ -17,8 +17,7 @@
 {% block body_js -%}
 <script>
 jQuery(document).ready(function () {
-  bpz.activateMap()    
-  d3.select("#intro_div").style({"top":"300px","position":"absolute"});
+  bpz.activateMap()
 })  
 </script>
 {%- endblock body_js %}