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

Fix footer layout and outline #82

Merged
merged 2 commits into from
Jan 18, 2024
Merged

Fix footer layout and outline #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b89c8a0
fix footer layout and outline
kronnox Jan 18, 2024
fdde2f4
Merge branch 'main' into bug/footer-layout
kronnox Jan 18, 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
29 changes: 17 additions & 12 deletions cigaradvisor/blocks/footer/footer.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
font-family: var(--ff-montserrat);
}

.footer > h2 {
display: none;
}

.footer a {
line-height: unset;
font-size: unset;
Expand All @@ -28,6 +32,7 @@

.footer-legal ul > li {
line-height: 18px;
color: inherit;
}

.footer-legal a {
Expand All @@ -38,18 +43,18 @@
padding: 18px 0 40px;
}

.footer-nav > .nav-container {
.footer-nav nav {
display: grid;
}

.footer-nav > .nav-container > .nav-section {
.footer-nav nav > .nav-section {
padding: 10px;
width: 100%;
font-size: 14px;
line-height: 33px;
}

.footer-nav > .nav-container > .nav-section.with-heading > h1 {
.footer-nav nav > .nav-section.with-heading > h1 {
margin-bottom: 5px;
color: #673841;
font-family: var(--ff-opensans);
Expand All @@ -58,17 +63,17 @@
letter-spacing: .06em;
}

.footer-nav > .nav-container > .nav-section > ul {
.footer-nav nav > .nav-section > ul {
list-style-type: none;
padding: 0;
margin: 0;
}

.footer-nav > .nav-container > .nav-section:last-child > ul > li {
.footer-nav nav > .nav-section:last-child > ul > li {
display: inline;
}

.footer-nav > .nav-container > .nav-section:last-child > ul > li .icon {
.footer-nav nav > .nav-section:last-child > ul > li .icon {
--icon-size: 28px;

margin: 0 10px;
Expand All @@ -84,18 +89,18 @@
padding-bottom: 40px;
}

.footer-nav > .nav-container {
.footer-nav nav {
max-width: 1100px;
margin: auto;
grid-template-columns: repeat(4, 1fr);
grid-template-areas: "nav nav nav nav" "social social social social";
}

.footer-nav > .nav-container > .nav-section {
.footer-nav nav > .nav-section {
width: fit-content;
}

.footer-nav > .nav-container > .nav-section:last-child {
.footer-nav nav > .nav-section:last-child {
grid-area: social;
margin: auto;
text-align: center;
Expand All @@ -113,17 +118,17 @@
}

@media screen and (min-width: 960px) {
.footer-nav > .nav-container {
.footer-nav nav {
grid-template-columns: 8% 18% 18% 18% auto;
}

.footer-nav > .nav-container > .nav-section:last-child {
.footer-nav nav > .nav-section:last-child {
grid-area: unset;
margin: unset;
text-align: unset;
}

.footer-nav > .nav-container > .nav-section:last-child > ul > li .icon {
.footer-nav nav > .nav-section:last-child > ul > li .icon {
margin: 0 18px;
}
}
Expand Down
19 changes: 11 additions & 8 deletions cigaradvisor/blocks/footer/footer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,16 @@ export default async function decorate(block) {
footerContent.innerHTML = footerContent.innerHTML.replaceAll('{year}', currentYear.toString());

// decorate footer sections
const footerContainer = footerContent.querySelector('div.footer-nav > .default-content-wrapper');
if (footerContainer && footerContainer.childNodes.length) {
footerContainer.classList.add('nav-container');

let currentElement = footerContainer.firstElementChild;
const footerNavContainer = footerContent.querySelector('div.footer-nav > .default-content-wrapper');
const footerNav = document.createElement('nav');
if (footerNavContainer && footerNavContainer.childNodes.length) {
let currentElement = footerNavContainer.firstElementChild;
let nextElement;
while (currentElement) {
// create section
const section = document.createElement('div');
section.classList.add('nav-section');
if (currentElement.tagName === 'h4') {
if (currentElement.tagName === 'H3') {
section.classList.add('with-heading');
}

Expand All @@ -34,12 +33,16 @@ export default async function decorate(block) {
nextElement = currentElement.nextSibling;
section.appendChild(currentElement);
currentElement = nextElement;
} while (nextElement && nextElement.tagName !== 'h4');
} while (nextElement && nextElement.tagName !== 'H3');

// add section to container
footerContainer.insertBefore(section, currentElement);
footerNav.append(section);
}
footerNavContainer.append(footerNav);
}

block.innerHTML = footerContent.innerHTML;
const footerHeading = document.createElement('H2');
footerHeading.innerText = 'Footer';
block.prepend(footerHeading);
}