Skip to content

Commit

Permalink
Merge pull request #147 from ConductionNL/feature/XW-101/Footer-refactor
Browse files Browse the repository at this point in the history
feature/XW-101/Footer-refactor
  • Loading branch information
remko48 authored Nov 1, 2023
2 parents ab46030 + 829f1e5 commit 143a5fc
Show file tree
Hide file tree
Showing 7 changed files with 122 additions and 53 deletions.
62 changes: 22 additions & 40 deletions pwa/package-lock.json

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

6 changes: 4 additions & 2 deletions pwa/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
"private": true,
"description": "Product Website Template",
"author": "Conduction",
"keywords": ["gatsby"],
"keywords": [
"gatsby"
],
"scripts": {
"develop": "gatsby develop",
"start": "gatsby develop",
Expand All @@ -23,7 +25,7 @@
},
"dependencies": {
"@conduction/components": "2.2.18",
"@conduction/theme": "1.0.51",
"@conduction/theme": "1.0.52",
"@fortawesome/fontawesome-svg-core": "^6.1.1",
"@fortawesome/free-brands-svg-icons": "6.4.2",
"@fortawesome/free-regular-svg-icons": "6.4.2",
Expand Down
4 changes: 3 additions & 1 deletion pwa/src/layout/Head.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ export const Head: React.FC = () => {
class: process.env.GATSBY_NL_DESIGN_THEME_CLASSNAME,
}}
>
<title>{`Woo | ${getPageTitle(translatedCrumbs, gatsbyContext.location) ?? "Error"}`}</title>
<title>{`Woo | ${process.env.GATSBY_ORGANISATION_NAME} | ${
getPageTitle(translatedCrumbs, gatsbyContext.location) ?? "Error"
}`}</title>
<link rel="icon" type="svg" href={process.env.GATSBY_FAVICON_URL} />
</Helmet>
);
Expand Down
39 changes: 37 additions & 2 deletions pwa/src/templates/templateParts/footer/FooterTemplate.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,49 @@

.link:hover {
cursor: pointer;
color: var(--utrecht-page-footer-link-hover-color, inherit) !important;
text-decoration-line: var(
--utrecht-page-footer-link-hover-text-decoration,
inherit
) !important;
text-decoration-thickness: var(
--utrecht-page-footer-link-hover-text-decoration-thickness,
inherit
) !important;
}

.link {
color: var(--utrecht-page-footer-link-color, inherit) !important;
text-decoration-line: var(
--utrecht-page-footer-link-text-decoration,
inherit
) !important;
text-decoration-color: var(
--utrecht-page-footer-link-text-decoration-color,
inherit
) !important;
text-decoration-thickness: var(
--utrecht-page-footer-link-text-decoration-thickness,
inherit
) !important;
text-underline-offset: var(
--utrecht-page-footer-link-text-underline-offset,
inherit
) !important;
}

.withLoveConductionLink {
display: inline-block;
}

.withLoveConductionLink:hover {
margin-inline-start: 10px;
}

.withLoveLink:hover > :first-child {
transform: scale(1.2);
}

.withLoveLink > :first-child {
transition: all 1s;
transform-origin: 50% 50%;
Expand All @@ -60,8 +91,8 @@
}

.dynamicSectionTitle {
margin-block-end: 18px;
color: inherit !important;
margin-block-end: 18px !important;
color: var(--utrecht-page-footer-heading-color, inherit) !important;
}

.dynamicSectionContent {
Expand All @@ -79,9 +110,12 @@

.iconLeft {
margin-inline-end: var(--utrecht-icon-gap);
color: var(--utrecht-page-footer-icon-color, inherit);
}

.iconRight {
margin-inline-start: var(--utrecht-icon-gap);
color: var(--utrecht-page-footer-icon-color, inherit);
}

@media only screen and (max-width: 992px) {
Expand All @@ -99,6 +133,7 @@
var(--utrecht-page-footer-background-position)
);
}

.contentGrid {
grid-template-columns: repeat(1, minmax(0, 1fr));
}
Expand Down
Loading

0 comments on commit 143a5fc

Please sign in to comment.