Skip to content

Commit

Permalink
Merge pull request #106 from ConductionNL/development
Browse files Browse the repository at this point in the history
Development to main, week 11
  • Loading branch information
remko48 authored Mar 18, 2024
2 parents 5d39f12 + c660eed commit 9a0d123
Show file tree
Hide file tree
Showing 104 changed files with 2,270 additions and 37 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Conduction's design tokens theme

- **Version 1.1 (breaking changes from 1.0.x)**

- 1.1.25: Added Roosendaal theme.
- 1.1.24: Updated logo in Dimpact theme.
- 1.1.23:
- Added utrecht Calendar and Checkbox tokens to Leiden theme.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@
"logo": {
"max-height": {},
"max-width": { "value": "150px" }
}
},
"border-block-start": {},
"border-block-end": {},
"border-inline-start": {},
"border-inline-end": {}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@
},
"inset-block-start": {},
"inset-inline-start": {},
"box-shadow-width": {}
"box-shadow-width": {},
"border-width": {},
"border-style": {},
"border-color": {}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@
"logo": {
"max-height": {},
"max-width": { "value": "150px" }
}
},
"border-block-start": {},
"border-block-end": {},
"border-inline-start": {},
"border-inline-end": {}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@
},
"inset-block-start": {},
"inset-inline-start": {},
"box-shadow-width": {}
"box-shadow-width": {},
"border-width": {},
"border-style": {},
"border-color": {}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@
"logo": {
"max-height": {},
"max-width": { "value": "150px" }
}
},
"border-block-start": {},
"border-block-end": {},
"border-inline-start": {},
"border-inline-end": {}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@
},
"inset-block-start": {},
"inset-inline-start": {},
"box-shadow-width": {}
"box-shadow-width": {},
"border-width": {},
"border-style": {},
"border-color": {}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@
"logo": {
"max-height": {},
"max-width": { "value": "150px" }
}
},
"border-block-start": {},
"border-block-end": {},
"border-inline-start": {},
"border-inline-end": {}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@
},
"inset-block-start": { "value": "73px" },
"inset-inline-start": { "value": "33px" },
"box-shadow-width": {}
"box-shadow-width": {},
"border-width": {},
"border-style": {},
"border-color": {}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@
"logo": {
"max-height": {},
"max-width": { "value": "155px" }
}
},
"border-block-start": {},
"border-block-end": {},
"border-inline-start": {},
"border-inline-end": {}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@
},
"inset-block-start": { "value": "108px" },
"inset-inline-start": { "value": "19px" },
"box-shadow-width": {}
"box-shadow-width": {},
"border-width": {},
"border-style": {},
"border-color": {}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@
"logo": {
"max-height": {},
"max-width": { "value": "150px" }
}
},
"border-block-start": {},
"border-block-end": {},
"border-inline-start": {},
"border-inline-end": {}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@
},
"inset-block-start": { "value": "21px" },
"inset-inline-start": { "value": "18px" },
"box-shadow-width": { "value": "3.2px" }
"box-shadow-width": { "value": "3.2px" },
"border-width": {},
"border-style": {},
"border-color": {}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@
"logo": {
"max-height": {},
"max-width": { "value": "80px" }
}
},
"border-block-start": {},
"border-block-end": {},
"border-inline-start": {},
"border-inline-end": {}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@
},
"inset-block-start": { "value": "{leiden.size.lg}" },
"inset-inline-start": { "value": "{leiden.size.sm}" },
"box-shadow-width": {}
"box-shadow-width": {},
"border-width": {},
"border-style": {},
"border-color": {}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@
"logo": {
"max-height": {},
"max-width": { "value": "130px" }
}
},
"border-block-start": {},
"border-block-end": {},
"border-inline-start": {},
"border-inline-end": {}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@
},
"inset-block-start": {},
"inset-inline-start": {},
"box-shadow-width": {}
"box-shadow-width": {},
"border-width": {},
"border-style": {},
"border-color": {}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@
"logo": {
"max-height": {},
"max-width": { "value": "145px" }
}
},
"border-block-start": {},
"border-block-end": {},
"border-inline-start": {},
"border-inline-end": {}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@
},
"inset-block-start": { "value": "19px" },
"inset-inline-start": {"value": "16px"},
"box-shadow-width": {}
"box-shadow-width": {},
"border-width": {},
"border-style": {},
"border-color": {}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@
"90": {
"value": "#e5e5e5"
},

"93": {
"value": "#eeeeee"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@
"logo": {
"max-height": {},
"max-width": { "value": "150px" }
}
},
"border-block-start": {},
"border-block-end": {},
"border-inline-start": {},
"border-inline-end": {}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@
},
"inset-block-start": { "value": "69px" },
"inset-inline-start": { "value": "16px" },
"box-shadow-width": {}
"box-shadow-width": {},
"border-width": {},
"border-style": {},
"border-color": {}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@
"logo": {
"max-height": {},
"max-width": { "value": "222px" }
}
},
"border-block-start": {},
"border-block-end": {},
"border-inline-start": {},
"border-inline-end": {}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@
},
"inset-block-start": {},
"inset-inline-start": {},
"box-shadow-width": {}
"box-shadow-width": {},
"border-width": {},
"border-style": {},
"border-color": {}
}
}
}
17 changes: 17 additions & 0 deletions municipalities/roosendaal-design-tokens/LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Auteursrecht Gemeente Roosendaal

Copyright (c) 2023 Gemeente Roosendaal

## Logo en huisstijl

Op het huisstijl en logo zijn auteursrechten van toepassing. Het gebruik van logo en huisstijl is alleen toegestaan voor gebruik door Gemeente Roosendaal.

Wanneer je een bewerking van de software wilt gebruiken voor andere doeleinden, mag je niet het logo van Gemeente Roosendaal 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 Gemeente Roosendaal.
3 changes: 3 additions & 0 deletions municipalities/roosendaal-design-tokens/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# NL Design System design tokens Gemeente Roosendaal

These tokens have been obtained by analysing the [website of Gemeente Roosendaal](https://www.roosendaal.nl/).
Original file line number Diff line number Diff line change
@@ -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>
Original file line number Diff line number Diff line change
@@ -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,14 @@
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";

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

# Design Tokens

<DesignTokensTable tokens={tokens.filter((token) => token.path[0] !== config.prefix)}></DesignTokensTable>

## Proprietary Design Tokens

<DesignTokensTable tokens={tokens.filter((token) => token.path[0] === config.prefix)}></DesignTokensTable>
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { Meta, Description } from "@storybook/addon-docs";
import markdown from "../README.md";
import config from "../src/config.json";

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

<Description>{markdown}</Description>
Loading

0 comments on commit 9a0d123

Please sign in to comment.