Merge upstream (July 2nd, 2024)

Dockerfile

@@ -1,11 +1,8 @@
-FROM ruby:3.2-bullseye
+FROM ruby:3.2-bookworm
 
-ENV NODE_MAJOR_VERSION 18
-
-RUN curl --silent --show-error --location --retry 5 --retry-connrefuse --retry-delay 4 https://deb.nodesource.com/setup_${NODE_MAJOR_VERSION}.x | bash - \
-  && apt-get update \
-  && apt-get install -y --quiet --no-install-recommends \
-  nodejs
+RUN apt-get update \
+ && apt-get install -y --quiet --no-install-recommends \
+ nodejs npm
 
 ENV GEM_HOME=/usr/gem
 ENV PATH="$GEM_HOME/bin/:$PATH" 

_includes/header.html

@@ -1,10 +1,9 @@
-<nav class="navbar navbar-expand-sm mb-4 navbar-light" data-component="navigation">
+<nav class="navbar navbar-expand-sm mb-4 navbar-dark" data-component="navigation">
   <div class="container">
     <a alt="{{ site.title }}" class="navbar-brand" href="{{ site.baseurl }}/">
       <img src="{{ site.logo }}" srcset="/img/odp-logo@2x.png 2x" alt="OpenDataPhilly" title="OpenDataPhilly">
     </a>
-    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
-      <span class="sr-only">Toggle navigation</span>
+    <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
       <span class="navbar-toggler-icon"></span>
     </button>
     <div class="collapse navbar-collapse" id="navbarNavDropdown">
@@ -18,7 +17,7 @@
         {% endfor %}
       </ul>
     </div>
-    <a class="github-logo" href="https://github.com/azavea/opendataphilly-jkan">
+    <a class="github-logo d-none d-md-block" href="https://github.com/azavea/opendataphilly-jkan">
       <img src="{{site.baseurl}}/img/github-mark-white.svg" width="30" height="30">
     </a>
 

css/main.css

@@ -131,6 +131,10 @@ nav {
   padding-top: 2rem !important;
 }
 
+.navbar-toggler {
+  border: none;
+}
+
 .nav-item .active {
   background-color: #20c3c4;
   border-radius: 4px;