From 4f3ef6dd9731767fc0a092ebc03dc755b117fa06 Mon Sep 17 00:00:00 2001
From: Daniel Gading <dgading@proton.me>
Date: Fri, 10 May 2024 16:18:42 -0400
Subject: [PATCH] Remove footer css and resize middle footer column (#209)

* Remove email gradient and resize middle footer column
* Remove react-query and css from loading in footer
* Add margin top to dataset list item descriptions
---
 package-lock.json                             |   4 +-
 package.json                                  |   2 +-
 .../DatasetSearchListItem/index.tsx           |   2 +-
 src/templates/Footer/footer.scss              |  36 +++---
 src/templates/Footer/index.jsx                | 118 ++++++++----------
 5 files changed, 74 insertions(+), 88 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2ba1c9fa..3a8d16fe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@civicactions/cmsds-open-data-components",
-  "version": "3.1.8",
+  "version": "3.1.9",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@civicactions/cmsds-open-data-components",
-      "version": "3.1.8",
+      "version": "3.1.9",
       "license": "GPL-3.0",
       "dependencies": {
         "@popperjs/core": "^2.11.6",
diff --git a/package.json b/package.json
index cdf20f21..b4d24975 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@civicactions/cmsds-open-data-components",
-  "version": "3.1.8",
+  "version": "3.1.9",
   "description": "Components for the open data catalog frontend using CMS Design System",
   "main": "dist/main.js",
   "source": "src/index.ts",
diff --git a/src/components/DatasetSearchListItem/index.tsx b/src/components/DatasetSearchListItem/index.tsx
index 9b89f460..6e9bde0b 100644
--- a/src/components/DatasetSearchListItem/index.tsx
+++ b/src/components/DatasetSearchListItem/index.tsx
@@ -41,7 +41,7 @@ const DatasetSearchListItem = (props: SearchItemProps) => {
           </h2>
         </div>
         <div className="ds-l-row">
-          <div className="ds-l-col--12 ds-l-md-col--12">{truncateText(description)}</div>
+          <div className="ds-l-col--12 ds-l-md-col--12 ds-u-margin-top--2">{truncateText(description)}</div>
         </div>
         <ul className="ds-l-row ds-u-padding--0 ds-u-flex-direction--row ds-u-margin-top--4">
           <li className={linkContainerClasses}>
diff --git a/src/templates/Footer/footer.scss b/src/templates/Footer/footer.scss
index 1f1b7d91..ba69b643 100644
--- a/src/templates/Footer/footer.scss
+++ b/src/templates/Footer/footer.scss
@@ -8,7 +8,24 @@
 }
 
 .dc-c-footer--middle-container {
-  background: linear-gradient(90deg, #f6f9fd 50%, #e8f0fa 50%);
+  background: linear-gradient(#f6f9fd 50%, #e8f0fa 50%);
+}
+
+.dc-c-footer__cms-information {
+  background: none;
+}
+
+.dc-c-footer__resources {
+  background: #f6f9fd;
+}
+
+@media only screen and (min-width: 768px) {
+  .dc-c-footer--middle-container {
+    background: linear-gradient(90deg, #f6f9fd 50%, #e8f0fa 50%);
+  }
+  .dc-c-footer__cms-information {
+    background: #e8f0fa;
+  }
 }
 
 .dc-c-footer__title {
@@ -19,10 +36,6 @@
   }
 }
 
-.dc-c-footer__resources {
-  background: #f6f9fd;
-}
-
 .dc-c-footer__utility {
   background: #{var(--color-white)};
 }
@@ -31,23 +44,10 @@
   list-style: none;
 }
 
-.dc-c-footer__cms-information {
-  background: #e8f0fa;
-}
-
 .dc-footer--heading {
   text-transform: uppercase;
 }
 
-.dc-c-emailupdates {
-  background-image: linear-gradient(
-    35deg,
-    #{var(--color-primary-darkest)},
-    #{var(--color-primary-darker)},
-    #{var(--color-primary)}
-  );
-  color: #{var(--color-white)};
-}
 .dc-c-footer--svg-icon {
   width: 40px;
   height: 40px;
diff --git a/src/templates/Footer/index.jsx b/src/templates/Footer/index.jsx
index d611d3e7..c00237a2 100644
--- a/src/templates/Footer/index.jsx
+++ b/src/templates/Footer/index.jsx
@@ -1,9 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { useMediaQuery } from 'react-responsive';
 import { Button } from '@cmsgov/design-system';
 import NavLink from '../../components/NavLink';
-import "./footer.scss";
 
 const Footer = ({
   links,
@@ -17,9 +15,6 @@ const Footer = ({
   cmsLogo,
   trademarkContent,
 }) => {
-  const xs = useMediaQuery({ minWidth: 0, maxWidth: 544 });
-  const sm = useMediaQuery({ minWidth: 544, maxWidth: 768 });
-  const md = useMediaQuery({ minWidth: 768 });
   const { footerOpenDataToolLinks, footerAdditionalResourcesLinks, footerUtilityLinks } = links;
   return (
     <footer className="dc-c-footer">
@@ -39,73 +34,66 @@ const Footer = ({
         </div>
       )}
       <div className="dc-c-footer--middle-container">
-        <div className={`${md ? 'ds-l-container' : ''}`}>
-          <div className="ds-l-row ds-u-margin--0">
+        <div className="ds-l-container">
+          <div className="ds-l-row">
             <div
-              className={`dc-c-footer__resources ds-l-md-col--7 ds-l-sm-col--12 ds-u-padding-top--7 ds-u-padding-bottom--4
-                ${xs ? 'ds-u-padding-x--0' : ''}`}
+              className="dc-c-footer__resources ds-l-md-col--7 ds-l-sm-col--12 ds-u-padding-top--7 ds-u-padding-bottom--3"
             >
-              <div className="ds-l-lg-col--9 ds-l-md-col--11">
-                <div
-                  className={`ds-u-display--flex ${
-                    xs ? 'ds-u-flex-direction--column' : 'ds-u-flex-direction--row'
-                  }`}
-                >
-                  <div className="ds-u-margin-right--6 ds-u-margin-bottom--2">
-                    <h2 className="ds-text-heading--sm dc-footer--heading ds-u-margin-bottom--2">
-                      Open data tools
-                    </h2>
-                    <ul className="ds-u-font-size--sm ds-u-margin-bottom--3">
-                      {footerOpenDataToolLinks.map((link) => (
-                        <li className="ds-u-margin-bottom--1" key={link.id}>
-                          <NavLink link={link} className="dc-menu-item" />
-                        </li>
-                      ))}
-                    </ul>
-                  </div>
-                  <div>
-                    <h2 className="ds-text-heading--sm dc-footer--heading ds-u-margin-bottom--2">
-                      Additional resources
-                    </h2>
-                    <ul className="ds-u-font-size--sm">
-                      {footerAdditionalResourcesLinks
-                        .filter((link) => {
-                          const noOnClick = Object.keys(link).findIndex((l) => l === 'onClick');
-                          if (noOnClick === -1 || (link.onClick && link.dataTag)) {
-                            return link;
-                          }
-                        })
-                        .map((link) => {
-                          if (link.onClick && link.dataTag) {
-                            return (
-                              <li className="ds-u-margin-bottom--1" key={link.id}>
-                                <a
-                                  href={link.url}
-                                  {...{
-                                    ['data-' + link.dataTag.name]: link.dataTag.value,
-                                  }}
-                                  onClick={link.onClick}
-                                >
-                                  {link.label}
-                                </a>
-                              </li>
-                            );
-                          }
+              <div
+                className="ds-u-display--flex ds-u-display--flex ds-u-sm-flex-direction--row ds-u-flex-direction--column"
+              >
+                <div className="ds-u-margin-right--6 ds-u-margin-bottom--3 ds-u-sm-margin-bottom--0">
+                  <h2 className="ds-text-heading--sm dc-footer--heading ds-u-margin-bottom--2">
+                    Open data tools
+                  </h2>
+                  <ul className="ds-u-font-size--sm">
+                    {footerOpenDataToolLinks.map((link) => (
+                      <li className="ds-u-margin-bottom--1" key={link.id}>
+                        <NavLink link={link} className="dc-menu-item" />
+                      </li>
+                    ))}
+                  </ul>
+                </div>
+                <div>
+                  <h2 className="ds-text-heading--sm dc-footer--heading ds-u-margin-bottom--2">
+                    Additional resources
+                  </h2>
+                  <ul className="ds-u-font-size--sm">
+                    {footerAdditionalResourcesLinks
+                      .filter((link) => {
+                        const noOnClick = Object.keys(link).findIndex((l) => l === 'onClick');
+                        if (noOnClick === -1 || (link.onClick && link.dataTag)) {
+                          return link;
+                        }
+                      })
+                      .map((link) => {
+                        if (link.onClick && link.dataTag) {
                           return (
                             <li className="ds-u-margin-bottom--1" key={link.id}>
-                              <NavLink link={link} className="dc-menu-item" />
+                              <a
+                                href={link.url}
+                                {...{
+                                  ['data-' + link.dataTag.name]: link.dataTag.value,
+                                }}
+                                onClick={link.onClick}
+                              >
+                                {link.label}
+                              </a>
                             </li>
                           );
-                        })}
-                    </ul>
-                  </div>
+                        }
+                        return (
+                          <li className="ds-u-margin-bottom--1" key={link.id}>
+                            <NavLink link={link} className="dc-menu-item" />
+                          </li>
+                        );
+                      })}
+                  </ul>
                 </div>
               </div>
             </div>
             <div
-              className={`dc-c-footer__cms-information ds-l-md-col--5 ds-l-sm-col--12 ${
-                md ? 'ds-u-padding-left--7' : ''
-              } ${sm ? ' ds-u-padding-left--4' : ''} ds-u-padding-y--7`}
+              className="dc-c-footer__cms-information ds-l-md-col--5 ds-l-sm-col--12 ds-u-lg-padding-left--7 ds-u-padding-y--7"
             >
               <div className="ds-u-font-size--sm">
                 <div>
@@ -322,12 +310,10 @@ const Footer = ({
         </div>
       </div>
       <div className="dc-c-footer__utility ds-l-container ds-u-padding-y--2 ds-u-font-size--sm">
-        <div className="ds-l-row ">
+        <div className="ds-l-row">
           <div className="ds-l-col--12 ds-u-padding-y--3">
             <ul
-              className={`ds-u-padding--0 ds-u-display--flex ${
-                md ? 'ds-u-flex-direction--row' : 'ds-u-flex-direction--column'
-              } ds-u-flex-wrap--wrap`}
+              className="ds-u-padding--0 ds-u-display--flex ds-u-lg-flex-direction--row ds-u-flex-direction--column"
             >
               {footerUtilityLinks.map((link) => (
                 <li key={link.id}>