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

♻️ Refactor/OC-681/verbeteringen-footer-template #254

Closed
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
2 changes: 1 addition & 1 deletion pwa/src/assets/svgs/LogoConduction.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion pwa/src/styling/design-tokens/component-overrides.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
:root {
.web-app-theme {
--web-app-link-icon-gap: 0.3em;

--conduction-secondary-top-nav-item-padding: var(--web-app-secondary-top-nav-item-padding);
Expand Down
2 changes: 1 addition & 1 deletion pwa/src/styling/design-tokens/skeleton-design-tokens.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
:root {
.skeleton-theme {
/* Sizes */
--skeleton-size-4xs: 1px;
--skeleton-size-3xs: 2px;
Expand Down
3 changes: 2 additions & 1 deletion pwa/src/styling/themeProvider/ThemeProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import FormField, { FormFieldInput, FormFieldLabel } from "@gemeente-denhaag/for
import { Heading2 } from "@gemeente-denhaag/components-react";
import { SelectSingle } from "@conduction/components";
import { Document } from "@utrecht/component-library-react/dist/css-module";
import clsx from "clsx";

export const ThemeProvider = ({ children }: React.PropsWithChildren<{}>): JSX.Element => {
const [theme, setTheme] = React.useState<string>("rotterdam");
Expand All @@ -27,7 +28,7 @@ export const ThemeProvider = ({ children }: React.PropsWithChildren<{}>): JSX.El
const themeData = themes.find(({ value }) => value === theme);

return (
<Document className={themeData?.className}>
<Document className={clsx("skeleton-theme", "web-app-theme", themeData?.className)}>
{children}

<div className={styles.container}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
background-repeat: no-repeat;
padding: var(--web-app-footer-organization-logo-padding);
width: var(--web-app-footer-organization-logo-width);
background-image: var(--web-app-footer-organization-logo-src);
background-image: var(--web-app-footer-organization-logo-wit-src);
background-color: var(--web-app-footer-organization-logo-background-color);
background-origin: content-box;
}
Expand Down
8 changes: 5 additions & 3 deletions pwa/src/templates/templateParts/footer/FooterTemplate.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { Icon } from "@utrecht/component-library-react/dist/css-module";
import { useTranslation } from "react-i18next";
import { ArrowRightIcon, ExternalLinkIcon } from "@gemeente-denhaag/icons";
import clsx from "clsx";
import { GitHubLogo } from "../../../assets/svgs/GitHub";
import { baseFilters, FiltersContext } from "../../../context/filters";
import { HavenLogo } from "../../../assets/svgs/Haven";
import { CommongroundLogo } from "../../../assets/svgs/Commonground";
Expand Down Expand Up @@ -136,7 +135,7 @@ export const FooterTemplate: React.FC<FooterTemplateProps> = ({ layoutClassName
<li>
<Link target="_new" href="https://github.com/OpenCatalogi">
<Icon className="utrecht-icon--conduction-start">
<GitHubLogo />
<ArrowRightIcon />
</Icon>
Github
</Link>
Expand Down Expand Up @@ -207,7 +206,10 @@ export const FooterTemplate: React.FC<FooterTemplateProps> = ({ layoutClassName

<div className={styles.logosContainer}>
<div className={styles.organizationLogo}></div>
<img onClick={() => window.open("https://www.conduction.nl/")} src={LogoConduction} />

<Link target="_new" to="https://www.conduction.nl/">
<img src={LogoConduction} alt="logo van conduction" />
</Link>
</div>
</div>
</Container>
Expand Down
3 changes: 3 additions & 0 deletions pwa/static/images/LogoRotterdamWit.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading