Fixed the modal popup issue

GSA-TTS · Oct 18, 2024 · 11bc282 · 11bc282
1 parent 9a6cbba
commit 11bc282
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 37 deletions.
diff --git a/_data/assetPaths.json b/_data/assetPaths.json
@@ -54,6 +54,6 @@
   "admin.map": "/assets/js/admin-TRAB3TNM.js.map",
   "app.js": "/assets/js/app-PHNK6WN2.js",
   "app.map": "/assets/js/app-PHNK6WN2.js.map",
-  "index.css": "/assets/styles/index-QSGNFHH4.css",
-  "index.map": "/assets/styles/index-QSGNFHH4.css.map"
+  "index.css": "/assets/styles/index-PQCPRTHQ.css",
+  "index.map": "/assets/styles/index-PQCPRTHQ.css.map"
 }
diff --git a/_includes/disclaimer.html b/_includes/disclaimer.html
@@ -12,48 +12,51 @@ <h2 class="usa-alert__heading">Disclaimer</h2>
           aria-controls="disclaimer-modal-1" data-open-modal role="button">
           View full disclaimer
         </a>
-      </div>
-      <div class="usa-modal radius-md" id="disclaimer-modal-1" aria-labelledby="modal-1-heading"
-        aria-describedby="modal-1-description">
-        <div class="usa-modal__content">
-          <div class="usa-modal__main">
-            <h2 class="usa-modal__heading font-family-sans" id="modal-1-heading">
-              Disclaimer
-            </h2>
-            <div class="usa-prose">
-              <div id="modal-1-description">
-                <p>This information is provided with the understanding that FEMA is not engaged in rendering legal or
-                  other professional services through this website. The laws and regulations discussed and cited herein
-                  are based upon best available public records and sources at the time of research.</p>
+        <div class="usa-modal radius-md" id="disclaimer-modal-1" aria-labelledby="modal-1-heading"
+          aria-describedby="modal-1-description">
+          <div class="usa-modal__content">
+            <div class="usa-modal__main">
+              <h2 class="usa-modal__heading font-family-sans" id="modal-1-heading">
+                Disclaimer
+              </h2>
+              <div class="usa-prose">
+                <div id="modal-1-description">
+                  <p>This information is provided with the understanding that FEMA is not engaged in rendering legal or
+                    other professional services through this website. The laws and regulations discussed and cited
+                    herein
+                    are based upon best available public records and sources at the time of research.</p>
 
-                <p>This website provides only a summary of the referenced laws and regulations; those laws and
-                  regulations may contain additional criteria, restrictions, or other qualifiers which are absent from
-                  the summary provided in this website. This website also may or may not be up-to-date as these laws and
-                  regulations can at any time be subsequently changed, updated, or repealed by the corresponding state
-                  legislatures and agencies.</p>
+                  <p>This website provides only a summary of the referenced laws and regulations; those laws and
+                    regulations may contain additional criteria, restrictions, or other qualifiers which are absent from
+                    the summary provided in this website. This website also may or may not be up-to-date as these laws
+                    and
+                    regulations can at any time be subsequently changed, updated, or repealed by the corresponding state
+                    legislatures and agencies.</p>
 
-                <p>Consult the current, official law or regulation and consult with relevant state or territory
-                  authorities or a licensed attorney in the relevant state or territory to determine which laws and
-                  regulations currently will apply to your situation. Do not rely solely on this website.</p>
+                  <p>Consult the current, official law or regulation and consult with relevant state or territory
+                    authorities or a licensed attorney in the relevant state or territory to determine which laws and
+                    regulations currently will apply to your situation. Do not rely solely on this website.</p>
+                </div>
+              </div>
+              <div class="usa-modal__footer">
+                <ul class="usa-button-group flex-column flex-align-end">
+                  <li class="usa-button-group__item">
+                    <button type="button" class="usa-button" data-close-modal>
+                      Close
+                    </button>
+                  </li>
+                </ul>
               </div>
             </div>
-            <div class="usa-modal__footer">
-              <ul class="usa-button-group flex-column flex-align-end">
-                <li class="usa-button-group__item">
-                  <button type="button" class="usa-button" data-close-modal>
-                    Close
-                  </button>
-                </li>
-              </ul>
-            </div>
+            <button type="button" class="usa-button usa-modal__close" aria-label="Close this window" data-close-modal>
+              <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
+                <use xlink:href="{{ '/assets/uswds/img/sprite.svg#close' | url }}"></use>
+              </svg>
+            </button>
           </div>
-          <button type="button" class="usa-button usa-modal__close" aria-label="Close this window" data-close-modal>
-            <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
-              <use xlink:href="{{ '/assets/uswds/img/sprite.svg#close' | url }}"></use>
-            </svg>
-          </button>
         </div>
       </div>
+
     </div>
   </div>
 </div>

diff --git a/_includes/theme/styles/_templates.scss b/_includes/theme/styles/_templates.scss
@@ -33,6 +33,10 @@ iframe:focus,
   outline-offset: 0.3rem;
 }
 
+.usa-modal[tabindex]:focus {
+  outline: none;
+}
+
 .usa-app {
   box-sizing: border-box;
   min-height: 100%;