Merge branch 'censusreporter:master' into master

jmacloud1 · Mar 19, 2024 · 23fc58d · 23fc58d
2 parents c1c3635 + dfd2644
commit 23fc58d
Show file tree

Hide file tree

Showing 51 changed files with 1,489 additions and 1,653 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.8
+FROM python:3.11
 
 ADD requirements.txt requirements.txt
 RUN pip install -r requirements.txt gunicorn
@@ -9,4 +9,4 @@ ENV DJANGO_SETTINGS_MODULE=censusreporter.config.prod.settings \
 ADD . .
 RUN ./manage.py collectstatic --noinput
 
-CMD gunicorn --workers 5 --bind 0.0.0.0:$PORT --statsd-host telegraf.web:8125 --statsd-prefix censusreporter censusreporter.config.prod.wsgi
+CMD gunicorn --workers 10 --bind 0.0.0.0:$PORT --statsd-host telegraf.web:8125 --statsd-prefix censusreporter censusreporter.config.prod.wsgi
diff --git a/censusreporter/apps/census/profile.py b/censusreporter/apps/census/profile.py
diff --git a/censusreporter/apps/census/static/css/app.css b/censusreporter/apps/census/static/css/app.css
@@ -1428,18 +1428,10 @@ h1.article-header-right {
     float: right;
 }
 
-.leaflet-label.hovercard {
-    white-space: normal;
-    width: 250px;
-}
-
-.leaflet-label.hovercard .value {
-    font-weight: normal;
-}
-
-.leaflet-label.hovercard {
-    font-size: 13px;
-    font-family: "Lato", "Helvetica Neue", Helvetica, Arial, sans-serif;
+.mapboxgl-popup {
+    max-width: 400px;
+    font: 13/1.4em "Lato", "Helvetica Neue", Helvetica, Arial, sans-serif;
+    font-weight: bold;
     padding: .83em 1em;
 }
 
@@ -3528,4 +3520,4 @@ a.ui-button:active,
 .yt-embed {
     width: 100%;
     height: 200px;
-}
+}
diff --git a/censusreporter/apps/census/static/css/charts.css b/censusreporter/apps/census/static/css/charts.css
@@ -206,6 +206,14 @@ uncomment for separate inclusion into embed iframes */
     -moz-border-radius: 4px;
     border-radius: 4px;
 }
+
+.mapboxgl-popup-content .hovercard {
+    position: relative;
+    border: none;
+    padding: 0;
+}
+
+
 .chart .hovercard {
     pointer-events: auto;
 }

diff --git a/censusreporter/apps/census/static/css/vendor/fontawesome/font-awesome-4.7.0.css b/censusreporter/apps/census/static/css/vendor/fontawesome/font-awesome-4.7.0.css
@@ -10,7 +10,7 @@
 @font-face {
     font-family: 'FontAwesome';
     src: url('./fontawesome-webfont-4.7.0.eot');
-    src: url('./fontawesome-webfont-4.7.0.eot') format('embedded-opentype'), url('./fontawesome-webfont-4.7.0.woff2') format('woff2'), url('./fontawesome-webfont-4.7.0.woff') format('woff'), url('./fontawesome-webfont-4.7.0.ttf') format('truetype'), url('.fontawesome-webfont-4.7.0.svg') format('svg');
+    src: url('./fontawesome-webfont-4.7.0.eot') format('embedded-opentype'), url('./fontawesome-webfont-4.7.0.woff2') format('woff2'), url('./fontawesome-webfont-4.7.0.woff') format('woff'), url('./fontawesome-webfont-4.7.0.ttf') format('truetype'), url('./fontawesome-webfont-4.7.0.svg') format('svg');
     font-weight: normal;
     font-style: normal;
     font-display: swap;

diff --git a/censusreporter/apps/census/static/css/vendor/leaflet.label.css b/censusreporter/apps/census/static/css/vendor/leaflet.label.css
diff --git a/censusreporter/apps/census/static/iframe.html b/censusreporter/apps/census/static/iframe.html
@@ -4,13 +4,14 @@
         <base target="_parent" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
         <link rel="stylesheet" href="css/charts.css" id="chart-styles">
+        <!-- Google tag (gtag.js) -->
+        <script async src="https://www.googletagmanager.com/gtag/js?id=G-J4KYS0SFEW"></script>
         <script>
-          (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-          (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-          m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-          })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+        window.dataLayer = window.dataLayer || [];
+        function gtag(){dataLayer.push(arguments);}
+        gtag('js', new Date());
 
-          ga('create', 'UA-43018828-1', 'auto');
+        gtag('config', 'G-J4KYS0SFEW');
         </script>
         <!-- Inline these styles to defeat IE's weird CSS caching for multiple iframes at different widths -->
         <style type="text/css">

diff --git a/censusreporter/apps/census/static/iframe_distribution_chart.html b/censusreporter/apps/census/static/iframe_distribution_chart.html
@@ -5,13 +5,15 @@
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
         <link rel="stylesheet" href="https://s3.amazonaws.com/embed.censusreporter.org/1.0/css/charts.css" id="chart-styles">
         <script src="//cdn.jsdelivr.net/g/respond@1.4"></script>
+
+        <!-- Google tag (gtag.js) -->
+        <script async src="https://www.googletagmanager.com/gtag/js?id=G-J4KYS0SFEW"></script>
         <script>
-          (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-          (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-          m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-          })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+        window.dataLayer = window.dataLayer || [];
+        function gtag(){dataLayer.push(arguments);}
+        gtag('js', new Date());
 
-          ga('create', 'UA-43018828-1', 'auto');
+        gtag('config', 'G-J4KYS0SFEW');
         </script>
         <!-- Inline these styles to defeat IE's weird CSS caching for multiple iframes at different widths -->
         <style type="text/css">