From 08fe506bfa0c28b995b1ac5963b704e56bb9c874 Mon Sep 17 00:00:00 2001 From: brentryanjohnson Date: Mon, 11 Feb 2019 14:20:11 -0800 Subject: [PATCH 01/17] Adds shutdown notice pattern to jekyll portion of site --- _includes/shutdown-banner.html | 3 +++ _layouts/default.html | 2 ++ _sass/blocks/_banner.scss | 12 ++++++++++++ img/icons/icon-alert.svg | 16 ++++++++++++++++ 4 files changed, 33 insertions(+) create mode 100644 _includes/shutdown-banner.html create mode 100644 img/icons/icon-alert.svg diff --git a/_includes/shutdown-banner.html b/_includes/shutdown-banner.html new file mode 100644 index 000000000..609850c9b --- /dev/null +++ b/_includes/shutdown-banner.html @@ -0,0 +1,3 @@ +
+ +
\ No newline at end of file diff --git a/_layouts/default.html b/_layouts/default.html index 2aadef8df..d44753c99 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -51,6 +51,8 @@ {% include layout/banner.html %} + {% include shutdown-banner.html %} + {% include layout/header.html %}
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/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 @@ + + + + + + From d6959d0b719a78cfded19db87cb22e14fda8bbe6 Mon Sep 17 00:00:00 2001 From: brentryanjohnson Date: Tue, 12 Feb 2019 09:50:33 -0800 Subject: [PATCH 02/17] Minor text edits --- _includes/shutdown-banner.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/shutdown-banner.html b/_includes/shutdown-banner.html index 609850c9b..ea11e5b01 100644 --- a/_includes/shutdown-banner.html +++ b/_includes/shutdown-banner.html @@ -1,3 +1,3 @@
- +
\ No newline at end of file From d7ebf4d4cbf2325d982a8c42dcfd3c5462fd1961 Mon Sep 17 00:00:00 2001 From: brentryanjohnson Date: Tue, 12 Feb 2019 11:28:32 -0800 Subject: [PATCH 03/17] Initial work on shutdown alert component in gatsby --- .../src/components/layouts/Alert/AlertBanner.js | 12 ++++++++++++ .../layouts/Alert/AlertBanner.module.css | 17 +++++++++++++++++ .../src/components/layouts/Alert/index.js | 2 ++ gatsby-site/src/layouts/index.js | 2 ++ .../static/public/img/icons/icon-alert.svg | 16 ++++++++++++++++ 5 files changed, 49 insertions(+) create mode 100644 gatsby-site/src/components/layouts/Alert/AlertBanner.js create mode 100644 gatsby-site/src/components/layouts/Alert/AlertBanner.module.css create mode 100644 gatsby-site/src/components/layouts/Alert/index.js create mode 100644 gatsby-site/static/public/img/icons/icon-alert.svg diff --git a/gatsby-site/src/components/layouts/Alert/AlertBanner.js b/gatsby-site/src/components/layouts/Alert/AlertBanner.js new file mode 100644 index 000000000..7ecf6842c --- /dev/null +++ b/gatsby-site/src/components/layouts/Alert/AlertBanner.js @@ -0,0 +1,12 @@ +import React from 'react'; + +import styles from "./AlertBanner.module.css"; +import alert from "../../../img/icons/icon-alert.svg"; + +const AlertBanner = () => ( +
+ Due to the government shutdown, we are not able 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/Alert/AlertBanner.module.css b/gatsby-site/src/components/layouts/Alert/AlertBanner.module.css new file mode 100644 index 000000000..d0b6429d2 --- /dev/null +++ b/gatsby-site/src/components/layouts/Alert/AlertBanner.module.css @@ -0,0 +1,17 @@ + +.root { + background-color: #fff1d2;; + margin: 0 0 1rem 0; + font-size: 0.8rem; + line-height: 1.1875rem; + margin-bottom: 0.625rem; + padding: 0.625em 1.875em; + text-align: center; +} + +.alertImage { + width: 30px; + padding-left: 0.20833em; + margin-bottom: -1px; + margin-right: 3px; +} diff --git a/gatsby-site/src/components/layouts/Alert/index.js b/gatsby-site/src/components/layouts/Alert/index.js new file mode 100644 index 000000000..7ecf3537f --- /dev/null +++ b/gatsby-site/src/components/layouts/Alert/index.js @@ -0,0 +1,2 @@ + +export {default as AlertBanner} from './AlertBanner' \ No newline at end of file diff --git a/gatsby-site/src/layouts/index.js b/gatsby-site/src/layouts/index.js index e9cb0eba3..f51e30d27 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'; @@ -62,6 +63,7 @@ export default ({ data, children}) => { +
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 @@ + + + + + + From daaa203fe102042d953315fb207a462bb1da78ec Mon Sep 17 00:00:00 2001 From: brentryanjohnson Date: Tue, 12 Feb 2019 14:51:51 -0800 Subject: [PATCH 04/17] Minor edit to wording --- _includes/shutdown-banner.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/shutdown-banner.html b/_includes/shutdown-banner.html index ea11e5b01..f86830e97 100644 --- a/_includes/shutdown-banner.html +++ b/_includes/shutdown-banner.html @@ -1,3 +1,3 @@
- +
\ No newline at end of file From 13dd0657e6fe480d38e5200513e59ce12e27aaa8 Mon Sep 17 00:00:00 2001 From: brentryanjohnson Date: Tue, 12 Feb 2019 14:52:34 -0800 Subject: [PATCH 05/17] Reverts wording, adds contraction --- _includes/shutdown-banner.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/shutdown-banner.html b/_includes/shutdown-banner.html index f86830e97..689fbe0a7 100644 --- a/_includes/shutdown-banner.html +++ b/_includes/shutdown-banner.html @@ -1,3 +1,3 @@
- +
\ No newline at end of file From c94bb6337782a0e46abf2430999fba067f63caf9 Mon Sep 17 00:00:00 2001 From: brentryanjohnson Date: Tue, 12 Feb 2019 14:54:07 -0800 Subject: [PATCH 06/17] Adds variable for sitebaseurl to include --- _includes/shutdown-banner.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/shutdown-banner.html b/_includes/shutdown-banner.html index 689fbe0a7..b44831298 100644 --- a/_includes/shutdown-banner.html +++ b/_includes/shutdown-banner.html @@ -1,3 +1,3 @@
- +
\ No newline at end of file From 69fb10cf02572d131c2c432dc4e3e7dbc2522b90 Mon Sep 17 00:00:00 2001 From: brentryanjohnson Date: Tue, 12 Feb 2019 15:02:12 -0800 Subject: [PATCH 07/17] Adds component for shutdown notice, but icon path is broken --- .../src/components/layouts/Alert/AlertBanner.js | 12 ------------ .../layouts/AlertBanner/AlertBanner.js | 13 +++++++++++++ .../AlertBanner.module.css | 0 .../layouts/{Alert => AlertBanner}/index.js | 0 gatsby-site/src/img/svg/icon-alert.svg | 16 ++++++++++++++++ 5 files changed, 29 insertions(+), 12 deletions(-) delete mode 100644 gatsby-site/src/components/layouts/Alert/AlertBanner.js create mode 100644 gatsby-site/src/components/layouts/AlertBanner/AlertBanner.js rename gatsby-site/src/components/layouts/{Alert => AlertBanner}/AlertBanner.module.css (100%) rename gatsby-site/src/components/layouts/{Alert => AlertBanner}/index.js (100%) create mode 100644 gatsby-site/src/img/svg/icon-alert.svg diff --git a/gatsby-site/src/components/layouts/Alert/AlertBanner.js b/gatsby-site/src/components/layouts/Alert/AlertBanner.js deleted file mode 100644 index 7ecf6842c..000000000 --- a/gatsby-site/src/components/layouts/Alert/AlertBanner.js +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react'; - -import styles from "./AlertBanner.module.css"; -import alert from "../../../img/icons/icon-alert.svg"; - -const AlertBanner = () => ( -
- Due to the government shutdown, we are not able 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.js b/gatsby-site/src/components/layouts/AlertBanner/AlertBanner.js new file mode 100644 index 000000000..47ee37ec8 --- /dev/null +++ b/gatsby-site/src/components/layouts/AlertBanner/AlertBanner.js @@ -0,0 +1,13 @@ +import React from 'react'; + +import styles from "./AlertBanner.module.css"; +/*import alert from "../../../img/icons/icon-alert.svg";*/ +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/Alert/AlertBanner.module.css b/gatsby-site/src/components/layouts/AlertBanner/AlertBanner.module.css similarity index 100% rename from gatsby-site/src/components/layouts/Alert/AlertBanner.module.css rename to gatsby-site/src/components/layouts/AlertBanner/AlertBanner.module.css diff --git a/gatsby-site/src/components/layouts/Alert/index.js b/gatsby-site/src/components/layouts/AlertBanner/index.js similarity index 100% rename from gatsby-site/src/components/layouts/Alert/index.js rename to gatsby-site/src/components/layouts/AlertBanner/index.js 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..ad4533a2b --- /dev/null +++ b/gatsby-site/src/img/svg/icon-alert.svg @@ -0,0 +1,16 @@ + + + + + + From afb46f47a3df09f22a407d939aa857ce290c4b87 Mon Sep 17 00:00:00 2001 From: brentryanjohnson Date: Tue, 12 Feb 2019 15:04:04 -0800 Subject: [PATCH 08/17] Normalizes font size and weight --- .../src/components/layouts/AlertBanner/AlertBanner.module.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gatsby-site/src/components/layouts/AlertBanner/AlertBanner.module.css b/gatsby-site/src/components/layouts/AlertBanner/AlertBanner.module.css index d0b6429d2..3118fb01b 100644 --- a/gatsby-site/src/components/layouts/AlertBanner/AlertBanner.module.css +++ b/gatsby-site/src/components/layouts/AlertBanner/AlertBanner.module.css @@ -2,7 +2,8 @@ .root { background-color: #fff1d2;; margin: 0 0 1rem 0; - font-size: 0.8rem; + font-size: 1rem; + font-weight: 300; line-height: 1.1875rem; margin-bottom: 0.625rem; padding: 0.625em 1.875em; From 5360caee4a85c7c468b0deb0de3767bad8f2ce42 Mon Sep 17 00:00:00 2001 From: brentryanjohnson Date: Tue, 12 Feb 2019 15:16:58 -0800 Subject: [PATCH 09/17] Removes previous icon path declaration --- gatsby-site/src/components/layouts/AlertBanner/AlertBanner.js | 1 - 1 file changed, 1 deletion(-) diff --git a/gatsby-site/src/components/layouts/AlertBanner/AlertBanner.js b/gatsby-site/src/components/layouts/AlertBanner/AlertBanner.js index 47ee37ec8..d0468b9e2 100644 --- a/gatsby-site/src/components/layouts/AlertBanner/AlertBanner.js +++ b/gatsby-site/src/components/layouts/AlertBanner/AlertBanner.js @@ -1,7 +1,6 @@ import React from 'react'; import styles from "./AlertBanner.module.css"; -/*import alert from "../../../img/icons/icon-alert.svg";*/ import AlertIcon from '-!svg-react-loader!../../../img/svg/icon-alert.svg'; const AlertBanner = () => ( From 5af52c5656ffec6bcb851120de1e9a2342789257 Mon Sep 17 00:00:00 2001 From: brentryanjohnson Date: Tue, 12 Feb 2019 16:48:07 -0800 Subject: [PATCH 10/17] Updates status of LWCF --- _how-it-works/lwcf.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/_how-it-works/lwcf.md b/_how-it-works/lwcf.md index 1c0ec217f..910d82825 100644 --- a/_how-it-works/lwcf.md +++ b/_how-it-works/lwcf.md @@ -53,6 +53,15 @@ Depending on the agency or program, the LWCF supports: - conservation of wildlife habitat ## Authorization and funding + +{% include update-flag.html date="2/12/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 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. From d5771874794670370796515648b82e12e61e30d9 Mon Sep 17 00:00:00 2001 From: brentryanjohnson Date: Wed, 13 Feb 2019 08:10:45 -0800 Subject: [PATCH 11/17] Finishes alert component in gatsby --- .../src/components/layouts/AlertBanner/AlertBanner.js | 2 +- .../components/layouts/AlertBanner/AlertBanner.module.css | 8 ++++---- gatsby-site/src/img/svg/icon-alert.svg | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gatsby-site/src/components/layouts/AlertBanner/AlertBanner.js b/gatsby-site/src/components/layouts/AlertBanner/AlertBanner.js index d0468b9e2..c340f43fd 100644 --- a/gatsby-site/src/components/layouts/AlertBanner/AlertBanner.js +++ b/gatsby-site/src/components/layouts/AlertBanner/AlertBanner.js @@ -5,7 +5,7 @@ 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. + Due to the government shutdown, we're unable to update this site. We will resume work on the site when the shutdown ends.
); diff --git a/gatsby-site/src/components/layouts/AlertBanner/AlertBanner.module.css b/gatsby-site/src/components/layouts/AlertBanner/AlertBanner.module.css index 3118fb01b..aa1fbe76b 100644 --- a/gatsby-site/src/components/layouts/AlertBanner/AlertBanner.module.css +++ b/gatsby-site/src/components/layouts/AlertBanner/AlertBanner.module.css @@ -5,14 +5,14 @@ font-size: 1rem; font-weight: 300; line-height: 1.1875rem; - margin-bottom: 0.625rem; - padding: 0.625em 1.875em; + margin-bottom: 0.8rem; + padding: 0.8em 1.875em; text-align: center; } .alertImage { width: 30px; - padding-left: 0.20833em; - margin-bottom: -1px; + height: 20px; + vertical-align: top; margin-right: 3px; } diff --git a/gatsby-site/src/img/svg/icon-alert.svg b/gatsby-site/src/img/svg/icon-alert.svg index ad4533a2b..4753d462c 100644 --- a/gatsby-site/src/img/svg/icon-alert.svg +++ b/gatsby-site/src/img/svg/icon-alert.svg @@ -2,7 +2,7 @@ + width="216px" viewBox="0 0 216 146" enable-background="new 0 0 216 146" xml:space="preserve"> Date: Wed, 13 Feb 2019 16:29:14 -0500 Subject: [PATCH 14/17] Increment version 2.14.19 --- _config.yml | 2 +- gatsby-site/gatsby-config.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/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: [ From dc6d487e6b56a854317ae7ffc481117f2da7ab9d Mon Sep 17 00:00:00 2001 From: brentryanjohnson Date: Wed, 13 Feb 2019 15:38:07 -0800 Subject: [PATCH 15/17] Updates 'what's new' section for release --- .../components/sections/WhatsNew/WhatsNew.js | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/gatsby-site/src/components/sections/WhatsNew/WhatsNew.js b/gatsby-site/src/components/sections/WhatsNew/WhatsNew.js index afdac3ba2..178a5e812 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:

-
    -
  • Published a third blog post about usability testing training. This post covers how we're expanding our capacity to perform usability testing.
    • -
  • Updated fiscal year revenue data through 2018
    • -
  • Updated monthly production and revenue data
    • -
  • Converted revenue streams and rates image to table for accessibility
    • -
+

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

+
    +
  • Updated the status of the Land and Water Conservation Fund.
    • +
+

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

+
    +
  • Published a third blog post about usability testing training. This post covers how we're expanding our capacity to perform usability testing.
    • +
  • Updated fiscal year revenue data through 2018
    • +
  • Updated monthly production and revenue data
    • +
  • Converted revenue streams and rates image to table for accessibility
    • +

Review our full release details.

From d2d7066fe97289ebd8e417c58e6efcb43863beda Mon Sep 17 00:00:00 2001 From: brentryanjohnson Date: Wed, 13 Feb 2019 16:06:58 -0800 Subject: [PATCH 16/17] Removes puntuation from what's new list item --- gatsby-site/src/components/sections/WhatsNew/WhatsNew.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gatsby-site/src/components/sections/WhatsNew/WhatsNew.js b/gatsby-site/src/components/sections/WhatsNew/WhatsNew.js index 178a5e812..0620fd9b5 100644 --- a/gatsby-site/src/components/sections/WhatsNew/WhatsNew.js +++ b/gatsby-site/src/components/sections/WhatsNew/WhatsNew.js @@ -9,7 +9,7 @@ const WhatsNew = (props) => (

What's new

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

    -
  • Updated the status of the Land and Water Conservation Fund.
    • +
  • Updated the status of the Land and Water Conservation Fund

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

    From c40973276d763a52e1a3650a2a18150878fb5bbb Mon Sep 17 00:00:00 2001 From: brentryanjohnson Date: Wed, 13 Feb 2019 16:09:03 -0800 Subject: [PATCH 17/17] Minor edit --- gatsby-site/src/components/sections/WhatsNew/WhatsNew.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gatsby-site/src/components/sections/WhatsNew/WhatsNew.js b/gatsby-site/src/components/sections/WhatsNew/WhatsNew.js index 0620fd9b5..3c3ced7c7 100644 --- a/gatsby-site/src/components/sections/WhatsNew/WhatsNew.js +++ b/gatsby-site/src/components/sections/WhatsNew/WhatsNew.js @@ -11,7 +11,7 @@ const WhatsNew = (props) => (
    • Updated the status of the Land and Water Conservation Fund
    -

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

    +

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

    • Published a third blog post about usability testing training. This post covers how we're expanding our capacity to perform usability testing.
    • Updated fiscal year revenue data through 2018