Merge branch 'main' of github.com:chihacknight/il-solar-map into main

chihacknight · Nov 17, 2023 · 386b551 · 386b551
2 parents 73a0d0f + 2a834b5
commit 386b551
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -102,10 +102,6 @@
       <main>
         {{content}}
       </main>
-
-      <footer class="pt-5 my-5 text-muted border-top">
-        Created by <a href='https://chihacknight.org'>Chi Hack Night</a> and the <a href='https://ilcleanjobs.org/'>Illinois Clean Jobs Coalition</a> &copy; 2023
-      </footer>
     </div>
 
     <script src="/js/bootstrap.bundle.min.js"></script>

diff --git a/_layouts/narrow.html b/_layouts/narrow.html
@@ -7,5 +7,9 @@
   <main>
     {{content}}
   </main>
+
+  <footer class="pt-5 my-5 text-muted border-top">
+    Created by <a href='https://chihacknight.org'>Chi Hack Night</a> and the <a href='https://ilcleanjobs.org/'>Illinois Clean Jobs Coalition</a> &copy; 2023
+  </footer>
 
 </div>
diff --git a/css/custom.css b/css/custom.css
@@ -13,12 +13,12 @@ body, p, table {
 .legend {
   background-color: #fff;
   border-radius: 3px;
-  bottom: 80px;
+  top: 115px;
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
   font: 14px/20px 'Helvetica Neue', Arial, Helvetica, sans-serif;
   padding: 10px;
   position: absolute;
-  right: 10px;
+  right: 20px;
   z-index: 1;
 }
 

diff --git a/js/map.js b/js/map.js
@@ -188,6 +188,12 @@ function addLayer(map, layerSource, visible = 'none'){
   })
 }
 
+$(window).resize(function () {
+  var h = $(window).height(),
+    offsetTop = 125; // Calculate the top offset
+
+  $('#map').css('height', (h - offsetTop));
+}).resize();
 
 mapboxgl.accessToken = 'pk.eyJ1IjoiZGF0YW1hZGUiLCJhIjoiaXhhVGNrayJ9.0yaccougI3vSAnrKaB00vA'
 const map = new mapboxgl.Map({