From 47e3a329c5f040864ffb34be686de8392bc43bd9 Mon Sep 17 00:00:00 2001
From: Machiko Yasuda <machiko@compiler.la>
Date: Mon, 2 Dec 2024 23:18:17 +0000
Subject: [PATCH] fix(css): create bootstrap css includes, use for both admin
 and rider-facing

---
 benefits/core/templates/core/base.html                   | 5 +----
 benefits/core/templates/core/includes/bootstrap-css.html | 4 ++++
 benefits/templates/admin/agency-base.html                | 2 +-
 benefits/templates/admin/includes/bootstrap.html         | 4 ----
 benefits/templates/admin/login.html                      | 2 +-
 5 files changed, 7 insertions(+), 10 deletions(-)
 create mode 100644 benefits/core/templates/core/includes/bootstrap-css.html
 delete mode 100644 benefits/templates/admin/includes/bootstrap.html

diff --git a/benefits/core/templates/core/base.html b/benefits/core/templates/core/base.html
index b6283dd8f..84b33abde 100644
--- 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/bootstrap@5.3.3/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
new file mode 100644
index 000000000..d22725ab0
--- /dev/null
+++ b/benefits/core/templates/core/includes/bootstrap-css.html
@@ -0,0 +1,4 @@
+<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/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
index fc4a982e6..92e7a09a7 100644
--- a/benefits/templates/admin/agency-base.html
+++ b/benefits/templates/admin/agency-base.html
@@ -10,7 +10,7 @@
             src="https://cdn.jsdelivr.net/npm/jquery@3.6.1/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
deleted file mode 100644
index 5b0ef6048..000000000
--- a/benefits/templates/admin/includes/bootstrap.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css"
-      rel="stylesheet"
-      integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3"
-      crossorigin="anonymous">
diff --git a/benefits/templates/admin/login.html b/benefits/templates/admin/login.html
index 4cfad7774..f23d91a39 100644
--- 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 %}