Merge pull request #4549 from ONRR/dev

Dev-->Master
DOI-ONRR · Sep 4, 2019 · f39adb6 · f39adb6
2 parents 1dde3fa + 48ea640
commit f39adb6
Show file tree

Hide file tree

Showing 38 changed files with 161 additions and 191 deletions.
diff --git a/blog-site/.gitignore b/blog-site/.gitignore
@@ -5,3 +5,4 @@ public
 .intermediate-representation/
 .cache/
 yarn.lock
+build/
diff --git a/blog-site/package-lock.json b/blog-site/package-lock.json
diff --git a/blog-site/package.json b/blog-site/package.json
@@ -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",

diff --git a/blog-site/src/components/layout.css b/blog-site/src/components/layout.css
@@ -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 {

diff --git a/blog-site/src/data/author.yaml b/blog-site/src/data/author.yaml
@@ -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

diff --git a/blog-site/src/templates/blog-post.js b/blog-site/src/templates/blog-post.js
@@ -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),

diff --git a/blog-site/static/img/chris-pic.jpg b/blog-site/static/img/chris-pic.jpg
diff --git a/blog-site/static/img/edward-pic.jpg b/blog-site/static/img/edward-pic.jpg
diff --git a/blog-site/static/img/jeff-pic.jpg b/blog-site/static/img/jeff-pic.jpg
diff --git a/blog-site/static/img/jennifer-pic.jpg b/blog-site/static/img/jennifer-pic.jpg
diff --git a/blog-site/static/img/lindsay-pic.jpg b/blog-site/static/img/lindsay-pic.jpg
diff --git a/blog-site/static/img/lindsay-pic.png b/blog-site/static/img/lindsay-pic.png
diff --git a/blog-site/static/img/maroya-pic.jpg b/blog-site/static/img/maroya-pic.jpg
diff --git a/blog-site/static/img/ryan-pic.jpg b/blog-site/static/img/ryan-pic.jpg
diff --git a/blog-site/static/img/shannon-pic.jpg b/blog-site/static/img/shannon-pic.jpg
diff --git a/blog-site/static/img/wendy-pic.jpg b/blog-site/static/img/wendy-pic.jpg
diff --git a/gatsby-config.js b/gatsby-config.js
@@ -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: [