Merge pull request #247 from CivicActions/MAHOME-1140-update-homesite…

…-styles

MAHOME-1140: Update Homesite Styles

gatsby-config.js

@@ -381,8 +381,8 @@ module.exports = {
               variants: ['300', '400', '600', '700']
             },
             {
-              family: 'Work Sans',
-              variants: ['300', '400', '600', '700']
+              family: 'Merriweather',
+              variants: ['400', '700']
             },
           ]
         }

src/components/footer.js

@@ -49,7 +49,7 @@ const Footer = () => {
         </div>
         <div className='grid-container__item footer__bottom-links'>
           <div className='footer__bottom-links--wrapper'>
-            <p className='copyright'>© 2010 —- 2021</p>
+            <p className='copyright'>© 2010 —- {new Date().getFullYear()}</p>
             <p className='accessibility'><Link to='/accessibility-statement'>Accessibility</Link></p>
             <p className='licensing'><Link to='/licensing'>Licensing</Link></p>
             <p className='privacy'><Link to='/privacy'>Privacy</Link></p>

src/components/menus/main-menu/_main-menu.scss

@@ -120,12 +120,10 @@
     display: block;
     text-decoration: none;
     font-style: normal;
-    font-weight: 600;
+    font-weight: 700;
     font-size: 14px;
     line-height: 34px;
-    font-family: $secondary-font;
-
-
+    font-family: $primary-font;
   }
 
   a {

src/components/offering/bio.js

@@ -19,7 +19,7 @@ const Bio = ({ member }) => {
               <img className='blue-icon' alt='blue linkedin icon' src={linkedinIconBlue}/>
           </a>
           <p className='body staff-role'>{Role}</p></div></div>
-        <div className='staff-body--wrapper'><p className='body staff-body'>{Body}</p></div>
+        <div className='staff-body--wrapper'><p className='body staff-body'>{Body.data.Body}</p></div>
       </div>
     )
   }) : null

src/components/press-release-grid.js

@@ -4,10 +4,9 @@ import PropTypes from 'prop-types';
 import { Link } from 'gatsby-link';
 import ReactMarkdown from "react-markdown";
 
-const PressReleaseGrid = ({ path, date, title, description, id }) => {
-
+const PressReleaseGrid = ({ path, date, title, description, id, first, last }) => {
   return (
-    <div className='press-release--item' key={id}>
+    <div className={`press-release--item${first ? ' first' : ''}${last ? ' last' : ''}`} key={id}>
       <span>News Release: {date}</span>
       <h2>{title}</h2>
       <ReactMarkdown className='body' children={description} />
@@ -22,4 +21,6 @@ PressReleaseGrid.propTypes = {
   date: PropTypes.string,
   title: PropTypes.string.isRequired,
   description: PropTypes.string,
+  first: PropTypes.bool,
+  last: PropTypes.bool
 };

src/components/primary-page-cta.js

@@ -4,13 +4,14 @@ import PropTypes from 'prop-types';
 import LinkButton from '../components/link-button';
 
 const PrimaryPageCTA = ({
+  isHomePage = false,
   title,
   subtitle,
   primaryButtonText, primaryButtonLink,
   secondaryButtonText, secondaryButtonLink,
 }) => {
   return (
-      <section className='primary-page-cta'>
+      <section className={`primary-page-cta${isHomePage ? ' home' : ''}`}>
         <div className='inner'>
           <div className='cta-column primary-page-cta__text'>
 
@@ -38,6 +39,7 @@ const PrimaryPageCTA = ({
 export default PrimaryPageCTA;
 
 PrimaryPageCTA.propTypes = {
+  isHomePage: PropTypes.bool,
   title: PropTypes.string.isRequired,
   subtitle: PropTypes.string,
   primaryButtonText: PropTypes.string,

src/components/quote.js

@@ -1,7 +1,6 @@
 import '../sass/styles.scss';
 import React from 'react';
 import PropTypes from 'prop-types';
-import quotePatternGraphic from '../files/images/quote-pattern-graphic.png';
 
 const Quote = ({ classes, quote, source }) => {
   return (
@@ -11,7 +10,6 @@ const Quote = ({ classes, quote, source }) => {
           <p className='h3'>{quote}</p>
           <p className='body source'>{source}</p>
         </div>
-        <img src={quotePatternGraphic} alt='' className='pattern'></img>
       </div>
     </div>
   );