diff --git a/_config.yml b/_config.yml index 11ce84e83..67bf40450 100644 --- a/_config.yml +++ b/_config.yml @@ -8,7 +8,7 @@ url: https://revenuedata.doi.gov # app version number -version: v4.3.3 +version: v4.3.4 exclude: # top-level log diff --git a/_how-it-works/lwcf.md b/_how-it-works/lwcf.md index 1c0ec217f..2357751ba 100644 --- a/_how-it-works/lwcf.md +++ b/_how-it-works/lwcf.md @@ -53,9 +53,18 @@ Depending on the agency or program, the LWCF supports: - conservation of wildlife habitat ## Authorization and funding + +{% include update-flag.html date="2/14/19" %} + +The Senate on Tuesday, February 12, 2019, passed the [Natural Resources Management Act (PDF)](https://www.congress.gov/116/bills/s47/BILLS-116s47pcs.pdf), part of which permanently {{ "authorizes" | term: "authorization" }} the Land and Water Conservation Fund. + +Permanent authorization of the LWCF means the fund would be authorized to receive and distribute designated revenue from offshore oil and gas production indefinitely. The annual amount of funding would still be subject to the annual budget process. + +The bill will now go to the House of Representatives where, if passed, it will proceed to the President for signature. + {% include update-flag.html date="10/9/18" %} -The LWCF was {{ "authorized" | term: "authorization" }} through September 30, 2018. Congress did not reauthorize the fund before the end of the 2018 fiscal year. As a result, the requirement that a portion of offshore oil and gas revenues be deposited into the LWCF expired on October 1, 2018. The LWCF is not eligible to receive those disbursements unless Congress reauthorizes it. Congress may continue to appropriate revenues for LWCF-supported programs, if it so chooses. +The LWCF was authorized through September 30, 2018. Congress did not reauthorize the fund before the end of the 2018 fiscal year. As a result, the requirement that a portion of offshore oil and gas revenues be deposited into the LWCF expired on October 1, 2018. The LWCF is not eligible to receive those disbursements unless Congress reauthorizes it. Congress may continue to appropriate revenues for LWCF-supported programs, if it so chooses. Lawmakers have [introduced bills in both the House and the Senate](https://www.congress.gov/search?q=%7B%22congress%22%3A%22115%22%2C%22source%22%3A%22legislation%22%2C%22search%22%3A%22%5C%22land%20and%20water%20conservation%20fund%5C%22%22%7D&searchResultViewType=expanded) to permanently authorize the fund. diff --git a/_includes/shutdown-banner.html b/_includes/shutdown-banner.html new file mode 100644 index 000000000..b44831298 --- /dev/null +++ b/_includes/shutdown-banner.html @@ -0,0 +1,3 @@ +
+ +
\ No newline at end of file diff --git a/_sass/blocks/_banner.scss b/_sass/blocks/_banner.scss index 34f0ba9c1..434e39774 100644 --- a/_sass/blocks/_banner.scss +++ b/_sass/blocks/_banner.scss @@ -55,3 +55,15 @@ margin-bottom: 0; } } + +/* Alert/shutdown banner */ + +.alert-banner { + @include clearfix(); + @include heading('para-md'); + + font-weight: $weight-light; + background-color: #fff1d2; + padding: ($base-padding / 2) $base-padding-large; + text-align: center; +} \ No newline at end of file diff --git a/gatsby-site/gatsby-config.js b/gatsby-site/gatsby-config.js index 59125b10d..e5a397b25 100644 --- a/gatsby-site/gatsby-config.js +++ b/gatsby-site/gatsby-config.js @@ -19,7 +19,7 @@ module.exports = { siteMetadata: { title: 'Natural Resources Revenue Data', description: 'This site provides open data about natural resource management on federal lands and waters in the United States, including oil, gas, coal, and other extractive industries.', - version: 'v4.3.3', + version: 'v4.3.4', googleAnalyticsId: GOOGLE_ANALYTICS_ID, }, plugins: [ diff --git a/gatsby-site/src/components/layouts/AlertBanner/AlertBanner.js b/gatsby-site/src/components/layouts/AlertBanner/AlertBanner.js new file mode 100644 index 000000000..c340f43fd --- /dev/null +++ b/gatsby-site/src/components/layouts/AlertBanner/AlertBanner.js @@ -0,0 +1,12 @@ +import React from 'react'; + +import styles from "./AlertBanner.module.css"; +import AlertIcon from '-!svg-react-loader!../../../img/svg/icon-alert.svg'; + +const AlertBanner = () => ( +
+ Due to the government shutdown, we're unable to update this site. We will resume work on the site when the shutdown ends. +
+); + +export default AlertBanner; diff --git a/gatsby-site/src/components/layouts/AlertBanner/AlertBanner.module.css b/gatsby-site/src/components/layouts/AlertBanner/AlertBanner.module.css new file mode 100644 index 000000000..aa1fbe76b --- /dev/null +++ b/gatsby-site/src/components/layouts/AlertBanner/AlertBanner.module.css @@ -0,0 +1,18 @@ + +.root { + background-color: #fff1d2;; + margin: 0 0 1rem 0; + font-size: 1rem; + font-weight: 300; + line-height: 1.1875rem; + margin-bottom: 0.8rem; + padding: 0.8em 1.875em; + text-align: center; +} + +.alertImage { + width: 30px; + height: 20px; + vertical-align: top; + margin-right: 3px; +} diff --git a/gatsby-site/src/components/layouts/AlertBanner/index.js b/gatsby-site/src/components/layouts/AlertBanner/index.js new file mode 100644 index 000000000..7ecf3537f --- /dev/null +++ b/gatsby-site/src/components/layouts/AlertBanner/index.js @@ -0,0 +1,2 @@ + +export {default as AlertBanner} from './AlertBanner' \ No newline at end of file diff --git a/gatsby-site/src/components/sections/WhatsNew/WhatsNew.js b/gatsby-site/src/components/sections/WhatsNew/WhatsNew.js index afdac3ba2..3c3ced7c7 100644 --- a/gatsby-site/src/components/sections/WhatsNew/WhatsNew.js +++ b/gatsby-site/src/components/sections/WhatsNew/WhatsNew.js @@ -7,13 +7,17 @@ const WhatsNew = (props) => (

What's new

-

In our latest release on February 7, 2019, we made the following changes:

- +

In our latest release on February 14, 2019, we made the following changes:

+ +

In our release on February 7, 2019, we made the following changes:

+

Review our full release details.

diff --git a/gatsby-site/src/img/svg/icon-alert.svg b/gatsby-site/src/img/svg/icon-alert.svg new file mode 100644 index 000000000..4753d462c --- /dev/null +++ b/gatsby-site/src/img/svg/icon-alert.svg @@ -0,0 +1,16 @@ + + + + + + diff --git a/gatsby-site/src/layouts/index.js b/gatsby-site/src/layouts/index.js index e9cb0eba3..a2e620a44 100644 --- a/gatsby-site/src/layouts/index.js +++ b/gatsby-site/src/layouts/index.js @@ -2,6 +2,7 @@ import React from 'react'; import Helmet from 'react-helmet'; import {Banner} from '../components/layouts/Banner'; +import {AlertBanner} from '../components/layouts/AlertBanner'; import {Header} from '../components/layouts/Header'; import {Footer} from '../components/layouts/Footer'; import Glossary from '../components/utils/Glossary'; diff --git a/gatsby-site/static/public/img/icons/icon-alert.svg b/gatsby-site/static/public/img/icons/icon-alert.svg new file mode 100644 index 000000000..ad4533a2b --- /dev/null +++ b/gatsby-site/static/public/img/icons/icon-alert.svg @@ -0,0 +1,16 @@ + + + + + + diff --git a/img/icons/icon-alert.svg b/img/icons/icon-alert.svg new file mode 100644 index 000000000..ad4533a2b --- /dev/null +++ b/img/icons/icon-alert.svg @@ -0,0 +1,16 @@ + + + + + +