Merge branch 'dev' into patterns-content

_federal-revenue-by-company/2016.md

@@ -1,7 +1,7 @@
 ---
 title: Federal Revenue By Company (2016) | Explore Data
 report_year: 2016
-description: Explore revenues on federal lands and waters in 2015 by commodity, revenue type, and company.
+description: Explore revenues on federal lands and waters in 2016 by commodity, revenue type, and company.
 tag:
 - How it works
 - Federal revenue

_sass/blocks/explore/_regions-list.scss

@@ -60,6 +60,10 @@
     text-align: left;
   }
 
+  .name td {
+    border-top: none;
+  }
+
   .bar_dollars {
     padding-right: $base-padding;
   }
@@ -140,6 +144,10 @@
     width: 3em;
   }
 
+  td, th .value.subtotal {
+    vertical-align: bottom;
+  }
+
   .bar { // specific to reconcilation
     width: 100px;
 
@@ -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) {

_states/CO.md

@@ -52,7 +52,7 @@ The [Colorado Department of Natural Resources](http://dnr.state.co.us/Pages/DNRD
 * The Colorado [Oil and Gas Conservation Commission](http://cogcc.state.co.us/#/home) ensures that oil and gas wells and operations comply with state law. It is involved in all stages of extraction—issuing exploration permits, auctioning leases, addressing incidents/complaints, enforcing rules and regulations, collecting levies, etc. The commission is governed by [rules and regulations](http://cogcc.state.co.us/#/overview), runs a [data portal](http://cogcc.state.co.us/data.html#/cogis), and publishes [reports](http://cogcc.state.co.us/library.html#/areareports).
 * The [Division of Reclamation, Mining, and Safety](http://mining.state.co.us/Pages/Home.aspx) works to protect the public, miners, and the environment during current mining operations. It holds responsibility for restoring abandoned mines and ensuring that all mined land is reclaimed to beneficial use. It works to achieve these goals through [four major programs](http://mining.state.co.us/PROGRAMS/Pages/default.aspx): coal regulatory program, minerals regulatory program, inactive mine reclamation program, and mine safety and training program. The commission is governed by [rules and regulations](http://mining.state.co.us/Rules/Pages/home.aspx) and publishes [data and reports](http://mining.state.co.us/Reports/Pages/default.aspx)
 
-The [Colorado Department of Public Health and Environment](https://www.colorado.gov/pacific/cdphe (CDPHE) plays a role in regulating oil and gas operations. CDPHE deals primarily with:
+The [Colorado Department of Public Health and Environment](https://www.colorado.gov/pacific/cdphe) (CDPHE) plays a role in regulating oil and gas operations. CDPHE deals primarily with:
 * [Air emission](https://www.colorado.gov/pacific/cdphe/emissions-requirements-oil-and-gas-industry) requirements for the oil and gas industry
 * [Water quality](https://www.colorado.gov/pacific/cdphe/categories/services-and-information/environment/water-quality) and stormwater discharge permits for oil and gas facilities
 * [Hazardous, radioactive, and solid waste](https://www.colorado.gov/pacific/cdphe/categories/services-and-information/environment/waste-management-and-recycling) requirements affecting oil and gas facilities

gatsby-site/src/data/fund_names.yml

@@ -9,13 +9,13 @@ Reclamation:
   description: Supports the establishment of critical infrastructure projects like dams and power plants.
 Land & Water Conservation:
   name: Land and Water Conservation Fund
-  description: Provides matching grants to states and local governments to buy and develop public outdoor recreation areas across the 50 states. See below for more information about this fund.
+  description: Provides matching grants to states and local governments to buy and develop public outdoor recreation areas across the 50 states.
   link: 
     name: How this fund works
     to: /how-it-works/land-and-water-conservation-fund/
 Historic Preservation:
   name: Historic Preservation Fund
-  description: Helps preserve U.S. historical and archaeological sites and cultural heritage through grants to state and tribal historic preservation offices. See below for more information about this fund.
+  description: Helps preserve U.S. historical and archaeological sites and cultural heritage through grants to state and tribal historic preservation offices.
   link: 
     name: How this fund works
     to: /how-it-works/historic-preservation-fund/