Skip to content

Commit

Permalink
Merge pull request #140 from Eastern-Research-Group/develop
Browse files Browse the repository at this point in the history 
Update staging
  • Loading branch information
@cschwinderg
cschwinderg authored Jan 4, 2024
2 parents 6746328 + c98d969 commit e0efe76
Show file tree
Hide file tree
Showing 7 changed files with 134 additions and 34 deletions.
21 changes: 20 additions & 1 deletion app/app/public/400.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@
Menu
</button>
</div>
<div class="l-header__search" id="header-search-drawer">
<div class="l-header__search" id="header-search-drawer" hidden="true">
<form
class="usa-search usa-search--small usa-search--epa"
method="get"
Expand Down Expand Up @@ -838,6 +838,25 @@ <h2>Follow.</h2>
<script src="./js/once.min.js"></script>
<script src="./js/epa-common.min.js"></script>
<script src="./js/epa-scripts.min.js"></script>
<!-- EPA template script overrides-->
<script>
const searchButton = document.querySelector(
"[aria-controls='header-search-drawer']",
);
if (searchButton) {
searchButton.addEventListener('click', () => {
const expanded = searchButton.ariaExpanded === 'true';
searchButton.ariaExpanded = !expanded;
const drawer = document.querySelector('#header-search-drawer');
if (expanded) {
drawer.setAttribute('hidden', true);
} else {
drawer.removeAttribute('hidden');
}
});
}
</script>
<!-- End EPA template script overrides-->

<style>
.menu--main .menu__link,
Expand Down
21 changes: 20 additions & 1 deletion app/app/public/500.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@
Menu
</button>
</div>
<div class="l-header__search" id="header-search-drawer">
<div class="l-header__search" id="header-search-drawer" hidden="true">
<form
class="usa-search usa-search--small usa-search--epa"
method="get"
Expand Down Expand Up @@ -837,6 +837,25 @@ <h2>Follow.</h2>
<script src="./js/once.min.js"></script>
<script src="./js/epa-common.min.js"></script>
<script src="./js/epa-scripts.min.js"></script>
<!-- EPA template script overrides-->
<script>
const searchButton = document.querySelector(
"[aria-controls='header-search-drawer']",
);
if (searchButton) {
searchButton.addEventListener('click', () => {
const expanded = searchButton.ariaExpanded === 'true';
searchButton.ariaExpanded = !expanded;
const drawer = document.querySelector('#header-search-drawer');
if (expanded) {
drawer.setAttribute('hidden', true);
} else {
drawer.removeAttribute('hidden');
}
});
}
</script>
<!-- End EPA template script overrides-->

<style>
.menu--main .menu__link,
Expand Down
21 changes: 20 additions & 1 deletion app/app/public/api-docs/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@
Menu
</button>
</div>
<div class="l-header__search" id="header-search-drawer">
<div class="l-header__search" id="header-search-drawer" hidden="true">
<form
class="usa-search usa-search--small usa-search--epa"
method="get"
Expand Down Expand Up @@ -921,6 +921,25 @@ <h2>Follow.</h2>
<script src="../js/once.min.js"></script>
<script src="../js/epa-common.min.js"></script>
<script src="../js/epa-scripts.min.js"></script>
<!-- EPA template script overrides-->
<script>
const searchButton = document.querySelector(
"[aria-controls='header-search-drawer']",
);
if (searchButton) {
searchButton.addEventListener('click', () => {
const expanded = searchButton.ariaExpanded === 'true';
searchButton.ariaExpanded = !expanded;
const drawer = document.querySelector('#header-search-drawer');
if (expanded) {
drawer.setAttribute('hidden', true);
} else {
drawer.removeAttribute('hidden');
}
});
}
</script>
<!-- End EPA template script overrides-->

<style>
.menu--main .menu__link,
Expand Down
21 changes: 20 additions & 1 deletion app/app/public/api_key_signup.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@
Menu
</button>
</div>
<div class="l-header__search" id="header-search-drawer">
<div class="l-header__search" id="header-search-drawer" hidden="true">
<form
class="usa-search usa-search--small usa-search--epa"
method="get"
Expand Down Expand Up @@ -869,6 +869,25 @@ <h2>Follow.</h2>
<script src="./js/once.min.js"></script>
<script src="./js/epa-common.min.js"></script>
<script src="./js/epa-scripts.min.js"></script>
<!-- EPA template script overrides-->
<script>
const searchButton = document.querySelector(
"[aria-controls='header-search-drawer']",
);
if (searchButton) {
searchButton.addEventListener('click', () => {
const expanded = searchButton.ariaExpanded === 'true';
searchButton.ariaExpanded = !expanded;
const drawer = document.querySelector('#header-search-drawer');
if (expanded) {
drawer.setAttribute('hidden', true);
} else {
drawer.removeAttribute('hidden');
}
});
}
</script>
<!-- End EPA template script overrides-->

<style>
.menu--main .menu__link,
Expand Down
0 app/app/public/images/close.svg → app/app/public/images/usa-icons/close.svg
View file
File renamed without changes
80 changes: 52 additions & 28 deletions app/app/public/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,16 @@
[tabindex='-1']:focus {
outline: none !important;
}

.lew-h2 {
font-size: 1.34rem;
font-weight: 700;
line-height: 1.2;
}

.usa-step-indicator__current-step {
flex-shrink: 0;
}
</style>
<!-- End application styles -->

Expand Down Expand Up @@ -464,7 +474,7 @@
Menu
</button>
</div>
<div class="l-header__search" id="header-search-drawer">
<div class="l-header__search" id="header-search-drawer" hidden="true">
<form
class="usa-search usa-search--small usa-search--epa"
method="get"
Expand Down Expand Up @@ -592,15 +602,6 @@
Share this page on pinterest
<div class="fa fa-pinterest"></div>
</a>
<a
href="mailto:%20?subject=Shared%20from%20the%20US%20EPA:%20Rainfall%20Erosivity%20Factor%20Calculator%20for%20%20Small%20Construction%20Sites&body=Rainfall%20Erosivity%20Factor%20Calculator%20for%20%20Small%20Construction%20Sites%20-%20https://www.epa.gov/npdes/rainfall-erosivity-factor-calculator-small-construction-sites"
target="_blank"
rel="noopener noreferrer"
aria-label="Email this page"
>
Email this page
<div class="fa fa-envelope"></div>
</a>
</div>
</div>
</div>
Expand All @@ -611,6 +612,7 @@ <h1 class="page-title">
Rainfall Erosivity Factor Calculator for Small Construction
</h1>
<div class="main-column">
<h2 class="lew-h2">Introduction</h2>
<p>
EPA’s stormwater regulations allow NPDES permitting authorities
to waive NPDES permitting requirements for stormwater discharges
Expand Down Expand Up @@ -686,11 +688,6 @@ <h1 class="page-title">
>.
</p>

<p>
For questions or comments, email EPA’s CGP staff at
<a href="mailto:cgp@epa.gov">cgp@epa.gov</a>.
</p>

<noscript>
<div class="alert alert-danger" role="alert">
JavaScript must be enabled to use the Rainfall Erosivity
Expand All @@ -699,18 +696,19 @@ <h1 class="page-title">
</noscript>

<form id="form" class="display-none">
<h2 class="lew-h2">
Steps to Calculate an R Factor for your Small Construction
Project
</h2>
<p class="note">
<span
class="usa-step-indicator__current-step display-flex flex-align-center flex-justify-center font-mono-lg margin-right-1"
>1</span
>
Select the estimated start and end dates of construction by
clicking the boxes and using the dropdown calendar.
</p>

<p class="note padding-1">
The period of construction activity begins at initial earth
disturbance and ends with final stabilization.
clicking the calendar icons below and using the dropdown
calendar. The period of construction activity begins at
initial earth disturbance and ends with final stabilization.
</p>

<div class="grid-row grid-gap-lg" id="date-pickers">
Expand Down Expand Up @@ -746,8 +744,8 @@ <h1 class="page-title">
class="usa-step-indicator__current-step display-flex flex-align-center flex-justify-center font-mono-lg margin-right-1"
>2</span
>
Locate your small construction project using the search box
below or by clicking on the map.
Locate your small construction project by entering the address
in the search box or by clicking on the map.
</p>

<div
Expand Down Expand Up @@ -788,8 +786,7 @@ <h1 class="page-title">
class="usa-step-indicator__current-step display-flex flex-align-center flex-justify-center font-mono-lg margin-right-1"
>3</span
>
Click the "Calculate R Factor" button below to calculate an R
Factor for your small construction project.
Click the "Calculate R Factor" button below.
</p>
<div class="width-full margin-y-3">
<button
Expand Down Expand Up @@ -855,6 +852,17 @@ <h4>
</article>
</div>
</div>
<div class="l-page__footer">
<div class="l-constrain">
<div class="l-page__footer-contact">
For questions or comments, email EPA’s CGP staff at
<a href="mailto:cgp@epa.gov">cgp@epa.gov</a>.
</div>
<div class="l-page__footer-last-updated">
Last updated on January 4, 2024
</div>
</div>
</div>
</main>

<footer class="footer" role="contentinfo">
Expand Down Expand Up @@ -1110,9 +1118,6 @@ <h2>Follow.</h2>
</a>
</li>
</ul>
<p class="footer__last-updated">
Last updated on December 26, 2023
</p>
</div>
</div>
</div>
Expand All @@ -1126,6 +1131,25 @@ <h2>Follow.</h2>
<script src="./js/once.min.js"></script>
<script src="./js/epa-common.min.js"></script>
<script src="./js/epa-scripts.min.js"></script>
<!-- EPA template script overrides-->
<script>
const searchButton = document.querySelector(
"[aria-controls='header-search-drawer']",
);
if (searchButton) {
searchButton.addEventListener('click', () => {
const expanded = searchButton.ariaExpanded === 'true';
searchButton.ariaExpanded = !expanded;
const drawer = document.querySelector('#header-search-drawer');
if (expanded) {
drawer.setAttribute('hidden', true);
} else {
drawer.removeAttribute('hidden');
}
});
}
</script>
<!-- End EPA template script overrides-->

<!-- Application scripts -->
<script
Expand Down
4 changes: 2 additions & 2 deletions app/app/public/js/epa-scripts.min.js
View file

Large diffs are not rendered by default.

0 comments on commit e0efe76

Please sign in to comment.