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

Dev-->Master #4549

Merged
merged 17 commits into from
Sep 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions blog-site/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ public
.intermediate-representation/
.cache/
yarn.lock
build/
100 changes: 30 additions & 70 deletions blog-site/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion blog-site/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"gatsby-transformer-remark": "^2.1.17",
"gatsby-transformer-sharp": "^2.1.9",
"gatsby-transformer-yaml": "^2.1.11",
"lodash": "^4.17.11",
"lodash": "^4.17.15",
"pngquant-bin": "^5.0.1",
"prismjs": "^1.15.0",
"react": "^16.6.3",
Expand Down
10 changes: 10 additions & 0 deletions blog-site/src/components/layout.css
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,16 @@ a:hover {
z-index: 100000;
}

/* Author profile */

.author-image {
margin-right: 0.725rem;
margin-bottom: 0;
width: 3rem;
height: 3rem;
border-radius: 50%;
}

/* footer */

.footer-content {
Expand Down
2 changes: 1 addition & 1 deletion blog-site/src/data/author.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

- id: Lindsay Goldstein
bio: program analyst at the Office of Natural Resources Revenue
pic: ../img/lindsay-pic.png
pic: ../img/lindsay-pic.jpg

- id: Maroya Faied
bio: program analyst at the Office of Natural Resources Revenue
Expand Down
11 changes: 3 additions & 8 deletions blog-site/src/templates/blog-post.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,9 @@ class BlogPostTemplate extends React.Component {
>
<img
src={author.pic}
alt={`Author profile image`}
style={{
marginRight: rhythm(1 / 2),
marginBottom: 0,
width: rhythm(2),
height: rhythm(2),
}}
/>
alt={author.id + ` profile image`}
className="author-image"
/>
<p
style={{
marginRight: rhythm(1 / 2),
Expand Down
Binary file modified blog-site/static/img/chris-pic.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified blog-site/static/img/edward-pic.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified blog-site/static/img/jeff-pic.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified blog-site/static/img/jennifer-pic.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added blog-site/static/img/lindsay-pic.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed blog-site/static/img/lindsay-pic.png
Binary file not shown.
Binary file modified blog-site/static/img/maroya-pic.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified blog-site/static/img/ryan-pic.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified blog-site/static/img/shannon-pic.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified blog-site/static/img/wendy-pic.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion gatsby-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ let config = {
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: 'v5.4.1',
version: 'v5.4.2',
googleAnalyticsId: GOOGLE_ANALYTICS_ID,
},
plugins: [
Expand Down
Loading