Skip to content
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 public/assets/logos/new_stem_footer.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
72 changes: 44 additions & 28 deletions src/app/components/elements/list-groups/ListGroupFooterBottom.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,37 +35,53 @@ const footerLinks = {
};

export const ListGroupFooterBottom = () => (
<div className="footer-links footer-bottom">
<ListGroup className="d-flex flex-wrap flex-row link-group">
<ListGroupItem className="footer-bottom-links d-md-flex flex-md-row bg-transparent link-group w-100">
<div className="footer-links footer-bottom d-flex flex-column w-100">
<div className="footer-bottom-links-row mb-3">
<div className="footer-bottom-links d-md-flex flex-md-row align-items-center">
<h2 className="h5 mb-3 mb-md-0 mr-md-4">Links</h2>
<ListGroup className="d-md-flex flex-md-row">{footerLinks.right}</ListGroup>
</ListGroupItem>
<ListGroupItem className="footer-bottom-info border-0 px-0 py-0 bg-transparent">
<p className="pl-3 pt-2 mb-lg-0 pb-2 pb-sm-0">
All teaching materials on this site are available under the{" "}
<ExternalLink
href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/"
className="d-inline fw-bold print-font"
>
Open Government Licence v3.0
</div>
</div>

<div className="footer-bottom-row d-flex flex-column flex-lg-row align-items-lg-end justify-content-between">
<div className="footer-bottom-section footer-bottom-info-section mb-3 mb-lg-0">
<div className="footer-bottom-info">
<p className="mb-0">
All teaching materials on this site are available under the{" "}
<ExternalLink
href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/"
className="d-inline fw-bold print-font"
>
Open Government Licence v3.0
</ExternalLink>
, except where otherwise stated.
</p>
</div>
</div>

<div className="footer-bottom-logos d-flex align-items-end d-print-none">
<div className="footer-bottom-logo d-flex align-items-center justify-content-center mb-3 mb-lg-0">
<ExternalLink href="https://teachcomputing.org/">
<img
src="/assets/logos/ncce.svg"
alt="National Centre for Computing Education website"
className="footer-ncce-logo"
/>
</ExternalLink>
, except where otherwise stated.
</p>
</ListGroupItem>
</div>

<ListGroupItem className="footer-bottom-logos border-0 px-0 py-0 bg-transparent d-flex flex-column flex-md-row justify-content-between align-items-start align-items-md-center d-print-none">
<ExternalLink href="https://teachcomputing.org/" className="mb-3 mb-md-0">
<img
src="/assets/logos/ncce.svg"
alt="National Centre for Computing Education website"
className="img-fluid"
/>
</ExternalLink>
<ExternalLink href="https://www.gov.uk/government/organisations/department-for-education">
<img src="/assets/logos/dfe.svg" alt="UK Department for Education" className="img-fluid" />
</ExternalLink>
</ListGroupItem>
</ListGroup>
<div className="footer-bottom-logo d-flex align-items-center justify-content-center mb-3 mb-lg-0">
<ExternalLink href="https://www.gov.uk/government/organisations/department-for-education">
<img src="/assets/logos/dfe.svg" alt="UK Department for Education" className="footer-dfe-logo" />
</ExternalLink>
</div>

<div className="footer-bottom-logo d-flex align-items-center justify-content-center">
<ExternalLink href="https://www.stem.org.uk/">
<img src="/assets/logos/new_stem_footer.svg" alt="STEM Learning" className="footer-stem-logo" />
</ExternalLink>
</div>
</div>
</div>
</div>
);
8 changes: 1 addition & 7 deletions src/app/components/navigation/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { ListGroupFooter } from "../elements/list-groups/ListGroupFooter";
import { ListGroupSocial } from "../elements/list-groups/ListGroupSocial";
import { ListGroupFooterBottom } from "../elements/list-groups/ListGroupFooterBottom";
import { Link } from "react-router-dom";
import { ExternalLink } from "../elements/ExternalLink";

export const Footer = () => (
<footer>
Expand Down Expand Up @@ -37,15 +36,10 @@ export const Footer = () => (
</div>
<div className="footerBottom">
<Container>
<Row className="pt-3 px-sm-0">
<Row className="pt-3 pb-4 px-sm-3 footer-bottom-container">
<ListGroupFooterBottom />
</Row>
</Container>
<div className="w-100 d-flex justify-content-end">
<ExternalLink href="https://www.stem.org.uk/">
<img src="/assets/logos/stem_footer.svg" alt="STEM Learning" className="logo-mr" height="100px" />
</ExternalLink>
</div>
</div>
</footer>
);
142 changes: 84 additions & 58 deletions src/scss/common/footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,6 @@
font-size: 14px;
color: #000000;
}
@include respond-above(md) {
width: 40%;
}
}
.footer-bottom-logos {
@include respond-above(md) {
width: 30%;
margin-left: 8%;
}
}
}

Expand All @@ -127,17 +118,63 @@
color: black !important;
}

.footer-bottom-logos img {
max-width: 100%;
height: auto;
.footer-bottom-info-section {
flex: 0 0 auto;
max-width: 450px;
}

.footer-bottom-links {
white-space: nowrap;
}

.footer-bottom-info {
p {
white-space: normal;
margin: 0;
}
}

.footer-bottom-logos {
gap: 4rem;
padding-right: 3rem;
}

.footer-bottom-logo img {
height: 35px;
width: auto;
}

.footer-bottom-logo .footer-ncce-logo {
height: 41px;
width: auto;
}

.footer-bottom-logo .footer-dfe-logo {
height: 52px;
width: auto;
}

.footer-bottom-logo .footer-stem-logo {
height: 40px;
width: auto;
}

@media only screen and (min-width: 990px) {
.footer-bottom-logos img {
height: auto;
.footer-bottom-logo img {
height: 40px;
width: auto;
max-width: 90%;
padding-left: 14px;
}

.footer-bottom-logo .footer-ncce-logo {
height: 46px;
}

.footer-bottom-logo .footer-dfe-logo {
height: 59px;
}

.footer-bottom-logo .footer-stem-logo {
height: 47px;
}
}

Expand All @@ -146,76 +183,65 @@
padding-top: 0.5rem !important;
}

.footer-bottom-info {
p {
padding-bottom: 1.5rem !important;
}
.footer-bottom-logo img {
height: 35px;
width: auto;
}

.footer-bottom-logos {
padding-bottom: 1.5rem;
.footer-bottom-logo .footer-dfe-logo {
height: 42px;
}

.footer-bottom-logos img {
height: auto;
width: auto;
max-width: 90%;
padding-left: 14px;

.footer-bottom-logo .footer-stem-logo {
height: 30px;
}
}

@media only screen and (min-width: 480px) and (max-width: 768px) {
// Mobile styles (max-width: 768px)
@media only screen and (max-width: 768px) {
.links-col {
padding-top: 0.5rem !important;
}

.footer-links .footer-support-links .h5,
.footer-links .footer-support-links .h5,
.footer-bottom-links .h5 {
margin-bottom: 15px;
text-align: left;
}

.footer-links .footer-support-links a,
.footer-bottom-links a {
margin-bottom: 10px;
}

.footer-bottom-info {
p {
padding-bottom: 1.5rem !important;
}
.footer-bottom-row {
align-items: flex-start !important;
}

.footer-bottom-info-section {
max-width: 100%;
width: 100%;
}

.footer-bottom-logos {
padding-bottom: 1.5rem;
margin-left: 5%;
gap: 1.25rem;
flex-direction: column;
align-items: flex-start !important;
padding-right: 0;
gap: 1rem;
margin-top: 1rem;
}

.footer-bottom-logo {
justify-content: flex-start !important;
}

.footer-bottom {
padding-left: 1rem;
}
}

@media only screen and (max-width: 480px) {
.logo-col {
padding: 20px !important;
}

.links-col {
padding-top: 0.5rem !important;
}

.footer-links .footer-support-links .h5,
.footer-bottom-links .h5 {
margin-bottom: 15px;
text-align: left;
}

.footer-links .footer-support-links a,
.footer-bottom-links a {
margin-bottom: 10px;
}

.footer-bottom-logos {
gap: 1.25rem;
margin-left: 5%;
}
}
Loading