Merge remote-tracking branch 'origin/development' into Theme-test-branch

ConductionNL · Dec 19, 2023 · 4889f76 · 4889f76
2 parents d32505e + 8fb557e
commit 4889f76
Show file tree

Hide file tree

Showing 7 changed files with 637 additions and 1,274 deletions.
diff --git a/.github/workflows/woo-page-deploy.yml b/.github/workflows/woo-page-deploy.yml
@@ -16,9 +16,10 @@ env: # Change these to your preferences any image url can also be a base encoded
   HEADER_LOGO_URL: "https://conduction.nl/wp-content/uploads/2021/07/cropped-conductionlogo-1.png"
   ORGANISATION_NAME: "Conduction"
   JUMBOTRON_IMAGE_URL: "https://www.conduction.nl/wp-content/uploads/2021/07/cropped-Conduction_HOME_0000_afb1-1.png"
-  FOOTER_LOGO_URL: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/Pgo8IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDIwMDEwOTA0Ly9FTiIKICAgICJodHRwOi8vd3d3LnczLm9yZy9UUi8yMDAxL1JFQy1TVkctMjAwMTA5MDQvRFREL3N2ZzEwLmR0ZCI+CjxzdmcgdmVyc2lvbj0iMS4wIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgICAgd2lkdGg9IjcxLjAwMDAwMHB0IiBoZWlnaHQ9IjcwLjAwMDAwMHB0IiB2aWV3Qm94PSIwIDAgNzEuMDAwMDAwIDcwLjAwMDAwMCIKICAgICBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCBtZWV0Ij4KCiAgICA8ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSgwLjAwMDAwMCw3MC4wMDAwMDApIHNjYWxlKDAuMTAwMDAwLC0wLjEwMDAwMCkiCiAgICAgICBmaWxsPSIjNDM3NkZDIiBzdHJva2U9Im5vbmUiPgogICAgICAgIDxwYXRoIGQ9Ik0yMTggNTkyIGwtMTM3IC03NyAwIC0xNjUgMCAtMTY1IDEzMSAtNzQgYzcyIC00MSAxMzcgLTc0IDE0MyAtNzQgNgowIDcwIDMzIDE0MyA3NCBsMTMxIDc0IDEgMTY1IDAgMTY1IC02OCAzNyBjLTM3IDIxIC05OSA1NiAtMTM3IDc3IGwtNzEgNDAKLTEzNiAtNzd6IG0yOTUgLTg1IGw1NyAtMzIgMCAtMTI1IDAgLTEyNSAtMTA2IC02MCBjLTU4IC0zMyAtMTA4IC02MCAtMTExCi01OSAtMyAwIC01MiAyNyAtMTA5IDYwIGwtMTAzIDU5IDAgMTI1IDAgMTI1IDEwNyA2MSAxMDcgNjIgNTAgLTI5IGMyNyAtMTYKNzYgLTQ0IDEwOCAtNjJ6Ii8+CiAgICAgICAgPHBhdGggZD0iTTI3OCA0NzIgbC02OCAtMzcgMCAtODUgMCAtODUgNzMgLTM5IDczIC0zOSA2MiAzNCBjMzQgMTggNjIgMzcgNjIKNDEgMCA0IC0xNCAxNSAtMzEgMjMgLTI4IDE1IC0zMyAxNSAtNTQgMSAtMzEgLTIwIC00NiAtMjAgLTg0IDIgLTI3IDE1IC0zMQoyMiAtMzEgNjIgMCA0MCA0IDQ3IDMxIDYzIDM4IDIxIDUzIDIxIDg0IDEgMjEgLTE0IDI2IC0xNCA1NCAxIDE3IDggMzEgMTkgMzEKMjMgMCA4IC0xMTMgNzIgLTEyNiA3MiAtNSAwIC0zOSAtMTcgLTc2IC0zOHoiLz4KICAgIDwvZz4KPC9zdmc+Cg=="
+  FOOTER_LOGO_URL: "true"
   FOOTER_LOGO_HREF: "https://conduction.nl/",
-  FOOTER_CONTENT: "https://raw.githubusercontent.com/ConductionNL/woo-website-template/main/pwa/src/templates/templateParts/footer/FooterContent.json"
+  FOOTER_CONTENT: "https://raw.githubusercontent.com/ConductionNL/${{github.event.repository.name}}/main/FooterContent.json"
+  FOOTER_CONTENT_HEADER: "heading-2"
   # OIDN_NUMBER: " "
   ENV_VARS_SET: "true"
 
@@ -56,6 +57,7 @@ jobs:
           envkey_GATSBY_FOOTER_LOGO_URL: ${{ env.FOOTER_LOGO_URL }}
           envkey_GATSBY_FOOTER_LOGO_HREF: ${{ env.FOOTER_LOGO_HREF }}
           envkey_GATSBY_FOOTER_CONTENT: ${{ env.FOOTER_CONTENT }}
+          envkey_GATSBY_FOOTER_CONTENT_HEADER: ${{ env.FOOTER_CONTENT_HEADER }}
           # envkey_GATSBY_OIDN_NUMBER: ${{ env.OIDN_NUMBER }}
           envkey_GATSBY_ENV_VARS_SET: ${{ env.ENV_VARS_SET }}
           directory: pwa/static

diff --git a/pwa/package-lock.json b/pwa/package-lock.json
diff --git a/pwa/package.json b/pwa/package.json
@@ -24,8 +24,8 @@
     "prepare": "cd .. && husky install"
   },
   "dependencies": {
-    "@conduction/components": "2.2.41",
-    "@conduction/theme": "1.1.2",
+    "@conduction/components": "2.2.42",
+    "@conduction/theme": "1.1.3",
     "@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/templates/jumbotronTemplate/JumbotronTemplate.module.css b/pwa/src/templates/jumbotronTemplate/JumbotronTemplate.module.css
@@ -11,17 +11,25 @@
   padding-inline-end: 48px;
   padding-block-start: 40px;
   padding-block-end: 40px;
-  border-bottom: var(--conduction-card-wrapper-border-width)
-    var(--conduction-card-wrapper-border-style)
-    var(--conduction-card-wrapper-border-color);
+
+  border-width: var(--conduction-card-wrapper-border-width);
+  border-style: var(--conduction-card-wrapper-border-style);
+  border-color: var(--conduction-card-wrapper-border-color);
+  border-bottom-width: var(--conduction-card-wrapper-border-width);
+  border-bottom-style: var(--conduction-card-wrapper-border-style);
+  border-bottom-color: var(--conduction-card-wrapper-border-color);
 }
 
 .card:hover {
   background-color: var(--conduction-card-wrapper-background-color);
   cursor: default;
-  border-bottom: var(--conduction-card-wrapper-border-width)
-    var(--conduction-card-wrapper-border-style)
-    var(--conduction-card-wrapper-border-color);
+
+  border-width: var(--conduction-card-wrapper-border-width);
+  border-style: var(--conduction-card-wrapper-border-style);
+  border-color: var(--conduction-card-wrapper-border-color);
+  border-bottom-width: var(--conduction-card-wrapper-border-width);
+  border-bottom-style: var(--conduction-card-wrapper-border-style);
+  border-bottom-color: var(--conduction-card-wrapper-border-color);
 }
 
 .description {

diff --git a/pwa/src/templates/templateParts/cardsResultsTemplate/CardsResultsTemplate.module.css b/pwa/src/templates/templateParts/cardsResultsTemplate/CardsResultsTemplate.module.css
@@ -27,6 +27,13 @@
   text-overflow: ellipsis;
 }
 
+.cardContainer:hover .description {
+  color: var(
+    --conduction-card-wrapper-hover-color,
+    var(--conduction-card-wrapper-color)
+  ) !important;
+}
+
 .cardFooter {
   margin-top: auto;
 }

diff --git a/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.module.css b/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.module.css
@@ -12,6 +12,18 @@
   font-family: var(--utrecht-table-header-font-family);
 }
 
+.tableHeader > tr > th {
+  border-inline-end-width: var(
+    --utrecht-table-header-cell-border-inline-end-width
+  );
+  border-inline-end-style: var(
+    --utrecht-table-header-cell-border-inline-end-style
+  );
+  border-inline-end-color: var(
+    --utrecht-table-header-cell-border-inline-end-color
+  );
+}
+
 .tableRow > * {
   vertical-align: middle !important;
 }
@@ -27,6 +39,12 @@
     var(--utrecht-table-body-border-block-end-color);
 }
 
+.tableBody > tr > td {
+  border-inline-end-width: var(--utrecht-table-cell-border-inline-end-width);
+  border-inline-end-style: var(--utrecht-table-cell-border-inline-end-style);
+  border-inline-end-color: var(--utrecht-table-cell-border-inline-end-color);
+}
+
 .tableBody .tableRow:nth-child(odd) {
   background-color: var(--utrecht-table-row-alternate-odd-background-color);
   color: var(--utrecht-table-row-alternate-odd-color);

diff --git a/pwa/src/templates/wooItemDetailTemplate/WOOItemDetailTemplate.module.css b/pwa/src/templates/wooItemDetailTemplate/WOOItemDetailTemplate.module.css
@@ -45,6 +45,12 @@
   border: var(--utrecht-table-body-border);
 }
 
+.tableBody > tr > td {
+  border-inline-end-width: var(--utrecht-table-cell-border-inline-end-width);
+  border-inline-end-style: var(--utrecht-table-cell-border-inline-end-style);
+  border-inline-end-color: var(--utrecht-table-cell-border-inline-end-color);
+}
+
 .tableBody .tableRow:nth-child(odd) {
   background-color: var(--utrecht-table-row-alternate-odd-background-color);
   color: var(--utrecht-table-row-alternate-odd-color);