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.

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

Develop #977

Merged
merged 4 commits into from
Aug 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions config-plugins/typography-plugin.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable @typescript-eslint/no-var-requires */
const plugin = require("tailwindcss/plugin");
const typography = plugin(function ({ addUtilities, theme }) {
const newUtilities = {
Expand Down
7 changes: 6 additions & 1 deletion src/components/Footer/Footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ for (const key in landscapeLinksEn.text) {

export function Footer(props) {
const {
className,
error,
lang,
id,
Expand Down Expand Up @@ -94,7 +95,11 @@ export function Footer(props) {
const container = containerClass || "ds-container";

return (
<footer id={id} className="ds-w-full" data-testid="ds-footer">
<footer
id={id}
className={`${className} ds-w-full`}
data-testid="ds-footer"
>
<>
{withContextualBand && (
<ContextualBand
Expand Down
9 changes: 9 additions & 0 deletions src/components/MainBand/MainBand.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
.footerLine::after {
content: "";
position: absolute;
bottom: 0;
left: 0;
width: 36px;
height: 4px;
background-color: #ffffff;
}
25 changes: 11 additions & 14 deletions src/components/MainBand/MainBand.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,26 @@ import {
footerTitle as footerTitleFr,
aboutGovernment as aboutGovernmentFr,
} from "../../translations/fr.json";
import "./MainBand.css";

export function MainBand(props) {
return (
<>
<h3 className="ds-pt-[22px] ds-text-multi-neutrals-white ds-font-body ds-font-bold">
<footer className="ds-py-[22px]">
<h2 className="ds-sr-only" id="accessibleSectionHeader1">
{props.lang === "en" ? aboutGovernmentEn : aboutGovernmentFr}
</h2>
<h3 className="ds-text-[19px] ds-leading-[21px] ds-mb-2 ds-font-body ds-font-bold ds-text-multi-neutrals-white">
{props.lang === "en" ? footerTitleEn : footerTitleFr}
</h3>
<nav
className="ds-pb-6"
role="navigation"
aria-labelledby="accessibleSectionHeader1"
>
<h2 className="ds-sr-only" id="accessibleSectionHeader1">
{props.lang === "en" ? aboutGovernmentEn : aboutGovernmentFr}
</h2>
<ul className="sm:ds-grid sm:ds-grid-cols-3 ds-flex ds-flex-col ds-gap-1 ds-text-xs">
<nav role="navigation" aria-labelledby="accessibleSectionHeader1">
<ul className="sm:ds-grid sm:ds-grid-cols-3 ds-flex ds-flex-col ds-gap-1 ds-text-xs ds-ml-0">
{props.landscapeLinks.map((value, index) => {
return (
<li
key={value + index}
className={`${
index === 0 ? "footerLine ds-pb-[22px] ds-relative" : ""
} ds-text-white ds-w-64 sm:ds-w-56 lg:ds-w-80 ds-my-2.5`}
index === 0 ? "footerLine ds-pb-[26px] ds-relative" : ""
} ds-list-none ds-text-white ds-w-64 sm:ds-w-56 lg:ds-w-80 ds-my-2.5 ds-ml-0`}
>
<Link
id={"LandscapeLink" + index}
Expand All @@ -45,6 +42,6 @@ export function MainBand(props) {
})}
</ul>
</nav>
</>
</footer>
);
}
6 changes: 3 additions & 3 deletions src/components/SubFooterBand/SubFooterBand.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ export function SubFooterBand(props) {
<h2 className="ds-sr-only" id="accessibleSectionHeader2">
{props.lang === "en" ? aboutSiteEn : aboutSiteFr}
</h2>
<ul className="ds-flex ds-flex-col md:ds-flex-row ds-whitespace-nowrap ds-pt-4">
<ul className="ds-flex ds-flex-col md:ds-flex-row ds-whitespace-nowrap ds-pt-4 ds-ml-0">
{props.brandLinks
? props.brandLinks.map(({ href, text, onClick }, index) => {
return (
<li
key={index}
className={`${
index === 0 ? "" : "md:ds-list-disc"
} ds-pr-4 ds-mb-[17px] ds-list-inside ds-list-none ds-text-xxs`}
} ds-pr-4 ds-mb-[17px] ds-list-inside ds-list-none ds-text-xxs ds-ml-0 ds-font-body`}
>
<Link
onClick={onClick ? onClick : undefined}
Expand All @@ -67,7 +67,7 @@ export function SubFooterBand(props) {
key={index}
className={`${
index === 0 ? "" : "md:ds-list-disc"
} ds-pr-4 ds-mb-[17px] ds-list-inside ds-list-none ds-text-xxs`}
} ds-pr-4 ds-mb-[17px] ds-list-inside ds-list-none ds-text-xxs ds-ml-0 ds-font-body`}
>
<Link
onClick={props.onClick ? props.onClick : undefined}
Expand Down
10 changes: 0 additions & 10 deletions src/styles/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,6 @@
background-image: url("../assets/bg-banner-v2.png");
}

.footerLine::after {
content: "";
position: absolute;
bottom: 0;
left: 0;
width: 36px;
height: 4px;
background-color: #ffffff;
}

/* Uses mobile background on smaller screens*/
@media (max-width: 449px) {
.bannerBg {
Expand Down
1 change: 1 addition & 0 deletions tailwind.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable @typescript-eslint/no-var-requires */
const plugin = require("tailwindcss/plugin");

module.exports = {
Expand Down
Loading