Skip to content
This repository has been archived by the owner on Nov 10, 2020. It is now read-only.

Commit

Permalink
Merge pull request #3636 from ONRR/dev
Browse files Browse the repository at this point in the history
Dev-->Master
  • Loading branch information
jennmalcolm authored Feb 14, 2019
2 parents 960d416 + ebf0832 commit 0fd395a
Show file tree
Hide file tree
Showing 13 changed files with 119 additions and 10 deletions.
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ url: https://revenuedata.doi.gov

# app version number

version: v4.3.3
version: v4.3.4

exclude:
# top-level log
Expand Down
11 changes: 10 additions & 1 deletion _how-it-works/lwcf.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
3 changes: 3 additions & 0 deletions _includes/shutdown-banner.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<section class="alert-banner">
<span class="banner-centered"><img src="{{site.baseurl}}/public/img/icons/icon-alert.svg" width="30px" class="icon-bottom" /> Due to the government shutdown, we're unable to update this site. We will resume work on the site when the shutdown ends.</span>
</section>
12 changes: 12 additions & 0 deletions _sass/blocks/_banner.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
2 changes: 1 addition & 1 deletion gatsby-site/gatsby-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: [
Expand Down
12 changes: 12 additions & 0 deletions gatsby-site/src/components/layouts/AlertBanner/AlertBanner.js
Original file line number Diff line number Diff line change
@@ -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 = () => (
<section className={styles.root}>
<span><AlertIcon className={styles.alertImage} /> Due to the government shutdown, we're unable to update this site. We will resume work on the site when the shutdown ends.</span>
</section>
);

export default AlertBanner;
Original file line number Diff line number Diff line change
@@ -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;
}
2 changes: 2 additions & 0 deletions gatsby-site/src/components/layouts/AlertBanner/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

export {default as AlertBanner} from './AlertBanner'
18 changes: 11 additions & 7 deletions gatsby-site/src/components/sections/WhatsNew/WhatsNew.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,17 @@ const WhatsNew = (props) => (
<section className={styles.root+" slab-delta"}>
<div className="container-page-wrapper">
<h2>What's new</h2>
<p>In our latest release on February 7, 2019, we made the following changes:</p>
<ul className="list-bullet ribbon-card-top-list">
<li>Published a <Link to="/blog">third blog post about usability testing training</Link>. This post covers how we're expanding our capacity to perform usability testing.</li>
<li>Updated <Link to="/downloads/federal-revenue-by-location/">fiscal year revenue data</Link> through 2018</li>
<li>Updated monthly production and revenue data</li>
<li>Converted <Link to="/how-it-works/revenues/#federal-lands-and-waters">revenue streams and rates</Link> image to table for accessibility</li>
</ul>
<p>In our latest release on February 14, 2019, we made the following changes:</p>
<ul className="list-bullet ribbon-card-top-list">
<li>Updated the status of the <Link to="/how-it-works/land-and-water-conservation-fund/">Land and Water Conservation Fund</Link></li>
</ul>
<p>In our release on February 7, 2019, we made the following changes:</p>
<ul className="list-bullet ribbon-card-top-list">
<li>Published a <Link to="/blog">third blog post about usability testing training</Link>. This post covers how we're expanding our capacity to perform usability testing.</li>
<li>Updated <Link to="/downloads/federal-revenue-by-location/">fiscal year revenue data</Link> through 2018</li>
<li>Updated monthly production and revenue data</li>
<li>Converted <Link to="/how-it-works/revenues/#federal-lands-and-waters">revenue streams and rates</Link> image to table for accessibility</li>
</ul>
<p>Review our <a href="https://github.com/ONRR/doi-extractives-data/releases">full release details</a>.</p>
</div>
</section>
Expand Down
16 changes: 16 additions & 0 deletions gatsby-site/src/img/svg/icon-alert.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions gatsby-site/src/layouts/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
16 changes: 16 additions & 0 deletions gatsby-site/static/public/img/icons/icon-alert.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions img/icons/icon-alert.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 0fd395a

Please sign in to comment.