Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into feature/add-root-comp…
Browse files Browse the repository at this point in the history
…onent
  • Loading branch information
Ruben Smit committed Jan 9, 2025
2 parents 7800ae1 + e46206f commit 4383dab
Show file tree
Hide file tree
Showing 17 changed files with 99 additions and 33 deletions.
2 changes: 1 addition & 1 deletion apps/rvs.rivm.nl/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"@types/react": "19.0.1",
"@types/react-dom": "19.0.1",
"@utrecht/component-library-css": "7.0.0",
"@utrecht/component-library-react": "7.3.7",
"@utrecht/component-library-react": "8.0.4",
"eslint": "9.15.0",
"eslint-config-next": "15.0.4",
"typescript": "5.7.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/components-css/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rijkshuisstijl-community/components-css",
"version": "1.0.0-alpha.112",
"version": "1.0.0-alpha.113",
"type": "module",
"author": "Community for NL Design System",
"description": "CSS Components for a design system based on the NL Design System architecture",
Expand Down
2 changes: 1 addition & 1 deletion packages/components-react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rijkshuisstijl-community/components-react",
"version": "1.0.0-alpha.88",
"version": "1.0.0-alpha.89",
"author": "Community for NL Design System",
"description": "React component library for the Rijkshuisstijl Community repository, based on the NL Design System architecture",
"license": "EUPL-1.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/font/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rijkshuisstijl-community/font",
"version": "1.0.0-alpha.112",
"version": "1.0.0-alpha.113",
"author": "Community for NL Design System",
"description": "Font assets",
"license": "EUPL-1.2",
Expand Down
6 changes: 3 additions & 3 deletions packages/storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,13 @@
"@types/react": "19.0.1",
"@types/react-dom": "19.0.1",
"@types/twig": "1.12.16",
"@utrecht/component-library-react": "7.3.8",
"@utrecht/component-library-react": "8.0.4",
"@utrecht/components": "7.4.0",
"@utrecht/page-body-react": "1.0.3",
"@utrecht/page-layout-react": "1.0.3",
"@utrecht/root-react": "1.0.3",
"@utrecht/web-component-library-react": "3.0.0",
"@utrecht/web-component-library-stencil": "2.2.0",
"@utrecht/web-component-library-react": "3.0.2",
"@utrecht/web-component-library-stencil": "3.0.1",
"@whitespace/storybook-addon-html": "6.1.1",
"axe-playwright": "2.0.3",
"chromatic": "11.19.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/storybook/src/templates/collage/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export default function Collage() {
src="https://raw.githubusercontent.com/nl-design-system/rijkshuisstijl-community/0bfd32af3f34ff7ce62f4769fbec8895720dde75/proprietary/assets/src/placeholder.jpg"
width="640"
></Image>
<Paragraph lead>
<Paragraph appearance="lead">
In het NL Design System verzamelen we principes, handvatten, elementen, patronen en richtlijnen.
</Paragraph>
<Paragraph>
Expand Down Expand Up @@ -101,7 +101,7 @@ export default function Collage() {
</UnorderedListItem>
<UnorderedListItem>Maak gebruik van opsommingstekens waar dat mogelijk is.</UnorderedListItem>
</UnorderedList>
<Paragraph lead>
<Paragraph appearance="lead">
In het NL Design System verzamelen we principes, handvatten, elementen, patronen en richtlijnen.
</Paragraph>
<Blockquote attribution="— Pippi Langkous">
Expand Down
2 changes: 1 addition & 1 deletion packages/storybook/src/templates/details/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export default function Details() {
<div className="utrecht-page-content rhc-templates-page-content rhc-templates-page-palin">
<Article>
<div className="rhc-margin-block-end-wrapper">
<Paragraph lead>
<Paragraph appearance="lead">
De Arbeidstijdenwet geeft regels voor werktijden, pauzes en rusttijden van werknemers. Met deze
regels wil de Rijksoverheid werknemers beschermen tegen te lange werkdagen. Maar ook de combinatie
van werk, privé en zorgtaken gemakkelijker maken.
Expand Down
2 changes: 1 addition & 1 deletion packages/storybook/src/templates/rich-text/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export default function Page() {
<div className="rhc-margin-block-end-wrapper">
<div className="rhc-templates-spacing-2">
<Heading level={1}>Titel van de pagina</Heading>
<Paragraph lead>Hier zou een korte introductie van de pagina kunnen staan.</Paragraph>
<Paragraph appearance="lead">Hier zou een korte introductie van de pagina kunnen staan.</Paragraph>
<Figure>
<Image
alt="Multicolored tulip field"
Expand Down
2 changes: 1 addition & 1 deletion packages/web-components-react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rijkshuisstijl-community/web-components-react",
"version": "1.0.0-alpha.94",
"version": "1.0.0-alpha.95",
"author": "Community for NL Design System",
"description": "React web components bundle based on the NL Design System architecture",
"license": "EUPL-1.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/web-components-stencil/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rijkshuisstijl-community/web-components-stencil",
"version": "1.0.0-alpha.94",
"version": "1.0.0-alpha.95",
"author": "Community for NL Design System",
"description": "Stencil web components bundle based on the NL Design System architecture",
"license": "EUPL-1.2",
Expand Down
94 changes: 80 additions & 14 deletions pnpm-lock.yaml

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

2 changes: 1 addition & 1 deletion proprietary/assets/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rijkshuisstijl-community/assets",
"version": "1.0.0-alpha.112",
"version": "1.0.0-alpha.113",
"author": "Community for NL Design System",
"description": "Assets",
"license": "SEE LICENSE IN LICENSE.md",
Expand Down
2 changes: 1 addition & 1 deletion proprietary/design-tokens/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rijkshuisstijl-community/design-tokens",
"version": "1.0.0-alpha.113",
"version": "1.0.0-alpha.114",
"author": "Community for NL Design System",
"description": "Example design tokens",
"license": "SEE LICENSE IN LICENSE.md",
Expand Down
2 changes: 1 addition & 1 deletion proprietary/digid-design-tokens/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rijkshuisstijl-community/digid-design-tokens",
"version": "1.0.0-alpha.104",
"version": "1.0.0-alpha.105",
"author": "Community for NL Design System",
"description": "DigiD design tokens",
"license": "SEE LICENSE IN LICENSE.md",
Expand Down
2 changes: 1 addition & 1 deletion proprietary/logius-design-tokens/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rijkshuisstijl-community/logius-design-tokens",
"version": "1.0.0-alpha.105",
"version": "1.0.0-alpha.106",
"author": "Community for NL Design System",
"description": "Logius design tokens",
"license": "SEE LICENSE IN LICENSE.md",
Expand Down
2 changes: 1 addition & 1 deletion proprietary/mijnoverheid-design-tokens/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rijkshuisstijl-community/mijnoverheid-design-tokens",
"version": "1.0.0-alpha.104",
"version": "1.0.0-alpha.105",
"author": "Community for NL Design System",
"description": "MijnOverheid design tokens",
"license": "SEE LICENSE IN LICENSE.md",
Expand Down
2 changes: 1 addition & 1 deletion proprietary/rivm-design-tokens/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rijkshuisstijl-community/rivm-design-tokens",
"version": "1.0.0-alpha.98",
"version": "1.0.0-alpha.99",
"author": "Community for NL Design System",
"description": "RIVM design tokens",
"license": "SEE LICENSE IN LICENSE.md",
Expand Down

0 comments on commit 4383dab

Please sign in to comment.