Merge pull request #66 from ConductionNL/development

Development to main, week 46
ConductionNL · Nov 21, 2023 · a8ef38d · a8ef38d
2 parents 9661be1 + c01f46c
commit a8ef38d
Show file tree

Hide file tree

Showing 37 changed files with 1,107 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -6,6 +6,9 @@ Conduction's design tokens theme
 
 - **Version 1**
 
+  - 1.0.56:
+    - Added Checkbox tokens to all themes.
+    - Added DataBadge/Badge tokens to all themes.
   - 1.0.55: Added CommongGround theme.
   - 1.0.54:
     - Added ToolTip tokens to all themes.

diff --git a/conduction-design-tokens/src/brand/conduction/color.tokens.json b/conduction-design-tokens/src/brand/conduction/color.tokens.json
@@ -23,6 +23,12 @@
         "29": {
           "value": "#4a4a4a"
         },
+        "31": {
+          "value": "#4f4f4f"
+        },
+        "46": {
+          "value": "#767676"
+        },
         "48": {
           "value": "#7a7a7a"
         },

diff --git a/conduction-design-tokens/src/component/conduction/checkbox.tokens.json b/conduction-design-tokens/src/component/conduction/checkbox.tokens.json
@@ -0,0 +1,69 @@
+{
+  "conduction": {
+    "input-checkbox": {
+      "color": { "value": "{conduction.color.white.100}" },
+      "border-width": { "value": "{conduction.size.4xs}" },
+      "border-style": { "value": "solid" },
+      "border-color": { "value": "{conduction.color.grey.46}" },
+      "border-radius": { "value": "3px" },
+      "box-shadow": {},
+      "hover": {
+        "color": { "value": "{conduction.color.white.100}" },
+        "border-width": { "value": "{conduction.size.4xs}" },
+        "border-style": { "value": "solid" },
+        "border-color": { "value": "{conduction.color.grey.31}" },
+        "border-radius": { "value": "3px" },
+        "box-shadow": {}
+      },
+      "checked": {
+        "color": { "value": "{conduction.color.primary}" },
+        "border-width": { "value": "{conduction.size.4xs}" },
+        "border-style": { "value": "solid" },
+        "border-color": { "value": "{conduction.color.primary}" },
+        "border-radius": { "value": "3px" },
+        "box-shadow": {},
+        "checkmark-url": {},
+        "hover": {
+          "color": { "value": "{conduction.color.primary-hover}" },
+          "border-width": { "value": "{conduction.size.4xs}" },
+          "border-style": { "value": "solid" },
+          "border-color": { "value": "{conduction.color.primary-hover}" },
+          "border-radius": { "value": "3px" },
+          "box-shadow": {}
+        }
+      },
+      "disabled": {
+        "color": { "value": "{conduction.color.grey.82}" },
+        "border-width": { "value": "{conduction.size.4xs}" },
+        "border-style": { "value": "solid" },
+        "border-color": { "value": "{conduction.color.grey.82}" },
+        "border-radius": { "value": "3px" },
+        "box-shadow": {},
+        "hover": {
+          "color": { "value": "{conduction.color.grey.82}" },
+          "border-width": { "value": "{conduction.size.4xs}" },
+          "border-style": { "value": "solid" },
+          "border-color": { "value": "{conduction.color.grey.82}" },
+          "border-radius": { "value": "3px" },
+          "box-shadow": {}
+        }
+      },
+      "focus": {
+        "outline-width": { "value": "2px" },
+        "outline-style": { "value": "solid" },
+        "outline-color": { "value": "{conduction.color.black.0}" },
+        "outline-offset": { "value": "2px" }
+      },
+      "label": {
+        "color": { "value": "{utrecht.document.color}" },
+        "font-size": { "value": "{utrecht.document.font-size}" },
+        "font-weight": {},
+        "font-family": { "value": "{utrecht.document.font-family}" },
+        "container": {
+          "padding": { "value": "3px" },
+          "margin": { "value": "3px" }
+        }
+      }
+    }
+  }
+}
diff --git a/conduction-design-tokens/src/component/utrecht/badge.tokens.json b/conduction-design-tokens/src/component/utrecht/badge.tokens.json
@@ -0,0 +1,15 @@
+{
+  "utrecht": {
+    "badge": {
+      "background-color": { "value": "{conduction.color.black.0} " },
+      "border-radius": { "value": "0" },
+      "color": { "value": "{conduction.color.white.100} " },
+      "font-size": { "value": "{conduction.font-size.sm}" },
+      "font-weight": { "value": "{conduction.typography.font-weight.normal}" },
+      "line-height": {},
+      "padding-block": { "value": "{conduction.size.xs}" },
+      "padding-inline": { "value": "{conduction.size.xs}" },
+      "text-transform": {}
+    }
+  }
+}
diff --git a/municipalities/commonground-design-tokens/src/brand/commonground/color.tokens.json b/municipalities/commonground-design-tokens/src/brand/commonground/color.tokens.json
@@ -53,6 +53,12 @@
           "value": "#4a4a4a",
           "comment": "Base/Grey"
         },
+        "31": {
+          "value": "#4f4f4f"
+        },
+        "46": {
+          "value": "#767676"
+        },
         "58": {
           "value": "#949494"
         },

diff --git a/municipalities/commonground-design-tokens/src/component/conduction/checkbox.tokens.json b/municipalities/commonground-design-tokens/src/component/conduction/checkbox.tokens.json
@@ -0,0 +1,69 @@
+{
+  "conduction": {
+    "input-checkbox": {
+      "color": { "value": "{commonground.color.white.100}" },
+      "border-width": { "value": "{commonground.size.4xs}" },
+      "border-style": { "value": "solid" },
+      "border-color": { "value": "{commonground.color.grey.46}" },
+      "border-radius": { "value": "3px" },
+      "box-shadow": {},
+      "hover": {
+        "color": { "value": "{commonground.color.white.100}" },
+        "border-width": { "value": "{commonground.size.4xs}" },
+        "border-style": { "value": "solid" },
+        "border-color": { "value": "{commonground.color.grey.31}" },
+        "border-radius": { "value": "3px" },
+        "box-shadow": {}
+      },
+      "checked": {
+        "color": { "value": "{commonground.color.primary}" },
+        "border-width": { "value": "{commonground.size.4xs}" },
+        "border-style": { "value": "solid" },
+        "border-color": { "value": "{commonground.color.primary}" },
+        "border-radius": { "value": "3px" },
+        "box-shadow": {},
+        "checkmark-url": {},
+        "hover": {
+          "color": { "value": "{commonground.color.primary-hover}" },
+          "border-width": { "value": "{commonground.size.4xs}" },
+          "border-style": { "value": "solid" },
+          "border-color": { "value": "{commonground.color.primary-hover}" },
+          "border-radius": { "value": "3px" },
+          "box-shadow": {}
+        }
+      },
+      "disabled": {
+        "color": { "value": "{commonground.color.grey.82}" },
+        "border-width": { "value": "{commonground.size.4xs}" },
+        "border-style": { "value": "solid" },
+        "border-color": { "value": "{commonground.color.grey.82}" },
+        "border-radius": { "value": "3px" },
+        "box-shadow": {},
+        "hover": {
+          "color": { "value": "{commonground.color.grey.82}" },
+          "border-width": { "value": "{commonground.size.4xs}" },
+          "border-style": { "value": "solid" },
+          "border-color": { "value": "{commonground.color.grey.82}" },
+          "border-radius": { "value": "3px" },
+          "box-shadow": {}
+        }
+      },
+      "focus": {
+        "outline-width": { "value": "2px" },
+        "outline-style": { "value": "solid" },
+        "outline-color": { "value": "{commonground.color.black.0}" },
+        "outline-offset": { "value": "2px" }
+      },
+      "label": {
+        "color": { "value": "{utrecht.document.color}" },
+        "font-size": { "value": "{utrecht.document.font-size}" },
+        "font-weight": {},
+        "font-family": { "value": "{utrecht.document.font-family}" },
+        "container": {
+          "padding": { "value": "3px" },
+          "margin": { "value": "3px" }
+        }
+      }
+    }
+  }
+}
diff --git a/municipalities/commonground-design-tokens/src/component/utrecht/badge.tokens.json b/municipalities/commonground-design-tokens/src/component/utrecht/badge.tokens.json
@@ -0,0 +1,15 @@
+{
+  "utrecht": {
+    "badge": {
+      "background-color": { "value": "{commonground.color.black.0} " },
+      "border-radius": { "value": "0" },
+      "color": { "value": "{commonground.color.white.100} " },
+      "font-size": { "value": "{commonground.font-size.sm}" },
+      "font-weight": { "value": "{commonground.typography.font-weight.normal}" },
+      "line-height": {},
+      "padding-block": { "value": "{commonground.size.xs}" },
+      "padding-inline": { "value": "{commonground.size.xs}" },
+      "text-transform": {}
+    }
+  }
+}
diff --git a/municipalities/dimpact-design-tokens/src/brand/dimpact/color.tokens.json b/municipalities/dimpact-design-tokens/src/brand/dimpact/color.tokens.json
@@ -57,6 +57,15 @@
           "value": "#4a4a4a",
           "comment": "Base/Grey"
         },
+        "31": {
+          "value": "#4f4f4f"
+        },
+        "46": {
+          "value": "#767676"
+        },
+        "82": {
+          "value": "#d1d1d1"
+        },
         "84": {
           "value": "#d4d6d8"
         },

diff --git a/municipalities/dimpact-design-tokens/src/component/conduction/checkbox.tokens.json b/municipalities/dimpact-design-tokens/src/component/conduction/checkbox.tokens.json
@@ -0,0 +1,69 @@
+{
+  "conduction": {
+    "input-checkbox": {
+      "color": { "value": "{dimpact.color.white.100}" },
+      "border-width": { "value": "{dimpact.size.4xs}" },
+      "border-style": { "value": "solid" },
+      "border-color": { "value": "{dimpact.color.grey.46}" },
+      "border-radius": { "value": "3px" },
+      "box-shadow": {},
+      "hover": {
+        "color": { "value": "{dimpact.color.white.100}" },
+        "border-width": { "value": "{dimpact.size.4xs}" },
+        "border-style": { "value": "solid" },
+        "border-color": { "value": "{dimpact.color.grey.31}" },
+        "border-radius": { "value": "3px" },
+        "box-shadow": {}
+      },
+      "checked": {
+        "color": { "value": "{dimpact.color.primary}" },
+        "border-width": { "value": "{dimpact.size.4xs}" },
+        "border-style": { "value": "solid" },
+        "border-color": { "value": "{dimpact.color.primary}" },
+        "border-radius": { "value": "3px" },
+        "box-shadow": {},
+        "checkmark-url": {},
+        "hover": {
+          "color": { "value": "{dimpact.color.primary-hover}" },
+          "border-width": { "value": "{dimpact.size.4xs}" },
+          "border-style": { "value": "solid" },
+          "border-color": { "value": "{dimpact.color.primary-hover}" },
+          "border-radius": { "value": "3px" },
+          "box-shadow": {}
+        }
+      },
+      "disabled": {
+        "color": { "value": "{dimpact.color.grey.82}" },
+        "border-width": { "value": "{dimpact.size.4xs}" },
+        "border-style": { "value": "solid" },
+        "border-color": { "value": "{dimpact.color.grey.82}" },
+        "border-radius": { "value": "3px" },
+        "box-shadow": {},
+        "hover": {
+          "color": { "value": "{dimpact.color.grey.82}" },
+          "border-width": { "value": "{dimpact.size.4xs}" },
+          "border-style": { "value": "solid" },
+          "border-color": { "value": "{dimpact.color.grey.82}" },
+          "border-radius": { "value": "3px" },
+          "box-shadow": {}
+        }
+      },
+      "focus": {
+        "outline-width": { "value": "2px" },
+        "outline-style": { "value": "solid" },
+        "outline-color": { "value": "{dimpact.color.black.0}" },
+        "outline-offset": { "value": "2px" }
+      },
+      "label": {
+        "color": { "value": "{utrecht.document.color}" },
+        "font-size": { "value": "{utrecht.document.font-size}" },
+        "font-weight": {},
+        "font-family": { "value": "{utrecht.document.font-family}" },
+        "container": {
+          "padding": { "value": "3px" },
+          "margin": { "value": "3px" }
+        }
+      }
+    }
+  }
+}
diff --git a/municipalities/dimpact-design-tokens/src/component/utrecht/badge.tokens.json b/municipalities/dimpact-design-tokens/src/component/utrecht/badge.tokens.json
@@ -0,0 +1,15 @@
+{
+  "utrecht": {
+    "badge": {
+      "background-color": { "value": "#eeeff1" },
+      "border-radius": { "value": "20px" },
+      "color": { "value": "{dimpact.color.primary}" },
+      "font-size": { "value": "{dimpact.font-size.sm}" },
+      "font-weight": { "value": "{dimpact.typography.font-weight.normal}" },
+      "line-height": {},
+      "padding-block": { "value": "{dimpact.size.xs}" },
+      "padding-inline": { "value": "{dimpact.size.xs}" },
+      "text-transform": {}
+    }
+  }
+}
diff --git a/municipalities/dinkelland-design-tokens/src/brand/dinkelland/color.tokens.json b/municipalities/dinkelland-design-tokens/src/brand/dinkelland/color.tokens.json
@@ -74,6 +74,9 @@
         }
       },
       "grey": {
+        "31": {
+          "value": "#4f4f4f"
+        },
         "38": {
           "value": "#5c6066"
         },
@@ -90,6 +93,9 @@
         "72": {
           "value": "#AEB6C2"
         },
+        "82": {
+          "value": "#d1d1d1"
+        },
         "94": {
           "value": "#edeff2"
         }

diff --git a/municipalities/dinkelland-design-tokens/src/component/conduction/checkbox.tokens.json b/municipalities/dinkelland-design-tokens/src/component/conduction/checkbox.tokens.json
@@ -0,0 +1,69 @@
+{
+  "conduction": {
+    "input-checkbox": {
+      "color": { "value": "{dinkelland.color.white.100}" },
+      "border-width": { "value": "{dinkelland.size.4xs}" },
+      "border-style": { "value": "solid" },
+      "border-color": { "value": "{dinkelland.color.grey.46}" },
+      "border-radius": { "value": "3px" },
+      "box-shadow": {},
+      "hover": {
+        "color": { "value": "{dinkelland.color.white.100}" },
+        "border-width": { "value": "{dinkelland.size.4xs}" },
+        "border-style": { "value": "solid" },
+        "border-color": { "value": "{dinkelland.color.grey.31}" },
+        "border-radius": { "value": "3px" },
+        "box-shadow": {}
+      },
+      "checked": {
+        "color": { "value": "{dinkelland.color.primary}" },
+        "border-width": { "value": "{dinkelland.size.4xs}" },
+        "border-style": { "value": "solid" },
+        "border-color": { "value": "{dinkelland.color.primary}" },
+        "border-radius": { "value": "3px" },
+        "box-shadow": {},
+        "checkmark-url": {},
+        "hover": {
+          "color": { "value": "{dinkelland.color.primary-hover}" },
+          "border-width": { "value": "{dinkelland.size.4xs}" },
+          "border-style": { "value": "solid" },
+          "border-color": { "value": "{dinkelland.color.primary-hover}" },
+          "border-radius": { "value": "3px" },
+          "box-shadow": {}
+        }
+      },
+      "disabled": {
+        "color": { "value": "{dinkelland.color.grey.82}" },
+        "border-width": { "value": "{dinkelland.size.4xs}" },
+        "border-style": { "value": "solid" },
+        "border-color": { "value": "{dinkelland.color.grey.82}" },
+        "border-radius": { "value": "3px" },
+        "box-shadow": {},
+        "hover": {
+          "color": { "value": "{dinkelland.color.grey.82}" },
+          "border-width": { "value": "{dinkelland.size.4xs}" },
+          "border-style": { "value": "solid" },
+          "border-color": { "value": "{dinkelland.color.grey.82}" },
+          "border-radius": { "value": "3px" },
+          "box-shadow": {}
+        }
+      },
+      "focus": {
+        "outline-width": { "value": "2px" },
+        "outline-style": { "value": "solid" },
+        "outline-color": { "value": "{dinkelland.color.black.0}" },
+        "outline-offset": { "value": "2px" }
+      },
+      "label": {
+        "color": { "value": "{utrecht.document.color}" },
+        "font-size": { "value": "{utrecht.document.font-size}" },
+        "font-weight": {},
+        "font-family": { "value": "{utrecht.document.font-family}" },
+        "container": {
+          "padding": { "value": "3px" },
+          "margin": { "value": "3px" }
+        }
+      }
+    }
+  }
+}