Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@remko48
remko48 authored Dec 15, 2023
2 parents 79d8dfe + b35c34f commit 370c6ba
Show file tree
Hide file tree
Showing 95 changed files with 70 additions and 1,498 deletions.
6 changes: 3 additions & 3 deletions packages/storybook/config/preview.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ import '@nl-design-system-unstable/noordoostpolder-design-tokens/src/font';
import '@nl-design-system-unstable/noordwijk-design-tokens/dist/index.css';
import '@nl-design-system-unstable/noordwijk-design-tokens/src/font';
import '@nl-design-system-unstable/provincie-zuid-holland-design-tokens/dist/index.css';
import '@nl-design-system-unstable/rotterdam-design-tokens/dist/index.css';
import '@nl-design-system-unstable/rotterdam-design-tokens/src/custom.scss';
import '@gemeente-rotterdam/design-tokens/dist/index.css';
// import '@gemeente-rotterdam/design-tokens/src/custom.scss';
// Uncomment the following line when proprietary fonts for Rotterdam are available:
// import '@nl-design-system-unstable/rotterdam-design-tokens/src/font.scss';
// import '@gemeente-rotterdam/design-tokens/js/font';
import '@nl-design-system-unstable/stedebroec-design-tokens/dist/index.css';
import '@nl-design-system-unstable/tilburg-design-tokens/dist/index.css';
import '@nl-design-system-unstable/tubbergen-design-tokens/dist/index.css';
Expand Down
4 changes: 2 additions & 2 deletions packages/storybook/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
"@nl-design-system-unstable/duo-design-tokens": "workspace:*",
"@nl-design-system-unstable/enkhuizen-design-tokens": "workspace:*",
"@nl-design-system-unstable/epe-design-tokens": "workspace:*",
"@nl-design-system-unstable/voorbeeld-design-tokens": "workspace:*",
"@nl-design-system-unstable/groningen-design-tokens": "workspace:*",
"@nl-design-system-unstable/haarlem-design-tokens": "workspace:*",
"@nl-design-system-unstable/haarlemmermeer-design-tokens": "workspace:*",
Expand All @@ -53,13 +52,13 @@
"@nl-design-system-unstable/noordoostpolder-design-tokens": "workspace:*",
"@nl-design-system-unstable/noordwijk-design-tokens": "workspace:*",
"@nl-design-system-unstable/provincie-zuid-holland-design-tokens": "workspace:*",
"@nl-design-system-unstable/rotterdam-design-tokens": "workspace:*",
"@nl-design-system-unstable/stedebroec-design-tokens": "workspace:*",
"@nl-design-system-unstable/theme-switcher": "workspace:*",
"@nl-design-system-unstable/theme-toolkit": "workspace:*",
"@nl-design-system-unstable/tilburg-design-tokens": "workspace:*",
"@nl-design-system-unstable/tubbergen-design-tokens": "workspace:*",
"@nl-design-system-unstable/venray-design-tokens": "workspace:*",
"@nl-design-system-unstable/voorbeeld-design-tokens": "workspace:*",
"@nl-design-system-unstable/vught-design-tokens": "workspace:*",
"@nl-design-system-unstable/westervoort-design-tokens": "workspace:*",
"@nl-design-system-unstable/xxllnc-design-tokens": "workspace:*",
Expand Down Expand Up @@ -94,6 +93,7 @@
"webpack": "5.82.1"
},
"devDependencies": {
"@gemeente-rotterdam/design-tokens": "1.0.0-alpha.10",
"@utrecht/components": "1.0.0-alpha.467",
"@utrecht/icon": "1.0.0-alpha.394"
}
Expand Down
5 changes: 5 additions & 0 deletions packages/storybook/src/rotterdam/README.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# NL Design System design tokens Gemeente Rotterdam

These tokens have been obtained by installing the npm package [`@gemeente-rotterdam/design-tokens`](https://www.npmjs.com/package/@gemeente-rotterdam/design-tokens).

Check out their [Storybook for Rotterdam Design System](https://nl-design-system.github.io/rotterdam/) as well as their [GitHub repository](https://github.com/nl-design-system/rotterdam).
4 changes: 2 additions & 2 deletions ...gn-tokens/documentation/color.stories.mdx → ...storybook/src/rotterdam/color.stories.mdx
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Meta, ColorPalette, ColorItem } from "@storybook/addon-docs";
import tokens from "../dist/tokens.json";
import tokens from "@gemeente-rotterdam/design-tokens/dist/index.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";
import config from "./config.json";

<Meta title={`${config.name}/Color`} />

Expand Down
2 changes: 1 addition & 1 deletion ...kens/documentation/components.stories.mdx → ...book/src/rotterdam/components.stories.mdx
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Meta, Story } from "@storybook/addon-docs";
import { ComponentStories } from "@nl-design-system-unstable/theme-toolkit/src/ComponentStories";
import config from "../src/config.json";
import config from "./config.json";

<Meta title={`${config.name}`} />

Expand Down
4 changes: 2 additions & 2 deletions ...y/rotterdam-design-tokens/src/config.json → packages/storybook/src/rotterdam/config.json
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"fullName": "Gemeente Rotterdam",
"name": "Rotterdam",
"prefix": "rotterdam",
"npm": "@nl-design-system-unstable/rotterdam-design-tokens",
"prefix": "rods",
"npm": "@gemeente-rotterdam/design-tokens",
"stories": [
"react-utrecht-button-link--default",
"react-utrecht-link-button--default",
Expand Down
4 changes: 2 additions & 2 deletions ...s/documentation/design-tokens.stories.mdx → ...k/src/rotterdam/design-tokens.stories.mdx
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Meta, ColorPalette, ColorItem } from "@storybook/addon-docs";
import { DesignTokensTable } from "@nl-design-system-unstable/theme-toolkit/src/DesignTokensTable";
import tokens from "../dist/index.json";
import config from "../src/config.json";
import tokens from "@gemeente-rotterdam/design-tokens/dist/index.tokens.json";
import config from "./config.json";

<Meta title={`${config.name}/Design Tokens`} />

Expand Down
4 changes: 2 additions & 2 deletions ...n-tokens/documentation/readme.stories.mdx → ...torybook/src/rotterdam/readme.stories.mdx
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Meta, Description } from "@storybook/addon-docs";
import markdown from "../README.md";
import config from "../src/config.json";
import markdown from "./README.md";
import config from "./config.json";

<Meta title={`${config.name}/README`} />

Expand Down
2 changes: 1 addition & 1 deletion packages/theme-logo/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.0-alpha.114",
"version": "1.0.0-alpha.116",
"author": "Community for NL Design System",
"description": "Theme Logo for NL Design System",
"keywords": [
Expand Down
4 changes: 2 additions & 2 deletions packages/theme-switcher/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.0-alpha.121",
"version": "1.0.0-alpha.123",
"author": "Community for NL Design System",
"description": "Theme Switcher for NL Design System",
"keywords": [
Expand All @@ -23,6 +23,7 @@
"build": "mkdir -p dist/ && node src/generate-json.mjs > dist/themes.json"
},
"devDependencies": {
"@gemeente-rotterdam/design-tokens": "1.0.0-alpha.10",
"@nl-design-system-unstable/amsterdam-design-tokens": "workspace:*",
"@nl-design-system-unstable/bodegraven-reeuwijk-design-tokens": "workspace:*",
"@nl-design-system-unstable/buren-design-tokens": "workspace:*",
Expand All @@ -37,7 +38,6 @@
"@nl-design-system-unstable/horstaandemaas-design-tokens": "workspace:*",
"@nl-design-system-unstable/leidschendam-voorburg-design-tokens": "workspace:*",
"@nl-design-system-unstable/noordoostpolder-design-tokens": "workspace:*",
"@nl-design-system-unstable/rotterdam-design-tokens": "workspace:*",
"@nl-design-system-unstable/stedebroec-design-tokens": "workspace:*",
"@nl-design-system-unstable/tilburg-design-tokens": "workspace:*",
"@nl-design-system-unstable/venray-design-tokens": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/theme-switcher/src/generate-json.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import hoorn from "@nl-design-system-unstable/hoorn-design-tokens/src/config.jso
import horstaandemaas from "@nl-design-system-unstable/horstaandemaas-design-tokens/src/config.json" assert { type: "json" };
import leidschendam from "@nl-design-system-unstable/leidschendam-voorburg-design-tokens/src/config.json" assert { type: "json" };
import noordoostpolder from "@nl-design-system-unstable/noordoostpolder-design-tokens/src/config.json" assert { type: "json" };
import rotterdam from "@nl-design-system-unstable/rotterdam-design-tokens/src/config.json" assert { type: "json" };
import rotterdam from "../../storybook/src/rotterdam/config.json" assert { type: "json" };
import stedebroec from "@nl-design-system-unstable/stedebroec-design-tokens/src/config.json" assert { type: "json" };
import tilburg from "@nl-design-system-unstable/tilburg-design-tokens/src/config.json" assert { type: "json" };
import venray from "@nl-design-system-unstable/venray-design-tokens/src/config.json" assert { type: "json" };
Expand Down
4 changes: 2 additions & 2 deletions packages/theme-switcher/src/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ const builtinThemes = [
{
className: 'rotterdam-theme',
title: 'Gemeente Rotterdam',
href: 'https://unpkg.com/@nl-design-system-unstable/rotterdam-design-tokens/dist/index.css',
package: '@nl-design-system-unstable/rotterdam-design-tokens',
href: 'https://unpkg.com/@gemeente-rotterdam/design-tokens/dist/index.css',
package: '@gemeente-rotterdam/design-tokens',
},
{
className: 'stedebroec-theme',
Expand Down
2 changes: 1 addition & 1 deletion packages/voorbeeld-design-tokens/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.0-alpha.104",
"version": "1.0.0-alpha.106",
"author": "Community for NL Design System",
"description": "NL Design System design tokens voor Voorbeeld thema",
"website": "https://www.nldesignsystem.nl/",
Expand Down
34 changes: 10 additions & 24 deletions pnpm-lock.yaml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion proprietary/amsterdam-design-tokens/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.0-alpha.134",
"version": "1.0.0-alpha.136",
"author": "Community for NL Design System",
"description": "Amsterdam Design System design tokens for NL Design System",
"website": "https://www.amsterdam.nl/",
Expand Down
2 changes: 1 addition & 1 deletion proprietary/bodegraven-reeuwijk-design-tokens/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.0-alpha.127",
"version": "1.0.0-alpha.129",
"author": "Community for NL Design System",
"description": "NL Design System design tokens for Gemeente Bodegraven Reeuwijk",
"website": "https://gemeente.bodegraven-reeuwijk.nl",
Expand Down
2 changes: 1 addition & 1 deletion proprietary/borne-design-tokens/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.0-alpha.127",
"version": "1.0.0-alpha.129",
"author": "Community for NL Design System",
"description": "NL Design System design tokens for Gemeente Borne",
"website": "https://www.borne.nl",
Expand Down
2 changes: 1 addition & 1 deletion proprietary/buren-design-tokens/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.0-alpha.110",
"version": "1.0.0-alpha.112",
"author": "Community for NL Design System",
"description": "NL Design System design tokens for Gemeente Buren",
"website": "https://www.buren.nl",
Expand Down
2 changes: 1 addition & 1 deletion proprietary/demodam-design-tokens/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.0-alpha.122",
"version": "1.0.0-alpha.124",
"author": "Community for NL Design System",
"description": "NL Design System design tokens for Demodam",
"website": "https://demodam.nl/",
Expand Down
2 changes: 1 addition & 1 deletion proprietary/dinkelland-design-tokens/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.0-alpha.14",
"version": "1.0.0-alpha.16",
"author": "Community for NL Design System",
"description": "NL Design System design tokens for Gemeente Dinkelland",
"website": "https://www.dinkelland.nl/",
Expand Down
2 changes: 1 addition & 1 deletion proprietary/drechterland-design-tokens/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.0-alpha.127",
"version": "1.0.0-alpha.129",
"author": "Community for NL Design System",
"description": "NL Design System design tokens for Gemeente Drechterland",
"website": "https://www.drechterland.nl",
Expand Down
2 changes: 1 addition & 1 deletion proprietary/duiven-design-tokens/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.0-alpha.127",
"version": "1.0.0-alpha.129",
"author": "Community for NL Design System",
"description": "NL Design System design tokens for Gemeente Duiven",
"website": "https://www.duiven.nl",
Expand Down
2 changes: 1 addition & 1 deletion proprietary/duo-design-tokens/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.0-alpha.127",
"version": "1.0.0-alpha.129",
"author": "Community for NL Design System",
"description": "NL Design System design tokens for DUO",
"website": "https://www.enkhuizen.nl",
Expand Down
2 changes: 1 addition & 1 deletion proprietary/enkhuizen-design-tokens/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.0-alpha.127",
"version": "1.0.0-alpha.129",
"author": "Community for NL Design System",
"description": "NL Design System design tokens for Gemeente Enkhuizen",
"website": "https://www.enkhuizen.nl",
Expand Down
2 changes: 1 addition & 1 deletion proprietary/epe-design-tokens/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.0-alpha.14",
"version": "1.0.0-alpha.16",
"author": "Community for NL Design System",
"description": "NL Design System design tokens for Gemeente Epe",
"website": "https://www.epe.nl/",
Expand Down
2 changes: 1 addition & 1 deletion proprietary/example-design-tokens/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.0-alpha.21",
"version": "1.0.0-alpha.23",
"author": "Community for NL Design System",
"description": "NL Design System design tokens for Gemeente Example",
"website": "https://www.example.nl/",
Expand Down
2 changes: 1 addition & 1 deletion proprietary/groningen-design-tokens/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.0-alpha.127",
"version": "1.0.0-alpha.129",
"author": "Community for NL Design System",
"description": "NL Design System design tokens for Gemeente Groningen",
"website": "https://gemeente.groningen.nl",
Expand Down
2 changes: 1 addition & 1 deletion proprietary/haarlem-design-tokens/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.0-alpha.134",
"version": "1.0.0-alpha.136",
"author": "Community for NL Design System",
"description": "Haarlem Design System design tokens for NL Design System",
"website": "https://www.haarlem.nl/",
Expand Down
2 changes: 1 addition & 1 deletion proprietary/haarlemmermeer-design-tokens/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.0-alpha.127",
"version": "1.0.0-alpha.129",
"author": "Community for NL Design System",
"description": "NL Design System design tokens for Gemeente Haarlemmermeer",
"website": "https://haarlemmermeergemeente.nl",
Expand Down
2 changes: 1 addition & 1 deletion proprietary/hoorn-design-tokens/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.0-alpha.123",
"version": "1.0.0-alpha.125",
"author": "Community for NL Design System",
"description": "NL Design System design tokens for Gemeente Hoorn",
"website": "https://www.hoorn.nl",
Expand Down
2 changes: 1 addition & 1 deletion proprietary/horstaandemaas-design-tokens/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.0-alpha.127",
"version": "1.0.0-alpha.129",
"author": "Community for NL Design System",
"description": "NL Design System design tokens for Gemeente Horst aan de Maas",
"website": "https://www.horstaandemaas.nl",
Expand Down
2 changes: 1 addition & 1 deletion proprietary/leiden-design-tokens/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.0-alpha.127",
"version": "1.0.0-alpha.129",
"author": "Community for NL Design System",
"description": "NL Design System design tokens for Gemeente Leiden",
"website": "https://gemeente.leiden.nl/",
Expand Down
2 changes: 1 addition & 1 deletion proprietary/leidschendam-voorburg-design-tokens/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.0-alpha.127",
"version": "1.0.0-alpha.129",
"author": "Community for NL Design System",
"description": "NL Design System design tokens for Gemeente Leidschendam Voorburg",
"website": "https://lv.nl/",
Expand Down
2 changes: 1 addition & 1 deletion proprietary/nijmegen-design-tokens/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.0-alpha.122",
"version": "1.0.0-alpha.124",
"author": "Community for NL Design System",
"description": "NL Design System design tokens for Gemeente Nijmegen",
"website": "https://www.nijmegen.nl",
Expand Down
2 changes: 1 addition & 1 deletion proprietary/noaberkracht-design-tokens/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.0-alpha.14",
"version": "1.0.0-alpha.16",
"author": "Community for NL Design System",
"description": "NL Design System design tokens for Noaberkracht",
"website": "https://werkenbijnoaberkracht.nl/",
Expand Down
2 changes: 1 addition & 1 deletion proprietary/noordoostpolder-design-tokens/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.0-alpha.127",
"version": "1.0.0-alpha.129",
"author": "Community for NL Design System",
"description": "NL Design System design tokens for Gemeente Noordoostpolder",
"website": "https://www.noordoostpolder.nl",
Expand Down
2 changes: 1 addition & 1 deletion proprietary/noordwijk-design-tokens/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.0-alpha.15",
"version": "1.0.0-alpha.17",
"author": "Community for NL Design System",
"description": "NL Design System design tokens for Gemeente Noordwijk",
"website": "https://noordwijk.nl/",
Expand Down
Loading

0 comments on commit 370c6ba

Please sign in to comment.