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 #3848 from ONRR/dev
Browse files Browse the repository at this point in the history
Dev-->Master
  • Loading branch information
jennmalcolm authored Apr 3, 2019
2 parents 44c0528 + 232a145 commit a52e567
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 12 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.8
version: v4.3.9

exclude:
# top-level log
Expand Down
2 changes: 1 addition & 1 deletion blog-site/src/pages/content-design-blog-authors/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ Then, we can modify the blog post template to loop over the author(s) and includ
width: rhythm(2),
height: rhythm(2),
}}
/>
/>
<p
style={{
marginRight: rhythm(1 / 2),
Expand Down
Binary file not shown.
4 changes: 2 additions & 2 deletions gatsby-site/gatsby-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ const GOOGLE_ANALYTICS_ID = (process.env.google_analytics) ?

module.exports = {
// Note: it must *not* have a trailing slash.
// This is currently the realtive path in our Jekyl deployment. This path points to our Gatsby Pages.
// This is currently the relative path in our Jekyll deployment. This path points to our Gatsby pages.

// This prefix is prepended to load all our related images, code, and pages.
pathPrefix: `${BASEURL}/gatsby-public`,

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.8',
version: 'v4.3.9',
googleAnalyticsId: GOOGLE_ANALYTICS_ID,
},
plugins: [
Expand Down
5 changes: 2 additions & 3 deletions gatsby-site/src/components/sections/WhatsNew/WhatsNew.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@ 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 March 27, 2019, we made the following changes:</p>
<p>In our latest release on April 3, 2019, we made the following changes:</p>
<ul className="list-bullet ribbon-card-top-list">
<li>Published a <Link to="/blog/content-design-blog-authors/">new blog post about how we built support for multiple blog post authors</Link></li>
<li>Updated the <Link to="/how-it-works/revenues/#federal-lands-and-waters">revenue streams and rates table</Link></li>
<li>Updated <Link to="/downloads/federal-production/">fiscal year production data file for 2018</Link>.</li>
</ul>
<p>Review our <a href="https://github.com/ONRR/doi-extractives-data/releases">full release details</a>.</p>
</div>
Expand Down
8 changes: 3 additions & 5 deletions gatsby-site/src/markdown/downloads/federal-production.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ tag:
</section>
</section>

> This dataset contains information on production on federal lands and waters. We have versions of these datasets available for calendar years 2008-2017 and for fiscal years 2008-2017.
> This dataset contains information on production on federal lands and waters. We have versions of these datasets available for calendar years 2008-2017 and for fiscal years 2009-2018.

<p class="downloads-download_links-intro">Download calendar year data:
Expand All @@ -39,7 +39,7 @@ tag:

<p class="downloads-download_links-intro">Download fiscal year data:
<ul class="downloads-download_links list-unstyled">
<li><download-link to="/downloads/federal_production_FY2008-2017_2018-06-15.xlsx">Full dataset (xlsx, 387 KB)</download-link></li>
<li><download-link to="/downloads/federal_production_FY2009-2018_2019-03-26.xlsx">Full dataset (xlsx, 409 KB)</download-link></li>
</ul>
</p>

Expand All @@ -51,9 +51,7 @@ We have [notes on this data](https://github.com/onrr/doi-extractives-data/wiki/D

This dataset includes natural resource production for U.S. federal lands and offshore areas. It does not include Indian lands, privately owned lands, or U.S. state lands. The dataset currently include data tracked and managed by the Department of the Interior’s Office of Natural Resources Revenue (ONRR). The production data for Oil and Gas is collected on Form ONRR-4054 (Oil and Gas Operations Report). Coal and hardrock production is collected on Form ONRR-4430 (Solid Minerals Production and Royalty Report).

## Data publication

The federal production datasets are updated annually in July for the most recent completed fiscal and calendar year.
## About the data

<h3 alt="Withheld data">Why was some solids data withheld?</h3>

Expand Down
14 changes: 14 additions & 0 deletions gatsby-site/src/styles/blocks/explore/_regions-list.scss
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@
text-align: left;
}

.name td {
border-top: none;
}

.bar_dollars {
padding-right: $base-padding;
}
Expand Down Expand Up @@ -140,6 +144,10 @@
width: 3em;
}

td, th .value.subtotal {
vertical-align: bottom;
}

.bar { // specific to reconcilation
width: 100px;

Expand Down Expand Up @@ -191,6 +199,12 @@
position: relative;
}

tbody:not(:first-child):before {
content: '';
display: block;
height: 2rem;
}

.region-name,
.map-legend {
@include respond-to(large-down) {
Expand Down

0 comments on commit a52e567

Please sign in to comment.