Fix: Use same Bootstrap version for both Admin and Benefits (#2555)

cal-itp · Dec 5, 2024 · 8fd2c5a · 8fd2c5a
2 parents b58eb16 + 47e3a32
commit 8fd2c5a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/benefits/core/templates/core/base.html b/benefits/core/templates/core/base.html
@@ -20,10 +20,7 @@
     {% endblock preload %}
 
     <link href="https://fonts.googleapis.com/css?family=Roboto:400,500,700" rel="stylesheet" type="text/css">
-    <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css"
-          rel="stylesheet"
-          integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH"
-          crossorigin="anonymous">
+    {% include "core/includes/bootstrap-css.html" %}
     <link href="{% static "css/styles.css" %}" rel="stylesheet">
     <link href="{% static "img/favicon.ico" %}" rel="icon" type="image/x-icon" />
 

diff --git a/benefits/core/templates/core/includes/bootstrap-css.html b/benefits/core/templates/core/includes/bootstrap-css.html
@@ -0,0 +1,4 @@
+<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css"
+      rel="stylesheet"
+      integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH"
+      crossorigin="anonymous">
diff --git a/benefits/templates/admin/agency-base.html b/benefits/templates/admin/agency-base.html
@@ -10,7 +10,7 @@
             src="https://cdn.jsdelivr.net/npm/[email protected]/dist/jquery.min.js"
             integrity="sha256-o88AwQnZB+VDvE9tvIXrMQaPlFFSUTR+nldQm1LuPXQ="
             crossorigin="anonymous"></script>
-    {% include "admin/includes/bootstrap.html" %}
+    {% include "core/includes/bootstrap-css.html" %}
     {% include "admin/includes/style-admin.html" %}
     {% include "core/includes/analytics.html" with api_key=analytics.api_key uid=analytics.uid did=analytics.did %}
 {% endblock extrastyle %}

diff --git a/benefits/templates/admin/includes/bootstrap.html b/benefits/templates/admin/includes/bootstrap.html
diff --git a/benefits/templates/admin/login.html b/benefits/templates/admin/login.html
@@ -7,7 +7,7 @@
 {% block extrastyle %}
     {% comment %} Overriding instead of extending agency-base here to remove jQuery declaration, which admin/login.html includes on its own {% endcomment %}
     {% include "admin/includes/favicon.html" %}
-    {% include "admin/includes/bootstrap.html" %}
+    {% include "core/includes/bootstrap-css.html" %}
     {% include "admin/includes/style-admin.html" %}
 {% endblock extrastyle %}