diff --git a/src/pages/candidates.js b/src/pages/candidates.js index f4147d8..0f492ac 100644 --- a/src/pages/candidates.js +++ b/src/pages/candidates.js @@ -12,9 +12,14 @@ const alphabeticalSort = (a, b) => { : a.toLowerCase() > b.toLowerCase() ? 1 : 0; }; +const lastWord = string => { + const list = string.split(" "); + return list[list.length - 1]; +}; + export const sortFunctions = { state: candidates => sortBy(candidates, c => `${c.state}${c.district}`), - alphabetical: candidates => sortBy(candidates, c => c.lastName), + alphabetical: candidates => sortBy(candidates, c => lastWord(c.lastName)), electionDate: candidates => sortBy( sortBy( diff --git a/src/pages/index.js b/src/pages/index.js index 87dbd6b..6842ad4 100644 --- a/src/pages/index.js +++ b/src/pages/index.js @@ -177,16 +177,18 @@ const IndexPage = ({ data }) => { fontSize: "42px" }} > -
Our Candidates -
+ {
{jdHighlightHeader}
-
{jdHighlightText}
+
+ {jdHighlightText} +
diff --git a/src/pages/issues.js b/src/pages/issues.js index f0966a4..9f4d438 100644 --- a/src/pages/issues.js +++ b/src/pages/issues.js @@ -5,6 +5,11 @@ import Banner from "../components/Banner"; import Plank from "../components/Plank"; import "../style/issues.scss"; +const lastWord = string => { + const list = string.split(" "); + return list[list.length - 1]; +}; + const IssuePageTemplate = ({ html: body, frontmatter: { @@ -48,6 +53,12 @@ const IssuePageTemplate = ({ {sections.map(({ title, icon, intro, planks }) => (
+
+
diff --git a/src/style/banner.scss b/src/style/banner.scss index 0f2d0e9..1b17893 100644 --- a/src/style/banner.scss +++ b/src/style/banner.scss @@ -1,7 +1,7 @@ @import "includes/includes"; .banner-container { - height: 550px; + height: 400px; background-size: cover; display: flex; align-items: center; diff --git a/src/style/home-block.scss b/src/style/home-block.scss index 2140d89..ec13c31 100644 --- a/src/style/home-block.scss +++ b/src/style/home-block.scss @@ -219,11 +219,12 @@ .highlight-container { background-color: $jd-dark-blue; max-width: 1040px; + width: 100%; color: white; display: flex; align-items: center; - justify-content: space-between; - padding: 10px; + justify-content: space-around; + padding: 30px; .highlight-icon { max-width: 150px; @@ -236,6 +237,7 @@ .highlight-contents { max-width: calc(100% - 180px); + width: calc(100% - 180px); .highlight-header { text-transform: uppercase; diff --git a/src/style/navbar.scss b/src/style/navbar.scss index 495ac16..8dd23ed 100644 --- a/src/style/navbar.scss +++ b/src/style/navbar.scss @@ -62,8 +62,8 @@ display: block; color: white; text-transform: uppercase; - padding-left: 50px; - padding-right: 50px; + padding-left: 25px; + padding-right: 25px; height: 100%; display: flex; justify-content: center;