From 95721ea2fc3ba1205d396bb5aa27eb648349a5a7 Mon Sep 17 00:00:00 2001 From: Remko Date: Wed, 20 Dec 2023 16:43:40 +0100 Subject: [PATCH] added Gouda theme --- pwa/package-lock.json | 16 +-- pwa/package.json | 4 +- pwa/src/styling/index.css | 1 + .../templateParts/footer/FooterTemplate.tsx | 4 +- pwa/src/templates/theme/ThemeTemplate.tsx | 131 ++++++++---------- 5 files changed, 73 insertions(+), 83 deletions(-) diff --git a/pwa/package-lock.json b/pwa/package-lock.json index b2b114a1..f117ede2 100644 --- a/pwa/package-lock.json +++ b/pwa/package-lock.json @@ -8,8 +8,8 @@ "name": "product-website-template", "version": "1.0.0", "dependencies": { - "@conduction/components": "2.2.43", - "@conduction/theme": "1.1.4", + "@conduction/components": "2.2.44", + "@conduction/theme": "1.1.5", "@fortawesome/fontawesome-svg-core": "^6.5.0", "@fortawesome/free-brands-svg-icons": "6.5.0", "@fortawesome/free-regular-svg-icons": "6.5.0", @@ -2070,9 +2070,9 @@ } }, "node_modules/@conduction/components": { - "version": "2.2.43", - "resolved": "https://registry.npmjs.org/@conduction/components/-/components-2.2.43.tgz", - "integrity": "sha512-pPmgeLFTEO4zMN5mnetpQnUrlLm9fxNxlalJklhzITtWJP/3SY4tVgfgQCFHo3+EFzqDqUufIcDf7AEI2Jev8A==", + "version": "2.2.44", + "resolved": "https://registry.npmjs.org/@conduction/components/-/components-2.2.44.tgz", + "integrity": "sha512-ompsiZ2r2qlgj8nLpgH9oUHO8ZWINT22doQkdzetqm45bmO4rZqE9sUjBU5i2UofebkBGmx6RwKJwfwtYvO//A==", "dependencies": { "@fortawesome/fontawesome-svg-core": "^6.4.2", "@fortawesome/free-solid-svg-icons": "^6.4.2", @@ -2090,9 +2090,9 @@ } }, "node_modules/@conduction/theme": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@conduction/theme/-/theme-1.1.4.tgz", - "integrity": "sha512-gzEgU3EKG6aduaBwmVuLlhU62SLswCTcjWq7Hd/gz7MbeW7Bap7Yex56QlAv36LNQemgW7blbbKX/XmM/hlJCg==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@conduction/theme/-/theme-1.1.5.tgz", + "integrity": "sha512-qHsk/EqfSsSaUpkg6MDv5WtbT5FeYyoG88ql2LurkMIG8dIV8J3Na3dg3BFeiGgt5NMziNbky3WLaWgNPKZKLw==", "dependencies": { "@nl-design-system-unstable/rotterdam-design-tokens": "^1.0.0-alpha.100" } diff --git a/pwa/package.json b/pwa/package.json index ea413def..fa731279 100644 --- a/pwa/package.json +++ b/pwa/package.json @@ -24,8 +24,8 @@ "prepare": "cd .. && husky install" }, "dependencies": { - "@conduction/components": "2.2.43", - "@conduction/theme": "1.1.4", + "@conduction/components": "2.2.44", + "@conduction/theme": "1.1.5", "@fortawesome/fontawesome-svg-core": "^6.5.0", "@fortawesome/free-brands-svg-icons": "6.5.0", "@fortawesome/free-regular-svg-icons": "6.5.0", diff --git a/pwa/src/styling/index.css b/pwa/src/styling/index.css index 29f9dc0f..13ecc561 100644 --- a/pwa/src/styling/index.css +++ b/pwa/src/styling/index.css @@ -17,6 +17,7 @@ @import "../../node_modules/@conduction/theme/municipalities/opencatalogi-design-tokens/dist/index.css"; @import "../../node_modules/@conduction/theme/municipalities/zutphen-design-tokens/dist/index.css"; @import "../../node_modules/@conduction/theme/municipalities/sloterburg-design-tokens/dist/index.css"; +@import "../../node_modules/@conduction/theme/municipalities/gouda-design-tokens/dist/index.css"; /* Design Tokens maintained by Frameless */ @import "../../node_modules/@utrecht/design-tokens/dist/theme.css"; diff --git a/pwa/src/templates/templateParts/footer/FooterTemplate.tsx b/pwa/src/templates/templateParts/footer/FooterTemplate.tsx index 40fea967..26a032bf 100644 --- a/pwa/src/templates/templateParts/footer/FooterTemplate.tsx +++ b/pwa/src/templates/templateParts/footer/FooterTemplate.tsx @@ -56,9 +56,7 @@ export const FooterTemplate: React.FC = () => {
- {getFooterContent.data?.map((content: any, idx: string) => ( - - ))} + {getFooterContent.data?.map((content: any, idx: string) => )}
diff --git a/pwa/src/templates/theme/ThemeTemplate.tsx b/pwa/src/templates/theme/ThemeTemplate.tsx index 8c15acea..84d555ad 100644 --- a/pwa/src/templates/theme/ThemeTemplate.tsx +++ b/pwa/src/templates/theme/ThemeTemplate.tsx @@ -345,7 +345,7 @@ export const ThemeTemplate: React.FC = () => {
-
+

Radio button:

{radioButtons.map((radioButton) => (
{
-

Table with overflow:

- - - - - {t("TableHeader")} - {t("TableHeader")} - {t("TableHeader")} - {t("TableHeader")} - {t("TableHeader")} - {t("TableHeader")} - {t("TableHeader")} - {t("TableHeader")} - {t("TableHeader")} - - - - - TableCell - TableCell - TableCell - TableCell - TableCell - TableCell - TableCell - TableCell - TableCell - - - TableCell - TableCell - TableCell - TableCell - TableCell - TableCell - TableCell - TableCell - TableCell - - - TableCell - TableCell - TableCell - TableCell - TableCell - TableCell - TableCell - TableCell - TableCell - - - TableCell - TableCell - TableCell - TableCell - TableCell - TableCell - TableCell - TableCell - TableCell - - -
- +

Table:

+ + + + {t("TableHeader")} + {t("TableHeader")} + {t("TableHeader")} + {t("TableHeader")} + {t("TableHeader")} + {t("TableHeader")} + {t("TableHeader")} + {t("TableHeader")} + + + + + TableCell + TableCell + TableCell + TableCell + TableCell + TableCell + TableCell + TableCell + + + TableCell + TableCell + TableCell + TableCell + TableCell + TableCell + TableCell + TableCell + + + TableCell + TableCell + TableCell + TableCell + TableCell + TableCell + TableCell + TableCell + + + TableCell + TableCell + TableCell + TableCell + TableCell + TableCell + TableCell + TableCell + + +
@@ -528,7 +519,7 @@ export const ThemeTemplate: React.FC = () => { tooltip: "https://google.com/download.png", }} type={"PNG"} - size="428" + size="428kB" handleClick={() => { console.log("click"); }} @@ -540,7 +531,7 @@ export const ThemeTemplate: React.FC = () => { tooltip: "https://github.com/CommonGateway/ZGWBundle/archive/refs/heads/main.zip", }} type={"ZIP"} - size="111" + size="111kB" handleClick={() => { console.log("click"); }} @@ -580,7 +571,7 @@ export const ThemeTemplate: React.FC = () => {
-
+

TopNavigation:

PrimaryTopNav: