From 662ee9c500f860133f82cb1f0b9f6f485300c316 Mon Sep 17 00:00:00 2001
From: Ryan Wold <ryan.wold@gsa.gov>
Date: Thu, 9 Nov 2023 15:10:49 -0800
Subject: [PATCH 1/2] remove usa-modal class for now

* fix asset paths
---
 app/views/components/_usa-banner.html.erb          | 2 +-
 app/views/components/forms/_footer_banner.html.erb | 2 +-
 app/views/components/widget/_modal.html.erb        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/components/_usa-banner.html.erb b/app/views/components/_usa-banner.html.erb
index d1af0254b..ed398da7f 100644
--- a/app/views/components/_usa-banner.html.erb
+++ b/app/views/components/_usa-banner.html.erb
@@ -3,7 +3,7 @@
     <header class="usa-banner__header">
       <div class="usa-banner__inner">
         <div class="grid-col-auto">
-          <img class="usa-banner__header-flag" src="<%= image_path("us_flag_small.png") %>" alt="U.S. flag">
+          <img class="usa-banner__header-flag" src="<%= root_url %>img/us_flag_small.png" alt="U.S. flag">
         </div>
         <div class="grid-col-fill tablet:grid-col-auto">
           <p class="usa-banner__header-text"><%= t  'header.official' %></p>
diff --git a/app/views/components/forms/_footer_banner.html.erb b/app/views/components/forms/_footer_banner.html.erb
index 5eaf9ee16..f6c5aa7e7 100644
--- a/app/views/components/forms/_footer_banner.html.erb
+++ b/app/views/components/forms/_footer_banner.html.erb
@@ -5,7 +5,7 @@
         <img
             aria-hidden="true"
             class="usa-banner__header-flag"
-            src="/img/us_flag_small.png"
+            src="<%= root_url %>img/us_flag_small.png"
             alt="U.S. flag"
           />
       </div>
diff --git a/app/views/components/widget/_modal.html.erb b/app/views/components/widget/_modal.html.erb
index 5d8d8ecf5..d4b0a78bc 100644
--- a/app/views/components/widget/_modal.html.erb
+++ b/app/views/components/widget/_modal.html.erb
@@ -1,5 +1,5 @@
 <div id="fba-modal-dialog"
-  class="fba-modal-dialog usa-modal"
+  class="fba-modal-dialog"
   role="dialog"
   aria-modal="<%= ['modal', 'custom-button-modal'].include?(form.delivery_method) ? 'true' : 'false' %>">
   <%= render "components/widget/no_modal", form: form do %>

From 9402ec3380e1593ece5625c4a1eb7ad6c093eb6e Mon Sep 17 00:00:00 2001
From: Ryan Wold <ryan.wold@gsa.gov>
Date: Thu, 9 Nov 2023 15:14:35 -0800
Subject: [PATCH 2/2] give these assets full paths

---
 app/views/components/widget/_widget.css.erb | 46 ++++++++++-----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/app/views/components/widget/_widget.css.erb b/app/views/components/widget/_widget.css.erb
index 7103cca5f..916934ab5 100644
--- a/app/views/components/widget/_widget.css.erb
+++ b/app/views/components/widget/_widget.css.erb
@@ -619,14 +619,14 @@
 .fba-modal-dialog .usa-checkbox__input:checked + [class*=__label]::before,
 .fba-modal-dialog .usa-checkbox__input:checked:disabled + [class*=__label]::before,
 .fba-modal-dialog .usa-checkbox__input:checked[aria-disabled=true] + [class*=__label]::before{
-  background-image:url("/img/correct8.svg"), linear-gradient(transparent, transparent);
+  background-image:url("<%= root_url %>img/correct8.svg"), linear-gradient(transparent, transparent);
   background-repeat:no-repeat;
 }
 @media (forced-colors: active){
   .fba-modal-dialog .usa-checkbox__input:checked + [class*=__label]::before,
   .fba-modal-dialog .usa-checkbox__input:checked:disabled + [class*=__label]::before,
   .fba-modal-dialog .usa-checkbox__input:checked[aria-disabled=true] + [class*=__label]::before{
-    background-image:url("/img/correct8-alt.svg"), linear-gradient(transparent, transparent);
+    background-image:url("<%= root_url %>img/correct8-alt.svg"), linear-gradient(transparent, transparent);
     background-repeat:no-repeat;
   }
 }
@@ -884,7 +884,7 @@
 }
 
 .fba-modal-dialog .usa-select{
-  background-image:url("/img/usa-icons/unfold_more.svg"), linear-gradient(transparent, transparent);
+  background-image:url("<%= root_url %>img/usa-icons/unfold_more.svg"), linear-gradient(transparent, transparent);
   background-repeat:no-repeat;
   -webkit-appearance:none;
      -moz-appearance:none;
@@ -1647,7 +1647,7 @@
   content:"External, opens in a new tab.";
 }
 .fba-modal-dialog .usa-link--external::after{
-  background-image:url("/img/usa-icons/launch.svg");
+  background-image:url("<%= root_url %>img/usa-icons/launch.svg");
   background-repeat:no-repeat;
   background-position:center center;
   background-size:1.75ex 1.75ex;
@@ -1665,8 +1665,8 @@
   .usa-link--external::after{
     background:none;
     background-color:currentColor;
-    -webkit-mask-image:url("/img/usa-icons/launch.svg"), linear-gradient(transparent, transparent);
-            mask-image:url("/img/usa-icons/launch.svg"), linear-gradient(transparent, transparent);
+    -webkit-mask-image:url("<%= root_url %>img/usa-icons/launch.svg"), linear-gradient(transparent, transparent);
+            mask-image:url("<%= root_url %>img/usa-icons/launch.svg"), linear-gradient(transparent, transparent);
     -webkit-mask-position:center center;
             mask-position:center center;
     -webkit-mask-repeat:no-repeat;
@@ -1691,7 +1691,7 @@
   content:"External, opens in a new tab.";
 }
 .fba-modal-dialog .usa-link--external.usa-link--alt::after{
-  background-image:url("/img/usa-icons-bg/launch--white.svg");
+  background-image:url("<%= root_url %>img/usa-icons-bg/launch--white.svg");
   background-repeat:no-repeat;
   background-position:center center;
   background-size:1.75ex 1.75ex;
@@ -1709,8 +1709,8 @@
   .fba-modal-dialog .usa-link--external.usa-link--alt::after{
     background:none;
     background-color:currentColor;
-    -webkit-mask-image:url("/img/usa-icons/launch.svg"), linear-gradient(transparent, transparent);
-            mask-image:url("/img/usa-icons/launch.svg"), linear-gradient(transparent, transparent);
+    -webkit-mask-image:url("<%= root_url %>img/usa-icons/launch.svg"), linear-gradient(transparent, transparent);
+            mask-image:url("<%= root_url %>img/usa-icons/launch.svg"), linear-gradient(transparent, transparent);
     -webkit-mask-position:center center;
             mask-position:center center;
     -webkit-mask-repeat:no-repeat;
@@ -2244,7 +2244,7 @@
   text-decoration:underline;
 }
 .fba-modal-dialog .usa-banner__header-action::after{
-  background-image:url("/img/usa-icons/expand_more.svg");
+  background-image:url("<%= root_url %>img/usa-icons/expand_more.svg");
   background-repeat:no-repeat;
   background-position:center center;
   background-size:1rem 1rem;
@@ -2259,8 +2259,8 @@
   .fba-modal-dialog .usa-banner__header-action::after{
     background:none;
     background-color:#005ea2;
-    -webkit-mask-image:url("/img/usa-icons/expand_more.svg"), linear-gradient(transparent, transparent);
-            mask-image:url("/img/usa-icons/expand_more.svg"), linear-gradient(transparent, transparent);
+    -webkit-mask-image:url("<%= root_url %>img/usa-icons/expand_more.svg"), linear-gradient(transparent, transparent);
+            mask-image:url("<%= root_url %>img/usa-icons/expand_more.svg"), linear-gradient(transparent, transparent);
     -webkit-mask-position:center center;
             mask-position:center center;
     -webkit-mask-repeat:no-repeat;
@@ -2415,7 +2415,7 @@
     position:relative;
   }
   .fba-modal-dialog .usa-banner__button::after{
-    background-image:url("/img/usa-icons/expand_more.svg");
+    background-image:url("<%= root_url %>img/usa-icons/expand_more.svg");
     background-repeat:no-repeat;
     background-position:center center;
     background-size:1rem 1rem;
@@ -2430,8 +2430,8 @@
     .fba-modal-dialog .usa-banner__button::after{
       background:none;
       background-color:#005ea2;
-      -webkit-mask-image:url("/img/usa-icons/expand_more.svg"), linear-gradient(transparent, transparent);
-              mask-image:url("/img/usa-icons/expand_more.svg"), linear-gradient(transparent, transparent);
+      -webkit-mask-image:url("<%= root_url %>img/usa-icons/expand_more.svg"), linear-gradient(transparent, transparent);
+              mask-image:url("<%= root_url %>img/usa-icons/expand_more.svg"), linear-gradient(transparent, transparent);
       -webkit-mask-position:center center;
               mask-position:center center;
       -webkit-mask-repeat:no-repeat;
@@ -2486,7 +2486,7 @@
 }
 @media all and (max-width: 39.99em){
   .fba-modal-dialog .usa-banner__button[aria-expanded=true]::after{
-    background-image:url("/img/usa-icons/close.svg");
+    background-image:url("<%= root_url %>img/usa-icons/close.svg");
     background-repeat:no-repeat;
     background-position:center center;
     background-size:1.5rem 1.5rem;
@@ -2501,8 +2501,8 @@
     .fba-modal-dialog .usa-banner__button[aria-expanded=true]::after{
       background:none;
       background-color:#005ea2;
-      -webkit-mask-image:url("/img/usa-icons/close.svg"), linear-gradient(transparent, transparent);
-              mask-image:url("/img/usa-icons/close.svg"), linear-gradient(transparent, transparent);
+      -webkit-mask-image:url("<%= root_url %>img/usa-icons/close.svg"), linear-gradient(transparent, transparent);
+              mask-image:url("<%= root_url %>img/usa-icons/close.svg"), linear-gradient(transparent, transparent);
       -webkit-mask-position:center center;
               mask-position:center center;
       -webkit-mask-repeat:no-repeat;
@@ -2538,7 +2538,7 @@
     position:relative;
   }
   .fba-modal-dialog .usa-banner__button[aria-expanded=true]::after{
-    background-image:url("/img/usa-icons/expand_less.svg");
+    background-image:url("<%= root_url %>img/usa-icons/expand_less.svg");
     background-repeat:no-repeat;
     background-position:center center;
     background-size:1rem 1rem;
@@ -2553,8 +2553,8 @@
     .fba-modal-dialog .usa-banner__button[aria-expanded=true]::after{
       background:none;
       background-color:#005ea2;
-      -webkit-mask-image:url("/img/usa-icons/expand_less.svg"), linear-gradient(transparent, transparent);
-              mask-image:url("/img/usa-icons/expand_less.svg"), linear-gradient(transparent, transparent);
+      -webkit-mask-image:url("<%= root_url %>img/usa-icons/expand_less.svg"), linear-gradient(transparent, transparent);
+              mask-image:url("<%= root_url %>img/usa-icons/expand_less.svg"), linear-gradient(transparent, transparent);
       -webkit-mask-position:center center;
               mask-position:center center;
       -webkit-mask-repeat:no-repeat;
@@ -2657,7 +2657,7 @@
   width:2rem;
 }
 .fba-modal-dialog .usa-checklist__item.usa-checklist__item--checked::before{
-  background-image:url("/img/usa-icons-bg/check--blue-60v.svg"), linear-gradient(transparent, transparent);
+  background-image:url("<%= root_url %>img/usa-icons-bg/check--blue-60v.svg"), linear-gradient(transparent, transparent);
   background-repeat:no-repeat;
   background-position:center;
   background-size:1.5rem;
@@ -3477,7 +3477,7 @@
 }
 
 .fba-modal-dialog .usa-search [type=submit]{
-  background-image:url("/img/usa-icons/search.svg"), linear-gradient(transparent, transparent);
+  background-image:url("<%= root_url %>img/usa-icons/search.svg"), linear-gradient(transparent, transparent);
   background-repeat:no-repeat;
   background-position:center center;
   background-size:1rem;