Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove email gradient and resize middle footer column #209

Merged
merged 6 commits into from
May 10, 2024
Merged

Remove email gradient and resize middle footer column #209

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ed37425
Remove email gradient and resize middle footer column
dgading May 3, 2024
1386467
Remove react-query and css from loading in footer
dgading May 8, 2024
5007802
remove coverage and parcel-bundle
dgading May 8, 2024
8675005
Add 3.1.9-alpha.1 version
dgading May 9, 2024
fabeaa0
Bump to 3.1.9
dgading May 10, 2024
4871bd3
Add margin top to dataset list item descriptions
dgading May 10, 2024
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
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@civicactions/cmsds-open-data-components",
"version": "3.1.8",
"version": "3.1.9-alpha.1",
"description": "Components for the open data catalog frontend using CMS Design System",
"main": "dist/main.js",
"source": "src/index.ts",
Expand Down
36 changes: 18 additions & 18 deletions src/templates/Footer/footer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -19,10 +36,6 @@
}
}

.dc-c-footer__resources {
background: #f6f9fd;
}

.dc-c-footer__utility {
background: #{var(--color-white)};
}
Expand All @@ -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;
Expand Down
118 changes: 52 additions & 66 deletions src/templates/Footer/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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">
Expand All @@ -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>
Expand Down Expand Up @@ -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}>
Expand Down