Merge pull request #78 from ConductionNL/development

Development to main, week 50
ConductionNL · Dec 18, 2023 · d6fc12a · d6fc12a
2 parents b5e1911 + 1fb8c0f
commit d6fc12a
Show file tree

Hide file tree

Showing 108 changed files with 2,470 additions and 30 deletions.
diff --git a/README.md b/README.md
@@ -6,6 +6,13 @@ Conduction's design tokens theme
 
 - **Version 1**
 
+  - 1.0.62: 
+    - Updated themes to NL-Design repo.
+    - Added publiccode.
+  - 1.0.61: Updated OpenCatalogi theme tokens.
+  - 1.0.60:
+    - Removed opacity token from tooltip tokens in all themes.
+    - Added OpenCatalogi theme based on Rotterdam theme.
   - 1.0.59: Updated radio-button tokens in Rotterdam theme.
   - 1.0.58: Added radio-button tokens in all themes.
   - 1.0.57: Added navbar to logo tokens in all themes.

diff --git a/conduction-design-tokens/src/component/conduction/tooltip.tokens.json b/conduction-design-tokens/src/component/conduction/tooltip.tokens.json
@@ -11,7 +11,6 @@
       "border-style": { "value": "unset" },
       "border-color": { "value": "unset" },
       "border-radius": { "value": "0px" },
-      "opacity": { "value": "1" },
       "z-index": { "value": "9999" }
     }
   }

diff --git a/municipalities/commonground-design-tokens/src/component/conduction/tooltip.tokens.json b/municipalities/commonground-design-tokens/src/component/conduction/tooltip.tokens.json
@@ -11,7 +11,6 @@
       "border-style": { "value": "unset" },
       "border-color": { "value": "unset" },
       "border-radius": { "value": "0px" },
-      "opacity": { "value": "1" },
       "z-index": { "value": "9999" }
     }
   }

diff --git a/municipalities/commonground-design-tokens/src/config.json b/municipalities/commonground-design-tokens/src/config.json
@@ -9,12 +9,15 @@
     "react-utrecht-alert--error",
     "react-utrecht-alert--ok",
     "react-utrecht-badge-counter--default",
+    "react-utrecht-breadcrumb-nav--default",
+    "react-utrecht-breadcrumb-nav--separator",
     "react-utrecht-button--default",
     "react-utrecht-button--hover",
     "react-utrecht-button--primary-action-button",
     "react-utrecht-button--secondary-action-button",
     "react-utrecht-code--default",
     "react-utrecht-code-block--default",
+    "react-utrecht-document--default",
     "react-utrecht-heading-1--default",
     "react-utrecht-heading-2--default",
     "react-utrecht-heading-3--default",
@@ -28,6 +31,13 @@
     "react-utrecht-page-header--default",
     "react-utrecht-page-footer--default",
     "react-utrecht-paragraph--default",
+    "react-utrecht-radio-button--default",
+    "react-utrecht-radio-button--hover",
+    "react-utrecht-radio-button--focus",
+    "react-utrecht-radio-button--checked",
+    "react-utrecht-radio-button--checked-and-disabled",
+    "react-utrecht-radio-button--disabled",
+    "react-utrecht-separator--default",
     "react-utrecht-surface--default",
     "react-utrecht-table--default",
     "react-utrecht-textbox--default",

diff --git a/municipalities/dimpact-design-tokens/src/component/conduction/tooltip.tokens.json b/municipalities/dimpact-design-tokens/src/component/conduction/tooltip.tokens.json
@@ -11,7 +11,6 @@
       "border-style": { "value": "unset" },
       "border-color": { "value": "unset" },
       "border-radius": { "value": "0px" },
-      "opacity": { "value": "1" },
       "z-index": { "value": "9999" }
     }
   }

diff --git a/municipalities/dinkelland-design-tokens/package.json b/municipalities/dinkelland-design-tokens/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.0-alpha.12",
   "author": "Community for NL Design System",
   "description": "NL Design System design tokens for Gemeente Dinkelland",
   "website": "https://www.dinkelland.nl/",

diff --git a/municipalities/dinkelland-design-tokens/src/component/conduction/tooltip.tokens.json b/municipalities/dinkelland-design-tokens/src/component/conduction/tooltip.tokens.json
@@ -11,7 +11,6 @@
       "border-style": { "value": "unset" },
       "border-color": { "value": "unset" },
       "border-radius": { "value": "0px" },
-      "opacity": { "value": "1" },
       "z-index": { "value": "9999" }
     }
   }

diff --git a/municipalities/dinkelland-design-tokens/src/config.json b/municipalities/dinkelland-design-tokens/src/config.json
@@ -9,12 +9,15 @@
     "react-utrecht-alert--error",
     "react-utrecht-alert--ok",
     "react-utrecht-badge-counter--default",
+    "react-utrecht-breadcrumb-nav--default",
+    "react-utrecht-breadcrumb-nav--separator",
     "react-utrecht-button--default",
     "react-utrecht-button--hover",
     "react-utrecht-button--primary-action-button",
     "react-utrecht-button--secondary-action-button",
     "react-utrecht-code--default",
     "react-utrecht-code-block--default",
+    "react-utrecht-document--default",
     "react-utrecht-heading-1--default",
     "react-utrecht-heading-2--default",
     "react-utrecht-heading-3--default",
@@ -28,6 +31,13 @@
     "react-utrecht-page-header--default",
     "react-utrecht-page-footer--default",
     "react-utrecht-paragraph--default",
+    "react-utrecht-radio-button--default",
+    "react-utrecht-radio-button--hover",
+    "react-utrecht-radio-button--focus",
+    "react-utrecht-radio-button--checked",
+    "react-utrecht-radio-button--checked-and-disabled",
+    "react-utrecht-radio-button--disabled",
+    "react-utrecht-separator--default",
     "react-utrecht-surface--default",
     "react-utrecht-table--default",
     "react-utrecht-textbox--default",
@@ -44,4 +54,5 @@
     "react-conduction-tabs--hover",
     "react-conduction-tabs--list",
     "react-conduction-tabs--panel"
-  ]}
+  ]
+}
diff --git a/municipalities/epe-design-tokens/package.json b/municipalities/epe-design-tokens/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.0-alpha.12",
   "author": "Community for NL Design System",
   "description": "NL Design System design tokens for Gemeente Epe",
   "website": "https://www.epe.nl/",

diff --git a/municipalities/epe-design-tokens/src/component/conduction/tooltip.tokens.json b/municipalities/epe-design-tokens/src/component/conduction/tooltip.tokens.json
@@ -11,7 +11,6 @@
       "border-style": { "value": "unset" },
       "border-color": { "value": "unset" },
       "border-radius": { "value": "0px" },
-      "opacity": { "value": "1" },
       "z-index": { "value": "9999" }
     }
   }

diff --git a/municipalities/epe-design-tokens/src/config.json b/municipalities/epe-design-tokens/src/config.json
@@ -9,12 +9,15 @@
     "react-utrecht-alert--error",
     "react-utrecht-alert--ok",
     "react-utrecht-badge-counter--default",
+    "react-utrecht-breadcrumb-nav--default",
+    "react-utrecht-breadcrumb-nav--separator",
     "react-utrecht-button--default",
     "react-utrecht-button--hover",
     "react-utrecht-button--primary-action-button",
     "react-utrecht-button--secondary-action-button",
     "react-utrecht-code--default",
     "react-utrecht-code-block--default",
+    "react-utrecht-document--default",
     "react-utrecht-heading-1--default",
     "react-utrecht-heading-2--default",
     "react-utrecht-heading-3--default",
@@ -28,6 +31,13 @@
     "react-utrecht-page-header--default",
     "react-utrecht-page-footer--default",
     "react-utrecht-paragraph--default",
+    "react-utrecht-radio-button--default",
+    "react-utrecht-radio-button--hover",
+    "react-utrecht-radio-button--focus",
+    "react-utrecht-radio-button--checked",
+    "react-utrecht-radio-button--checked-and-disabled",
+    "react-utrecht-radio-button--disabled",
+    "react-utrecht-separator--default",
     "react-utrecht-surface--default",
     "react-utrecht-table--default",
     "react-utrecht-textbox--default",
@@ -44,4 +54,5 @@
     "react-conduction-tabs--hover",
     "react-conduction-tabs--list",
     "react-conduction-tabs--panel"
-  ]}
+  ]
+}
diff --git a/municipalities/leiden-design-tokens/package.json b/municipalities/leiden-design-tokens/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.0-alpha.125",
   "author": "Community for NL Design System",
   "description": "NL Design System design tokens for Gemeente Leiden",
   "website": "https://gemeente.leiden.nl/",

diff --git a/municipalities/leiden-design-tokens/src/component/conduction/tooltip.tokens.json b/municipalities/leiden-design-tokens/src/component/conduction/tooltip.tokens.json
@@ -11,7 +11,6 @@
       "border-style": { "value": "unset" },
       "border-color": { "value": "unset" },
       "border-radius": { "value": "0px" },
-      "opacity": { "value": "1" },
       "z-index": { "value": "9999" }
     }
   }

diff --git a/municipalities/leiden-design-tokens/src/config.json b/municipalities/leiden-design-tokens/src/config.json
@@ -9,12 +9,15 @@
     "react-utrecht-alert--error",
     "react-utrecht-alert--ok",
     "react-utrecht-badge-counter--default",
+    "react-utrecht-breadcrumb-nav--default",
+    "react-utrecht-breadcrumb-nav--separator",
     "react-utrecht-button--default",
     "react-utrecht-button--hover",
     "react-utrecht-button--primary-action-button",
     "react-utrecht-button--secondary-action-button",
     "react-utrecht-code--default",
     "react-utrecht-code-block--default",
+    "react-utrecht-document--default",
     "react-utrecht-heading-1--default",
     "react-utrecht-heading-2--default",
     "react-utrecht-heading-3--default",
@@ -28,6 +31,13 @@
     "react-utrecht-page-header--default",
     "react-utrecht-page-footer--default",
     "react-utrecht-paragraph--default",
+    "react-utrecht-radio-button--default",
+    "react-utrecht-radio-button--hover",
+    "react-utrecht-radio-button--focus",
+    "react-utrecht-radio-button--checked",
+    "react-utrecht-radio-button--checked-and-disabled",
+    "react-utrecht-radio-button--disabled",
+    "react-utrecht-separator--default",
     "react-utrecht-surface--default",
     "react-utrecht-table--default",
     "react-utrecht-textbox--default",
@@ -44,4 +54,5 @@
     "react-conduction-tabs--hover",
     "react-conduction-tabs--list",
     "react-conduction-tabs--panel"
-  ]}
+  ]
+}
diff --git a/municipalities/noaberkracht-design-tokens/package.json b/municipalities/noaberkracht-design-tokens/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.0-alpha.12",
   "author": "Community for NL Design System",
   "description": "NL Design System design tokens for Noaberkracht",
   "website": "https://werkenbijnoaberkracht.nl/",

diff --git a/municipalities/noaberkracht-design-tokens/src/component/conduction/tooltip.tokens.json b/municipalities/noaberkracht-design-tokens/src/component/conduction/tooltip.tokens.json
@@ -11,7 +11,6 @@
       "border-style": { "value": "unset" },
       "border-color": { "value": "unset" },
       "border-radius": { "value": "0px" },
-      "opacity": { "value": "1" },
       "z-index": { "value": "9999" }
     }
   }

diff --git a/municipalities/noaberkracht-design-tokens/src/config.json b/municipalities/noaberkracht-design-tokens/src/config.json
@@ -9,12 +9,15 @@
     "react-utrecht-alert--error",
     "react-utrecht-alert--ok",
     "react-utrecht-badge-counter--default",
+    "react-utrecht-breadcrumb-nav--default",
+    "react-utrecht-breadcrumb-nav--separator",
     "react-utrecht-button--default",
     "react-utrecht-button--hover",
     "react-utrecht-button--primary-action-button",
     "react-utrecht-button--secondary-action-button",
     "react-utrecht-code--default",
     "react-utrecht-code-block--default",
+    "react-utrecht-document--default",
     "react-utrecht-heading-1--default",
     "react-utrecht-heading-2--default",
     "react-utrecht-heading-3--default",
@@ -28,6 +31,13 @@
     "react-utrecht-page-header--default",
     "react-utrecht-page-footer--default",
     "react-utrecht-paragraph--default",
+    "react-utrecht-radio-button--default",
+    "react-utrecht-radio-button--hover",
+    "react-utrecht-radio-button--focus",
+    "react-utrecht-radio-button--checked",
+    "react-utrecht-radio-button--checked-and-disabled",
+    "react-utrecht-radio-button--disabled",
+    "react-utrecht-separator--default",
     "react-utrecht-surface--default",
     "react-utrecht-table--default",
     "react-utrecht-textbox--default",
@@ -44,4 +54,5 @@
     "react-conduction-tabs--hover",
     "react-conduction-tabs--list",
     "react-conduction-tabs--panel"
-  ]}
+  ]
+}
diff --git a/municipalities/noordwijk-design-tokens/package.json b/municipalities/noordwijk-design-tokens/package.json
@@ -1,9 +1,12 @@
 {
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.0-alpha.13",
   "author": "Community for NL Design System",
   "description": "NL Design System design tokens for Gemeente Noordwijk",
   "website": "https://noordwijk.nl/",
-  "keywords": ["nl-design-system", "conduction"],
+  "keywords": [
+    "nl-design-system",
+    "conduction"
+  ],
   "license": "SEE LICENSE IN LICENSE.md",
   "name": "@nl-design-system-unstable/noordwijk-design-tokens",
   "private": false,

diff --git a/municipalities/noordwijk-design-tokens/src/component/conduction/tooltip.tokens.json b/municipalities/noordwijk-design-tokens/src/component/conduction/tooltip.tokens.json
@@ -11,7 +11,6 @@
       "border-style": { "value": "unset" },
       "border-color": { "value": "unset" },
       "border-radius": { "value": "0px" },
-      "opacity": { "value": "1" },
       "z-index": { "value": "9999" }
     }
   }

diff --git a/municipalities/noordwijk-design-tokens/src/config.json b/municipalities/noordwijk-design-tokens/src/config.json
@@ -9,12 +9,15 @@
     "react-utrecht-alert--error",
     "react-utrecht-alert--ok",
     "react-utrecht-badge-counter--default",
+    "react-utrecht-breadcrumb-nav--default",
+    "react-utrecht-breadcrumb-nav--separator",
     "react-utrecht-button--default",
     "react-utrecht-button--hover",
     "react-utrecht-button--primary-action-button",
     "react-utrecht-button--secondary-action-button",
     "react-utrecht-code--default",
     "react-utrecht-code-block--default",
+    "react-utrecht-document--default",
     "react-utrecht-heading-1--default",
     "react-utrecht-heading-2--default",
     "react-utrecht-heading-3--default",
@@ -28,6 +31,13 @@
     "react-utrecht-page-header--default",
     "react-utrecht-page-footer--default",
     "react-utrecht-paragraph--default",
+    "react-utrecht-radio-button--default",
+    "react-utrecht-radio-button--hover",
+    "react-utrecht-radio-button--focus",
+    "react-utrecht-radio-button--checked",
+    "react-utrecht-radio-button--checked-and-disabled",
+    "react-utrecht-radio-button--disabled",
+    "react-utrecht-separator--default",
     "react-utrecht-surface--default",
     "react-utrecht-table--default",
     "react-utrecht-textbox--default",
@@ -44,4 +54,5 @@
     "react-conduction-tabs--hover",
     "react-conduction-tabs--list",
     "react-conduction-tabs--panel"
-  ]}
+  ]
+}
diff --git a/municipalities/open-webconcept-design-tokens/src/component/conduction/tooltip.tokens.json b/municipalities/open-webconcept-design-tokens/src/component/conduction/tooltip.tokens.json
@@ -11,7 +11,6 @@
       "border-style": { "value": "unset" },
       "border-color": { "value": "unset" },
       "border-radius": { "value": "0px" },
-      "opacity": { "value": "1" },
       "z-index": { "value": "9999" }
     }
   }

diff --git a/municipalities/opencatalogi-design-tokens/LICENSE.md b/municipalities/opencatalogi-design-tokens/LICENSE.md
@@ -0,0 +1,17 @@
+# Auteursrecht OpenCatalogi
+
+Copyright (c) 2023 OpenCatalogi
+
+## Logo en huisstijl
+
+Op het huisstijl en logo zijn auteursrechten van toepassing. Het gebruik van logo en huisstijl is alleen toegestaan voor gebruik door OpenCatalogi.
+
+Wanneer je een bewerking van de software wilt gebruiken voor andere doeleinden, mag je niet het logo van OpenCatalogi gebruiken en je ontwerpt een eigen huisstijl.
+
+## Lettertype
+
+Lettertypes die worden gebruikt voor de huisstijl zijn niet allemaal gratis en open source. Let op dat bij gebruik van die bijgeleverde lettertypes je een (betaalde) licentie regelt. Pas anders de configuratie aan om minder of andere lettertypes te gebruiken.
+
+## Toestemming
+
+Wanneer je het logo of de huisstijl wilt gebruiken kun je voor toestemming contact opnemen met OpenCatalogi.
diff --git a/municipalities/opencatalogi-design-tokens/README.md b/municipalities/opencatalogi-design-tokens/README.md
@@ -0,0 +1,3 @@
+# NL Design System design tokens OpenCatalogi
+
+These tokens have been made for the [website of OpenCatalogi](https://opencatalogi.nl/) by using the tokens of [Gemeente Rotterdam](https://www.rotterdam.nl/).
diff --git a/municipalities/opencatalogi-design-tokens/documentation/color.stories.mdx b/municipalities/opencatalogi-design-tokens/documentation/color.stories.mdx
@@ -0,0 +1,17 @@
+import { Meta, ColorPalette, ColorItem } from "@storybook/addon-docs";
+import tokens from "../dist/tokens.json";
+import { ColorSearch } from "@nl-design-system-unstable/theme-toolkit/src/ColorSearch";
+import { ColorTable } from "@nl-design-system-unstable/theme-toolkit/src/ColorTable";
+import config from "../src/config.json";
+
+<Meta title={`${config.name}/Color`} />
+
+# Color
+
+## Find a color
+
+<ColorSearch tokens={tokens[config.prefix]["color"]}></ColorSearch>
+
+## Color palette
+
+<ColorTable tokens={tokens[config.prefix]["color"]}></ColorTable>
diff --git a/municipalities/opencatalogi-design-tokens/documentation/components.stories.mdx b/municipalities/opencatalogi-design-tokens/documentation/components.stories.mdx
@@ -0,0 +1,11 @@
+import { Meta, Story } from "@storybook/addon-docs";
+import { ComponentStories } from "@nl-design-system-unstable/theme-toolkit/src/ComponentStories";
+import config from "../src/config.json";
+
+<Meta title={`${config.name}`} />
+
+# Components
+
+<Story name="Components">
+  <ComponentStories config={config} />
+</Story>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# NL Design System design tokens OpenCatalogi

		These tokens have been made for the [website of OpenCatalogi](https://opencatalogi.nl/) by using the tokens of [Gemeente Rotterdam](https://www.rotterdam.nl/).