Merge pull request #87 from ConductionNL/development

Development to main, week 52
ConductionNL · Jan 2, 2024 · eaf61ac · eaf61ac
2 parents 1e35da5 + 16bb5cb
commit eaf61ac
Show file tree

Hide file tree

Showing 288 changed files with 6,583 additions and 1,593 deletions.
diff --git a/README.md b/README.md
@@ -4,9 +4,19 @@ Conduction's design tokens theme
 
 ## Changelog
 
+- **Version 1.1 (breaking changes from 1.0.x)**
+
+  - 1.1.5: Added Gouda theme.
+  - 1.1.4:
+    - Added disabled Button tokens in all themes.
+    - Updated Navigation tokens in all themes.
+  - 1.1.2 / 1.1.3: Added Sloterburg theme.
+  - 1.1.1: Added Zutphen theme.
+  - 1.1.0: Removed old Conduction, Leiden and XXLLNC theme files.
+
 - **Version 1**
 
-  - 1.0.62: 
+  - 1.0.62:
     - Updated themes to NL-Design repo.
     - Added publiccode.
   - 1.0.61: Updated OpenCatalogi theme tokens.

diff --git a/conduction-design-tokens/src/component/conduction/card-wrapper.tokens.json b/conduction-design-tokens/src/component/conduction/card-wrapper.tokens.json
@@ -13,6 +13,10 @@
       "color": { "value": "{conduction.color.black.0}" },
       "hover": {
         "background-color": {},
+        "color": {},
+        "border-color": {},
+        "border-style": {},
+        "border-width": {},
         "border-bottom-color": {},
         "border-bottom-style": {},
         "border-bottom-width": {}

diff --git a/conduction-design-tokens/src/component/conduction/download-card.tokens.json b/conduction-design-tokens/src/component/conduction/download-card.tokens.json
@@ -13,7 +13,12 @@
       "border-style": { "value": "solid" },
       "border-color": { "value": "{conduction.color.grey.82}" },
       "border-radius": { "value": "{conduction.size.3xs}" },
-      "icon-gap": { "value": "{conduction.size.xs}" },
+      "icon": {
+        "gap": {
+          "value": "{conduction.size.xs}"
+        },
+        "color": {}
+      },
       "padding-inline-end": { "value": "{conduction.size.md}" },
       "padding-inline-start": { "value": "{conduction.size.md}" },
       "padding-block-end": { "value": "{conduction.size.md}" },

diff --git a/conduction-design-tokens/src/component/conduction/navigation.tokens.json b/conduction-design-tokens/src/component/conduction/navigation.tokens.json
@@ -7,15 +7,17 @@
         "hover": {
           "color": { "value": "{conduction.color.primary}" },
           "background-color": { "value": "{conduction.color.white.100}" },
-          "box-shadow": {}
+          "box-shadow": {},
+          "font-weight": {}
         },
         "current": {
           "color": { "value": "{conduction.color.primary}" },
           "background-color": { "value": "{conduction.color.white.100}" },
           "box-shadow": { "value": "" },
           "mobile": {
             "box-shadow": { "value": "" }
-          }
+          },
+          "font-weight": {}
         },
         "dropdown": {
           "color": { "value": "{conduction.color.grey.29}" },
@@ -26,7 +28,17 @@
           "hover": {
             "color": { "value": "{conduction.color.primary}" },
             "background-color": { "value": "{conduction.color.white.100}" },
-            "box-shadow": {}
+            "box-shadow": {},
+            "font-weight": {}
+          },
+          "current": {
+            "color": { "value": "{conduction.color.primary}" },
+            "background-color": { "value": "{conduction.color.white.100}" },
+            "box-shadow": { "value": "" },
+            "mobile": {
+              "box-shadow": { "value": "" }
+            },
+            "font-weight": {}
           }
         },
         "item": {

diff --git a/conduction-design-tokens/src/component/conduction/pagination.tokens.json b/conduction-design-tokens/src/component/conduction/pagination.tokens.json
@@ -22,14 +22,21 @@
         "border-width": {},
         "border-style": {},
         "border-color": {},
+        "border-bottom-width": {},
+        "border-bottom-style": {},
+        "border-bottom-color": {},
         "border-radius": { "value": "{conduction.size.2xs}" }
       },
       "navigation-button": {
         "color": { "value": "{conduction.color.white.100}" },
         "background-color": { "value": "{conduction.color.primary}" },
+        "border-width": {},
+        "border-style": {},
         "border-color": {},
+        "border-bottom-width": {},
+        "border-bottom-style": {},
+        "border-bottom-color": {},
         "border-radius": {},
-        "border-width": {},
         "padding-inline-start": { "value": "{conduction.size.xs}" },
         "padding-inline-end": { "value": "{conduction.size.xs}" },
         "padding-block-start": { "value": "0px" },
@@ -40,6 +47,9 @@
           "border-width": {},
           "border-style": {},
           "border-color": {},
+          "border-bottom-width": {},
+          "border-bottom-style": {},
+          "border-bottom-color": {},
           "border-radius": {}
         },
         "hover": {
@@ -48,6 +58,9 @@
           "border-width": {},
           "border-style": {},
           "border-color": {},
+          "border-bottom-width": {},
+          "border-bottom-style": {},
+          "border-bottom-color": {},
           "border-radius": {}
         }
       },
@@ -58,7 +71,10 @@
         "text-decoration": { "value": "unset" },
         "border-width": {},
         "border-style": {},
-        "border-color": {}
+        "border-color": {},
+        "border-bottom-width": {},
+        "border-bottom-style": {},
+        "border-bottom-color": {}
       },
       "page": {
         "hover": {
@@ -68,7 +84,10 @@
           "text-decoration-thickness": { "value": "0px" },
           "border-width": {},
           "border-style": {},
-          "border-color": {}
+          "border-color": {},
+          "border-bottom-width": {},
+          "border-bottom-style": {},
+          "border-bottom-color": {}
         }
       }
     }

diff --git a/conduction-design-tokens/src/component/utrecht/button.tokens.json b/conduction-design-tokens/src/component/utrecht/button.tokens.json
@@ -29,9 +29,9 @@
         "size": {}
       },
       "disabled": {
-        "background-color": {},
-        "border-color": {},
-        "color": {}
+        "background-color": { "value": "{conduction.color.grey.82}" },
+        "border-color": { "value": "{conduction.color.grey.82}" },
+        "color": { "value": "{conduction.color.grey.50}" }
       },
       "focus": {
         "background-color": {},
@@ -62,9 +62,9 @@
           "color": {}
         },
         "disabled": {
-          "background-color": {},
-          "border-color": {},
-          "color": {}
+          "background-color": { "value": "{conduction.color.grey.82}" },
+          "border-color": { "value": "{conduction.color.grey.82}" },
+          "color": { "value": "{conduction.color.grey.50}" }
         },
         "hover": {
           "background-color": { "value": "{conduction.color.primary}" },
@@ -95,9 +95,9 @@
           "color": {}
         },
         "disabled": {
-          "background-color": {},
-          "border-color": {},
-          "color": {}
+          "background-color": { "value": "{conduction.color.grey.82}" },
+          "border-color": { "value": "{conduction.color.grey.82}" },
+          "color": { "value": "{conduction.color.grey.50}" }
         },
         "hover": {
           "background-color": { "value": "{conduction.color.white.100}" },
@@ -127,9 +127,9 @@
           "color": {}
         },
         "disabled": {
-          "background-color": {},
-          "border-color": {},
-          "color": {}
+          "background-color": { "value": "{conduction.color.grey.82}" },
+          "border-color": { "value": "{conduction.color.grey.82}" },
+          "color": { "value": "{conduction.color.grey.50}" }
         },
         "hover": {
           "background-color": {},

diff --git a/conduction-design-tokens/src/component/utrecht/extra-tokens/page-footer.tokens.json b/conduction-design-tokens/src/component/utrecht/extra-tokens/page-footer.tokens.json
@@ -1,6 +1,8 @@
 {
   "utrecht": {
     "page-footer": {
+      "font-size": {},
+      "font-family": {},
       "min-height": {},
       "logo": {
         "max-height": { "value": "100px" },

diff --git a/conduction-design-tokens/src/component/utrecht/extra-tokens/table.tokens.json b/conduction-design-tokens/src/component/utrecht/extra-tokens/table.tokens.json
@@ -8,14 +8,26 @@
         "border-block-end-width": { "value": "{conduction.size.4xs}" },
         "font-family": {}
       },
+      "header-cell": {
+        "border-inline-end-width": {},
+        "border-inline-end-style": {},
+        "border-inline-end-color": {}
+      },
+      "cell": {
+        "border-inline-end-width": {},
+        "border-inline-end-style": {},
+        "border-inline-end-color": {}
+      },
       "row": {
         "hover": {
           "background-color": { "value": "{conduction.color.grey.97}" },
           "color": {}
         }
       },
       "body": {
-        "border": {}
+        "border": {},
+        "border-block-end-color": {},
+        "border-block-end-width": {}
       },
       "caption": {
         "font-style": {}

diff --git a/municipalities/commonground-design-tokens/src/component/conduction/card-wrapper.tokens.json b/municipalities/commonground-design-tokens/src/component/conduction/card-wrapper.tokens.json
@@ -13,6 +13,10 @@
       "color": { "value": "{commonground.color.black.0}" },
       "hover": {
         "background-color": {},
+        "color": {},
+        "border-color": {},
+        "border-style": {},
+        "border-width": {},
         "border-bottom-color": {},
         "border-bottom-style": {},
         "border-bottom-width": {}

diff --git a/municipalities/commonground-design-tokens/src/component/conduction/download-card.tokens.json b/municipalities/commonground-design-tokens/src/component/conduction/download-card.tokens.json
@@ -13,7 +13,12 @@
       "border-style": { "value": "solid" },
       "border-color": { "value": "{commonground.color.grey.82}" },
       "border-radius": { "value": "6px" },
-      "icon-gap": { "value": "{commonground.size.xs}" },
+      "icon": {
+        "gap": {
+          "value": "{commonground.size.xs}"
+        },
+        "color": {}
+      },
       "padding-inline-end": { "value": "{commonground.size.md}" },
       "padding-inline-start": { "value": "{commonground.size.md}" },
       "padding-block-end": { "value": "{commonground.size.md}" },

diff --git a/municipalities/commonground-design-tokens/src/component/conduction/navigation.tokens.json b/municipalities/commonground-design-tokens/src/component/conduction/navigation.tokens.json
@@ -7,15 +7,17 @@
         "hover": {
           "color": { "value": "{commonground.color.black.0}" },
           "background-color": { "value": "{commonground.color.yellow.64}" },
-          "box-shadow": {}
+          "box-shadow": {},
+          "font-weight": {}
         },
         "current": {
           "color": { "value": "{commonground.color.black.0}" },
           "background-color": { "value": "{commonground.color.primary}" },
           "box-shadow": { "value": "inset 0px 0px 0px 2px {commonground.color.black.0}" },
           "mobile": {
             "box-shadow": { "value": "" }
-          }
+          },
+          "font-weight": {}
         },
         "dropdown": {
           "color": { "value": "{commonground.color.black.0}" },
@@ -26,7 +28,17 @@
           "hover": {
             "color": { "value": "{commonground.color.black.0}" },
             "background-color": { "value": "{commonground.color.yellow.64}" },
-            "box-shadow": {}
+            "box-shadow": {},
+            "font-weight": {}
+          },
+          "current": {
+            "color": { "value": "{commonground.color.black.0}" },
+            "background-color": { "value": "{commonground.color.primary}" },
+            "box-shadow": { "value": "inset 0px 0px 0px 2px {commonground.color.black.0}" },
+            "mobile": {
+              "box-shadow": { "value": "" }
+            },
+            "font-weight": {}
           }
         },
         "item": {

diff --git a/municipalities/commonground-design-tokens/src/component/conduction/pagination.tokens.json b/municipalities/commonground-design-tokens/src/component/conduction/pagination.tokens.json
@@ -22,14 +22,21 @@
         "border-width": {},
         "border-style": {},
         "border-color": {},
+        "border-bottom-width": {},
+        "border-bottom-style": {},
+        "border-bottom-color": {},
         "border-radius": { "value": "{commonground.size.2xs}" }
       },
       "navigation-button": {
         "color": { "value": "{commonground.color.white.100}" },
         "background-color": { "value": "{commonground.color.primary}" },
+        "border-width": {},
+        "border-style": {},
         "border-color": {},
+        "border-bottom-width": {},
+        "border-bottom-style": {},
+        "border-bottom-color": {},
         "border-radius": {},
-        "border-width": {},
         "padding-inline-start": { "value": "{commonground.size.xs}" },
         "padding-inline-end": { "value": "{commonground.size.xs}" },
         "padding-block-start": { "value": "0px" },
@@ -40,6 +47,9 @@
           "border-width": {},
           "border-style": {},
           "border-color": {},
+          "border-bottom-width": {},
+          "border-bottom-style": {},
+          "border-bottom-color": {},
           "border-radius": {}
         },
         "hover": {
@@ -48,6 +58,9 @@
           "border-width": {},
           "border-style": {},
           "border-color": {},
+          "border-bottom-width": {},
+          "border-bottom-style": {},
+          "border-bottom-color": {},
           "border-radius": {}
         }
       },
@@ -58,7 +71,10 @@
         "text-decoration": { "value": "unset" },
         "border-width": {},
         "border-style": {},
-        "border-color": {}
+        "border-color": {},
+        "border-bottom-width": {},
+        "border-bottom-style": {},
+        "border-bottom-color": {}
       },
       "page": {
         "hover": {
@@ -68,7 +84,10 @@
           "text-decoration-thickness": { "value": "0px" },
           "border-width": {},
           "border-style": {},
-          "border-color": {}
+          "border-color": {},
+          "border-bottom-width": {},
+          "border-bottom-style": {},
+          "border-bottom-color": {}
         }
       }
     }