From 07a1456be744861856c5bacf6bc249829b12fccb Mon Sep 17 00:00:00 2001 From: Niels Roozemond Date: Fri, 10 Nov 2023 15:32:51 +0100 Subject: [PATCH 01/33] Scaffolding of logo, asset loading test --- packages/css/src/index.scss | 1 + packages/css/src/logo/README.md | 1 + packages/css/src/logo/logo.scss | 8 ++++ packages/react/package.json | 1 + packages/react/rollup.config.mjs | 2 + packages/react/src/Logo/Logo.test.tsx | 43 +++++++++++++++++++ packages/react/src/Logo/Logo.tsx | 18 ++++++++ packages/react/src/Logo/README.md | 3 ++ packages/react/src/Logo/index.ts | 2 + packages/react/src/Logo/types/svg.d.ts | 4 ++ packages/react/src/index.ts | 1 + packages/react/tsconfig.json | 3 +- pnpm-lock.yaml | 23 ++++++++++ proprietary/assets/Logo.svg | 2 +- .../src/components/amsterdam/logo.tokens.json | 5 +++ .../storybook-react/src/Logo/Logo.docs.mdx | 11 +++++ .../storybook-react/src/Logo/Logo.stories.tsx | 18 ++++++++ 17 files changed, 144 insertions(+), 2 deletions(-) create mode 100644 packages/css/src/logo/README.md create mode 100644 packages/css/src/logo/logo.scss create mode 100644 packages/react/src/Logo/Logo.test.tsx create mode 100644 packages/react/src/Logo/Logo.tsx create mode 100644 packages/react/src/Logo/README.md create mode 100644 packages/react/src/Logo/index.ts create mode 100644 packages/react/src/Logo/types/svg.d.ts create mode 100644 proprietary/tokens/src/components/amsterdam/logo.tokens.json create mode 100644 storybook/storybook-react/src/Logo/Logo.docs.mdx create mode 100644 storybook/storybook-react/src/Logo/Logo.stories.tsx diff --git a/packages/css/src/index.scss b/packages/css/src/index.scss index c1cdf7b5ae..9fef46b60f 100644 --- a/packages/css/src/index.scss +++ b/packages/css/src/index.scss @@ -4,6 +4,7 @@ */ /* Append here */ +@import "./logo/logo"; @import "./pagination/pagination"; @import "./accordion/accordion"; @import "./alert/alert"; diff --git a/packages/css/src/logo/README.md b/packages/css/src/logo/README.md new file mode 100644 index 0000000000..39fa1b058f --- /dev/null +++ b/packages/css/src/logo/README.md @@ -0,0 +1 @@ +# Logo diff --git a/packages/css/src/logo/logo.scss b/packages/css/src/logo/logo.scss new file mode 100644 index 0000000000..3d294b30c9 --- /dev/null +++ b/packages/css/src/logo/logo.scss @@ -0,0 +1,8 @@ +/** + * @license EUPL-1.2+ + * Copyright (c) 2023 Gemeente Amsterdam + */ + +.amsterdam-logo { + /* Add styles here */ +} diff --git a/packages/react/package.json b/packages/react/package.json index 168fb188b9..beb7927407 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -45,6 +45,7 @@ "@babel/runtime": "7.23.2", "@rollup/plugin-babel": "6.0.4", "@rollup/plugin-commonjs": "25.0.7", + "@rollup/plugin-image": "3.0.3", "@rollup/plugin-node-resolve": "15.2.3", "@rollup/pluginutils": "5.0.5", "@testing-library/dom": "9.3.3", diff --git a/packages/react/rollup.config.mjs b/packages/react/rollup.config.mjs index b8dd0d2570..7fa9433f01 100644 --- a/packages/react/rollup.config.mjs +++ b/packages/react/rollup.config.mjs @@ -7,6 +7,7 @@ import nodeExternal from 'rollup-plugin-node-externals' import nodePolyfills from 'rollup-plugin-node-polyfills' import peerDepsExternal from 'rollup-plugin-peer-deps-external' import typescript from 'rollup-plugin-typescript2' +import image from '@rollup/plugin-image' const packageJson = JSON.parse(readFileSync('./package.json', 'utf8')) @@ -56,6 +57,7 @@ export default [ plugins: ['@babel/plugin-transform-runtime'], }), filesize(), + image(), ], }, ] diff --git a/packages/react/src/Logo/Logo.test.tsx b/packages/react/src/Logo/Logo.test.tsx new file mode 100644 index 0000000000..a7695dd47a --- /dev/null +++ b/packages/react/src/Logo/Logo.test.tsx @@ -0,0 +1,43 @@ +import { render } from '@testing-library/react' +import { createRef } from 'react' +import { Logo } from './Logo' +import '@testing-library/jest-dom' + +describe('Logo', () => { + it('renders', () => { + const { container } = render() + + const component = container.querySelector(':only-child') + + expect(component).toBeInTheDocument() + expect(component).toBeVisible() + }) + + it('renders a design system BEM class name', () => { + const { container } = render() + + const component = container.querySelector(':only-child') + + expect(component).toHaveClass('amsterdam-logo') + }) + + it('renders an additional class name', () => { + const { container } = render() + + const component = container.querySelector(':only-child') + + expect(component).toHaveClass('extra') + + expect(component).toHaveClass('amsterdam-logo') + }) + + it('supports ForwardRef in React', () => { + const ref = createRef() + + const { container } = render() + + const component = container.querySelector(':only-child') + + expect(ref.current).toBe(component) + }) +}) diff --git a/packages/react/src/Logo/Logo.tsx b/packages/react/src/Logo/Logo.tsx new file mode 100644 index 0000000000..9b9c779911 --- /dev/null +++ b/packages/react/src/Logo/Logo.tsx @@ -0,0 +1,18 @@ +/** + * @license EUPL-1.2+ + * Copyright (c) 2023 Gemeente Amsterdam + */ + +import clsx from 'clsx' +import { ForwardedRef, forwardRef, HTMLAttributes } from 'react' +import LogoAsset from '../../../../proprietary/assets/Logo.svg' + +export interface LogoProps extends HTMLAttributes {} + +export const Logo = forwardRef(({ className, ...restProps }: LogoProps, ref: ForwardedRef) => ( + + + +)) + +Logo.displayName = 'Logo' diff --git a/packages/react/src/Logo/README.md b/packages/react/src/Logo/README.md new file mode 100644 index 0000000000..126613ec5a --- /dev/null +++ b/packages/react/src/Logo/README.md @@ -0,0 +1,3 @@ +# React Logo component + +[Logo documentation](../../../css/src/logo/README.md) diff --git a/packages/react/src/Logo/index.ts b/packages/react/src/Logo/index.ts new file mode 100644 index 0000000000..42283d84d8 --- /dev/null +++ b/packages/react/src/Logo/index.ts @@ -0,0 +1,2 @@ +export { Logo } from './Logo' +export type { LogoProps } from './Logo' diff --git a/packages/react/src/Logo/types/svg.d.ts b/packages/react/src/Logo/types/svg.d.ts new file mode 100644 index 0000000000..9b9471da0d --- /dev/null +++ b/packages/react/src/Logo/types/svg.d.ts @@ -0,0 +1,4 @@ +declare module '*.svg' { + const content: any + export default content +} diff --git a/packages/react/src/index.ts b/packages/react/src/index.ts index 87b49ab25c..8c86099fbc 100644 --- a/packages/react/src/index.ts +++ b/packages/react/src/index.ts @@ -4,6 +4,7 @@ */ /* Append here */ +export * from './Logo' export * from './Pagination' export * from './Screen' export * from './Switch' diff --git a/packages/react/tsconfig.json b/packages/react/tsconfig.json index 68a99b5261..f44c67354a 100644 --- a/packages/react/tsconfig.json +++ b/packages/react/tsconfig.json @@ -19,7 +19,8 @@ "resolveJsonModule": true, "skipLibCheck": true, "strict": true, - "target": "es2020" + "target": "es2020", + "typeRoots": ["node_modules/@types", "src/**/*.d.ts"] }, "include": ["next-env.d.ts", "src/**/*.ts", "src/**/*.tsx"], "exclude": ["node_modules"] diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a1979d66c1..dc42662231 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -152,6 +152,9 @@ importers: '@rollup/plugin-commonjs': specifier: 25.0.7 version: 25.0.7(rollup@4.3.0) + '@rollup/plugin-image': + specifier: 3.0.3 + version: 3.0.3(rollup@4.3.0) '@rollup/plugin-node-resolve': specifier: 15.2.3 version: 15.2.3(rollup@4.3.0) @@ -4025,6 +4028,20 @@ packages: rollup: 4.3.0 dev: true + /@rollup/plugin-image@3.0.3(rollup@4.3.0): + resolution: {integrity: sha512-qXWQwsXpvD4trSb8PeFPFajp8JLpRtqqOeNYRUKnEQNHm7e5UP7fuSRcbjQAJ7wDZBbnJvSdY5ujNBQd9B1iFg==} + engines: {node: '>=14.0.0'} + peerDependencies: + rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 + peerDependenciesMeta: + rollup: + optional: true + dependencies: + '@rollup/pluginutils': 5.0.5(rollup@4.3.0) + mini-svg-data-uri: 1.4.4 + rollup: 4.3.0 + dev: true + /@rollup/plugin-node-resolve@15.2.3(rollup@4.3.0): resolution: {integrity: sha512-j/lym8nf5E21LwBT4Df1VD6hRO2L2iwUeUmP7litikRsVp1H6NWx20NEp0Y7su+7XGc476GnXXc4kFeZNGmaSQ==} engines: {node: '>=14.0.0'} @@ -12806,6 +12823,11 @@ packages: engines: {node: '>=4'} dev: true + /mini-svg-data-uri@1.4.4: + resolution: {integrity: sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg==} + hasBin: true + dev: true + /minimatch@3.1.2: resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} dependencies: @@ -16598,6 +16620,7 @@ packages: /typescript@5.2.2: resolution: {integrity: sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==} engines: {node: '>=14.17'} + hasBin: true dev: true /uc.micro@1.0.6: diff --git a/proprietary/assets/Logo.svg b/proprietary/assets/Logo.svg index 7fca3dca85..57f5ff688b 100644 --- a/proprietary/assets/Logo.svg +++ b/proprietary/assets/Logo.svg @@ -1 +1 @@ - + diff --git a/proprietary/tokens/src/components/amsterdam/logo.tokens.json b/proprietary/tokens/src/components/amsterdam/logo.tokens.json new file mode 100644 index 0000000000..07dd027c69 --- /dev/null +++ b/proprietary/tokens/src/components/amsterdam/logo.tokens.json @@ -0,0 +1,5 @@ +{ + "amsterdam": { + "logo": {} + } +} diff --git a/storybook/storybook-react/src/Logo/Logo.docs.mdx b/storybook/storybook-react/src/Logo/Logo.docs.mdx new file mode 100644 index 0000000000..090cf26b92 --- /dev/null +++ b/storybook/storybook-react/src/Logo/Logo.docs.mdx @@ -0,0 +1,11 @@ +import { Controls, Markdown, Meta, Primary } from "@storybook/blocks"; +import * as LogoStories from "./Logo.stories.tsx"; +import README from "../../../../packages/css/src/logo/README.md?raw"; + + + +{README} + + + + diff --git a/storybook/storybook-react/src/Logo/Logo.stories.tsx b/storybook/storybook-react/src/Logo/Logo.stories.tsx new file mode 100644 index 0000000000..b2041d2091 --- /dev/null +++ b/storybook/storybook-react/src/Logo/Logo.stories.tsx @@ -0,0 +1,18 @@ +/** + * @license EUPL-1.2+ + * Copyright (c) 2023 Gemeente Amsterdam + */ + +import { Logo } from '@amsterdam/design-system-react' +import { Meta, StoryObj } from '@storybook/react' + +const meta = { + title: 'Media/Logo', + component: Logo, +} satisfies Meta + +export default meta + +type Story = StoryObj + +export const Default: Story = {} From 1cfa8f13ff2e3cfbb4654a69ad17682aae3dd895 Mon Sep 17 00:00:00 2001 From: Niels Roozemond Date: Fri, 10 Nov 2023 16:00:19 +0100 Subject: [PATCH 02/33] Logo Variants --- packages/css/src/logo/logo.scss | 7 +++- packages/react/src/Logo/Logo.tsx | 39 ++++++++++++++---- proprietary/assets/Logo.svg | 2 +- proprietary/assets/logo/amsterdam.svg | 1 + proprietary/assets/logo/ggd-amsterdam.svg | 17 ++++++++ proprietary/assets/logo/stadsarchief.svg | 34 ++++++++++++++++ proprietary/assets/logo/stadsbank-lening.svg | 40 +++++++++++++++++++ proprietary/assets/logo/vga-verzekeringen.svg | 38 ++++++++++++++++++ .../storybook-react/src/Logo/Logo.docs.mdx | 18 ++++++++- .../storybook-react/src/Logo/Logo.stories.tsx | 32 +++++++++++++++ 10 files changed, 218 insertions(+), 10 deletions(-) create mode 100644 proprietary/assets/logo/amsterdam.svg create mode 100644 proprietary/assets/logo/ggd-amsterdam.svg create mode 100644 proprietary/assets/logo/stadsarchief.svg create mode 100644 proprietary/assets/logo/stadsbank-lening.svg create mode 100644 proprietary/assets/logo/vga-verzekeringen.svg diff --git a/packages/css/src/logo/logo.scss b/packages/css/src/logo/logo.scss index 3d294b30c9..cfce9c082c 100644 --- a/packages/css/src/logo/logo.scss +++ b/packages/css/src/logo/logo.scss @@ -4,5 +4,10 @@ */ .amsterdam-logo { - /* Add styles here */ + display: inline-block; + + img { + height: 40px; + width: 115px; + } } diff --git a/packages/react/src/Logo/Logo.tsx b/packages/react/src/Logo/Logo.tsx index 9b9c779911..a1dd207a12 100644 --- a/packages/react/src/Logo/Logo.tsx +++ b/packages/react/src/Logo/Logo.tsx @@ -5,14 +5,39 @@ import clsx from 'clsx' import { ForwardedRef, forwardRef, HTMLAttributes } from 'react' -import LogoAsset from '../../../../proprietary/assets/Logo.svg' +import LogoAmsterdam from '../../../../proprietary/assets/logo/amsterdam.svg' +import LogoGGD from '../../../../proprietary/assets/logo/ggd-amsterdam.svg' +import LogoStadsarchief from '../../../../proprietary/assets/logo/stadsarchief.svg' +import LogoStadsbankLening from '../../../../proprietary/assets/logo/stadsbank-lening.svg' +import LogoVGA from '../../../../proprietary/assets/logo/vga-verzekeringen.svg' -export interface LogoProps extends HTMLAttributes {} +export interface LogoProps extends HTMLAttributes { + variant?: 'amsterdam' | 'ggd-amsterdam' | 'stadsarchief' | 'stadsbank-lening' | 'vga-verzekeringen' +} -export const Logo = forwardRef(({ className, ...restProps }: LogoProps, ref: ForwardedRef) => ( - - - -)) +function getLogoVariant(variant: LogoProps['variant']) { + switch (variant) { + case 'amsterdam': + return LogoAmsterdam + case 'ggd-amsterdam': + return LogoGGD + case 'stadsarchief': + return LogoStadsarchief + case 'stadsbank-lening': + return LogoStadsbankLening + case 'vga-verzekeringen': + return LogoVGA + default: + return LogoAmsterdam + } +} + +export const Logo = forwardRef( + ({ variant = 'amsterdam', className, ...restProps }: LogoProps, ref: ForwardedRef) => ( + + + + ), +) Logo.displayName = 'Logo' diff --git a/proprietary/assets/Logo.svg b/proprietary/assets/Logo.svg index 57f5ff688b..7fca3dca85 100644 --- a/proprietary/assets/Logo.svg +++ b/proprietary/assets/Logo.svg @@ -1 +1 @@ - + diff --git a/proprietary/assets/logo/amsterdam.svg b/proprietary/assets/logo/amsterdam.svg new file mode 100644 index 0000000000..7fca3dca85 --- /dev/null +++ b/proprietary/assets/logo/amsterdam.svg @@ -0,0 +1 @@ + diff --git a/proprietary/assets/logo/ggd-amsterdam.svg b/proprietary/assets/logo/ggd-amsterdam.svg new file mode 100644 index 0000000000..ceccf46a90 --- /dev/null +++ b/proprietary/assets/logo/ggd-amsterdam.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/proprietary/assets/logo/stadsarchief.svg b/proprietary/assets/logo/stadsarchief.svg new file mode 100644 index 0000000000..fbb33f4b60 --- /dev/null +++ b/proprietary/assets/logo/stadsarchief.svg @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/proprietary/assets/logo/stadsbank-lening.svg b/proprietary/assets/logo/stadsbank-lening.svg new file mode 100644 index 0000000000..11fc94e095 --- /dev/null +++ b/proprietary/assets/logo/stadsbank-lening.svg @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/proprietary/assets/logo/vga-verzekeringen.svg b/proprietary/assets/logo/vga-verzekeringen.svg new file mode 100644 index 0000000000..56d61977d8 --- /dev/null +++ b/proprietary/assets/logo/vga-verzekeringen.svg @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/storybook/storybook-react/src/Logo/Logo.docs.mdx b/storybook/storybook-react/src/Logo/Logo.docs.mdx index 090cf26b92..483d3dd471 100644 --- a/storybook/storybook-react/src/Logo/Logo.docs.mdx +++ b/storybook/storybook-react/src/Logo/Logo.docs.mdx @@ -1,4 +1,4 @@ -import { Controls, Markdown, Meta, Primary } from "@storybook/blocks"; +import { Canvas, Controls, Markdown, Meta, Primary } from "@storybook/blocks"; import * as LogoStories from "./Logo.stories.tsx"; import README from "../../../../packages/css/src/logo/README.md?raw"; @@ -9,3 +9,19 @@ import README from "../../../../packages/css/src/logo/README.md?raw"; + +## GGD Amsterdam + + + +## Stadsarchief + + + +## Stadsbank van Lening + + + +## VGA Verzekeringen + + diff --git a/storybook/storybook-react/src/Logo/Logo.stories.tsx b/storybook/storybook-react/src/Logo/Logo.stories.tsx index b2041d2091..dbeb078abb 100644 --- a/storybook/storybook-react/src/Logo/Logo.stories.tsx +++ b/storybook/storybook-react/src/Logo/Logo.stories.tsx @@ -9,6 +9,14 @@ import { Meta, StoryObj } from '@storybook/react' const meta = { title: 'Media/Logo', component: Logo, + argTypes: { + variant: { + control: { + type: 'select', + }, + options: ['amsterdam', 'ggd-amsterdam', 'stadsarchief', 'stadsbank-lening', 'vga-verzekeringen'], + }, + }, } satisfies Meta export default meta @@ -16,3 +24,27 @@ export default meta type Story = StoryObj export const Default: Story = {} + +export const GGDAmsterdam: Story = { + args: { + variant: 'ggd-amsterdam', + }, +} + +export const Stadsarchief: Story = { + args: { + variant: 'stadsarchief', + }, +} + +export const StadsbankLening: Story = { + args: { + variant: 'stadsbank-lening', + }, +} + +export const VGAVerzekeringen: Story = { + args: { + variant: 'vga-verzekeringen', + }, +} From 2cad227ea9af56befa5f4a30a80157ec4beeaedd Mon Sep 17 00:00:00 2001 From: Niels Roozemond Date: Fri, 10 Nov 2023 16:06:31 +0100 Subject: [PATCH 03/33] Alt tag --- packages/react/src/Logo/Logo.tsx | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/packages/react/src/Logo/Logo.tsx b/packages/react/src/Logo/Logo.tsx index a1dd207a12..58a4875f02 100644 --- a/packages/react/src/Logo/Logo.tsx +++ b/packages/react/src/Logo/Logo.tsx @@ -32,10 +32,27 @@ function getLogoVariant(variant: LogoProps['variant']) { } } +function getLogoVariantTitle(variant: LogoProps['variant']) { + switch (variant) { + case 'amsterdam': + return 'Gemeente Amsterdam' + case 'ggd-amsterdam': + return 'GGD Amsterdam' + case 'stadsarchief': + return 'Stadsarchief Amsterdam' + case 'stadsbank-lening': + return 'Stadsbank van Lening' + case 'vga-verzekeringen': + return 'VGA Verzekeringen' + default: + return 'Gemeente Amsterdam' + } +} + export const Logo = forwardRef( ({ variant = 'amsterdam', className, ...restProps }: LogoProps, ref: ForwardedRef) => ( - + {`Logo ), ) From 30bd95ecfc99cdf4e52fa68d7c7c72631169ce65 Mon Sep 17 00:00:00 2001 From: Niels Roozemond Date: Tue, 14 Nov 2023 14:09:18 +0100 Subject: [PATCH 04/33] One less function --- packages/react/src/Logo/Logo.tsx | 41 +++++++++----------------------- 1 file changed, 11 insertions(+), 30 deletions(-) diff --git a/packages/react/src/Logo/Logo.tsx b/packages/react/src/Logo/Logo.tsx index 58a4875f02..6cd0ded882 100644 --- a/packages/react/src/Logo/Logo.tsx +++ b/packages/react/src/Logo/Logo.tsx @@ -18,43 +18,24 @@ export interface LogoProps extends HTMLAttributes { function getLogoVariant(variant: LogoProps['variant']) { switch (variant) { case 'amsterdam': - return LogoAmsterdam + return { logo: LogoAmsterdam, alt: 'Gemeente Amsterdam' } case 'ggd-amsterdam': - return LogoGGD + return { logo: LogoGGD, alt: 'GGD Amsterdam' } case 'stadsarchief': - return LogoStadsarchief + return { logo: LogoStadsarchief, alt: 'Stadsarchief Amsterdam' } case 'stadsbank-lening': - return LogoStadsbankLening + return { logo: LogoStadsbankLening, alt: 'Stadsbank van Lening' } case 'vga-verzekeringen': - return LogoVGA + return { logo: LogoVGA, alt: 'VGA Verzekeringen' } default: - return LogoAmsterdam + return { logo: LogoAmsterdam, alt: 'Gemeente Amsterdam' } } } -function getLogoVariantTitle(variant: LogoProps['variant']) { - switch (variant) { - case 'amsterdam': - return 'Gemeente Amsterdam' - case 'ggd-amsterdam': - return 'GGD Amsterdam' - case 'stadsarchief': - return 'Stadsarchief Amsterdam' - case 'stadsbank-lening': - return 'Stadsbank van Lening' - case 'vga-verzekeringen': - return 'VGA Verzekeringen' - default: - return 'Gemeente Amsterdam' - } -} - -export const Logo = forwardRef( - ({ variant = 'amsterdam', className, ...restProps }: LogoProps, ref: ForwardedRef) => ( - - {`Logo - - ), -) +export const Logo = forwardRef(({ variant, className, ...restProps }: LogoProps, ref: ForwardedRef) => ( + + {`Logo + +)) Logo.displayName = 'Logo' From 59a1e62b6e88997d62eeaf1d8a867a62b8b461ae Mon Sep 17 00:00:00 2001 From: Niels Roozemond Date: Tue, 14 Nov 2023 14:12:59 +0100 Subject: [PATCH 05/33] One less logo file --- proprietary/assets/Logo.svg | 1 - storybook/theme.config.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 proprietary/assets/Logo.svg diff --git a/proprietary/assets/Logo.svg b/proprietary/assets/Logo.svg deleted file mode 100644 index 7fca3dca85..0000000000 --- a/proprietary/assets/Logo.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/storybook/theme.config.js b/storybook/theme.config.js index e68f11d8bf..d51de05494 100644 --- a/storybook/theme.config.js +++ b/storybook/theme.config.js @@ -1,4 +1,4 @@ -import Logo from '../proprietary/assets/Logo.svg' +import Logo from '../proprietary/assets/logo/amsterdam.svg' import '../proprietary/assets/font/index.css' const themeConfig = { From 747f72515148a07324b7a96b86f7811584aaa67d Mon Sep 17 00:00:00 2001 From: Niels Roozemond Date: Tue, 14 Nov 2023 14:38:05 +0100 Subject: [PATCH 06/33] Assets in react workspace --- packages/react/package.json | 1 + packages/react/src/Logo/Logo.tsx | 10 +++++----- pnpm-lock.yaml | 3 +++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/packages/react/package.json b/packages/react/package.json index beb7927407..b9fcdd0c00 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -32,6 +32,7 @@ "dist/" ], "dependencies": { + "@amsterdam/design-system-assets": "workspace:*", "@amsterdam/design-system-react-icons": "workspace:*", "@utrecht/component-library-react": "1.0.1", "clsx": "2.0.0", diff --git a/packages/react/src/Logo/Logo.tsx b/packages/react/src/Logo/Logo.tsx index 6cd0ded882..21db0c4ed1 100644 --- a/packages/react/src/Logo/Logo.tsx +++ b/packages/react/src/Logo/Logo.tsx @@ -3,13 +3,13 @@ * Copyright (c) 2023 Gemeente Amsterdam */ +import LogoAmsterdam from '@amsterdam/design-system-assets/logo/amsterdam.svg' +import LogoGGD from '@amsterdam/design-system-assets/logo/ggd-amsterdam.svg' +import LogoStadsarchief from '@amsterdam/design-system-assets/logo/stadsarchief.svg' +import LogoStadsbankLening from '@amsterdam/design-system-assets/logo/stadsbank-lening.svg' +import LogoVGA from '@amsterdam/design-system-assets/logo/vga-verzekeringen.svg' import clsx from 'clsx' import { ForwardedRef, forwardRef, HTMLAttributes } from 'react' -import LogoAmsterdam from '../../../../proprietary/assets/logo/amsterdam.svg' -import LogoGGD from '../../../../proprietary/assets/logo/ggd-amsterdam.svg' -import LogoStadsarchief from '../../../../proprietary/assets/logo/stadsarchief.svg' -import LogoStadsbankLening from '../../../../proprietary/assets/logo/stadsbank-lening.svg' -import LogoVGA from '../../../../proprietary/assets/logo/vga-verzekeringen.svg' export interface LogoProps extends HTMLAttributes { variant?: 'amsterdam' | 'ggd-amsterdam' | 'stadsarchief' | 'stadsbank-lening' | 'vga-verzekeringen' diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dc42662231..efd184dc40 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -118,6 +118,9 @@ importers: packages/react: dependencies: + '@amsterdam/design-system-assets': + specifier: workspace:* + version: link:../../proprietary/assets '@amsterdam/design-system-react-icons': specifier: workspace:* version: link:../../proprietary/react-icons From f13f61bf18771eaae07384f30f4e1709948172a4 Mon Sep 17 00:00:00 2001 From: Vincent Smedinga Date: Tue, 14 Nov 2023 20:39:14 +0100 Subject: [PATCH 07/33] Copy documentation from current website --- packages/css/src/logo/README.md | 34 +++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/packages/css/src/logo/README.md b/packages/css/src/logo/README.md index 39fa1b058f..f10485664c 100644 --- a/packages/css/src/logo/README.md +++ b/packages/css/src/logo/README.md @@ -1 +1,35 @@ # Logo + +Het logo van de gemeente bestaat uit een beeldmerk (3 Andreaskruisen) en een woordmerk (Gemeente Amsterdam). +Het logo heeft een vaste kleur, grootte en positie en staat op al onze websites. + +## Specificaties + +Gebruik altijd het online logo. +Het Nederlandse logo voor Nederlandstalige websites en anderstalige websites behalve Engels. +Het Engelstalige logo gebruiken we voor Engelstalige websites. + +## Uitzondering + +Gebruik het submerklogo als de website eigendom is van 1 van de 4 submerken. +Zij hebben een aparte status omdat er sprake is van een bijzondere vorm van dienstverlening die niet direct met de gemeente in verband wordt gebracht. + +De submerken zijn: + +- GGD Amsterdam +- Stadsarchief +- Stadsbank van Lening +- VGA Verzekeringen + +## Eisen voor alle logo´s + +- Het logo wordt altijd getoond. +- Het logo is linksboven uitgelijnd in de header. +- Het logo verwijst naar de homepage. +- Als de applicatie een formulier, applicatie of tool is zonder homepage, dan linkt het logo naar de pagina op Amsterdam.nl van waar naar het formulier, applicatie of tool wordt verwezen. + +De hoogte van het logo is altijd 40 pixels. Dit geldt ook voor de submerklogo´s. + +## Download + +- [Logoset voor website en apps (ZIP, 10 kB)](https://assets.amsterdam.nl/publish/pages/1007650/logoset_voor_websites_en_apps.zip) From 4ee6d3ab3f503b9d9d29d45e19fdf2dedc69e3fd Mon Sep 17 00:00:00 2001 From: Niels Roozemond Date: Wed, 15 Nov 2023 09:08:29 +0100 Subject: [PATCH 08/33] Typescript import error fix --- packages/react/{src/Logo/types/svg.d.ts => custom.d.ts} | 0 packages/react/tsconfig.json | 2 +- packages/react/tsconfig.test.json | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename packages/react/{src/Logo/types/svg.d.ts => custom.d.ts} (100%) diff --git a/packages/react/src/Logo/types/svg.d.ts b/packages/react/custom.d.ts similarity index 100% rename from packages/react/src/Logo/types/svg.d.ts rename to packages/react/custom.d.ts diff --git a/packages/react/tsconfig.json b/packages/react/tsconfig.json index f44c67354a..f3df31d9d7 100644 --- a/packages/react/tsconfig.json +++ b/packages/react/tsconfig.json @@ -22,6 +22,6 @@ "target": "es2020", "typeRoots": ["node_modules/@types", "src/**/*.d.ts"] }, - "include": ["next-env.d.ts", "src/**/*.ts", "src/**/*.tsx"], + "include": ["next-env.d.ts", "src/**/*.ts", "src/**/*.tsx", "custom.d.ts"], "exclude": ["node_modules"] } diff --git a/packages/react/tsconfig.test.json b/packages/react/tsconfig.test.json index a634a327fa..943e945d8b 100644 --- a/packages/react/tsconfig.test.json +++ b/packages/react/tsconfig.test.json @@ -3,6 +3,6 @@ "compilerOptions": { "noEmit": true }, - "include": ["next-env.d.ts", "src/**/*.test.ts", "src/**/*.test.tsx"], + "include": ["next-env.d.ts", "src/**/*.test.ts", "src/**/*.test.tsx", "custom.d.ts"], "exclude": ["node_modules"] } From 374e82b02e96a44786496513e0ef07db730f4de7 Mon Sep 17 00:00:00 2001 From: Niels Roozemond Date: Wed, 15 Nov 2023 11:50:00 +0100 Subject: [PATCH 09/33] Refactor SVG as component --- packages/css/src/logo/logo.scss | 4 +- packages/react/custom.d.ts | 4 - packages/react/package.json | 2 - packages/react/rollup.config.mjs | 2 - packages/react/src/Logo/Logo.tsx | 47 +- packages/react/src/Logo/LogoAmsterdam.tsx | 11 + packages/react/src/Logo/LogoGgdAmsterdam.tsx | 15 + packages/react/src/Logo/LogoStadsarchief.tsx | 15 + .../react/src/Logo/LogoStadsbankVanLening.tsx | 15 + .../react/src/Logo/LogoVgaVerzekeringen.tsx | 15 + packages/react/src/Logo/index.ts | 5 + packages/react/tsconfig.json | 2 +- packages/react/tsconfig.test.json | 2 +- pnpm-lock.yaml | 870 ++++++++++++++++-- proprietary/assets/logo/amsterdam.svg | 5 +- proprietary/assets/logo/ggd-amsterdam.svg | 20 +- proprietary/assets/logo/stadsarchief.svg | 37 +- proprietary/assets/logo/stadsbank-lening.svg | 40 - .../assets/logo/stadsbank-van-lening.svg | 5 + proprietary/assets/logo/vga-verzekeringen.svg | 41 +- .../storybook-react/src/Logo/Logo.docs.mdx | 2 +- .../storybook-react/src/Logo/Logo.stories.tsx | 6 +- 22 files changed, 939 insertions(+), 226 deletions(-) delete mode 100644 packages/react/custom.d.ts create mode 100644 packages/react/src/Logo/LogoAmsterdam.tsx create mode 100644 packages/react/src/Logo/LogoGgdAmsterdam.tsx create mode 100644 packages/react/src/Logo/LogoStadsarchief.tsx create mode 100644 packages/react/src/Logo/LogoStadsbankVanLening.tsx create mode 100644 packages/react/src/Logo/LogoVgaVerzekeringen.tsx delete mode 100644 proprietary/assets/logo/stadsbank-lening.svg create mode 100644 proprietary/assets/logo/stadsbank-van-lening.svg diff --git a/packages/css/src/logo/logo.scss b/packages/css/src/logo/logo.scss index cfce9c082c..c1214703ed 100644 --- a/packages/css/src/logo/logo.scss +++ b/packages/css/src/logo/logo.scss @@ -6,8 +6,8 @@ .amsterdam-logo { display: inline-block; - img { + svg { height: 40px; - width: 115px; + width: auto; } } diff --git a/packages/react/custom.d.ts b/packages/react/custom.d.ts deleted file mode 100644 index 9b9471da0d..0000000000 --- a/packages/react/custom.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -declare module '*.svg' { - const content: any - export default content -} diff --git a/packages/react/package.json b/packages/react/package.json index b9fcdd0c00..168fb188b9 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -32,7 +32,6 @@ "dist/" ], "dependencies": { - "@amsterdam/design-system-assets": "workspace:*", "@amsterdam/design-system-react-icons": "workspace:*", "@utrecht/component-library-react": "1.0.1", "clsx": "2.0.0", @@ -46,7 +45,6 @@ "@babel/runtime": "7.23.2", "@rollup/plugin-babel": "6.0.4", "@rollup/plugin-commonjs": "25.0.7", - "@rollup/plugin-image": "3.0.3", "@rollup/plugin-node-resolve": "15.2.3", "@rollup/pluginutils": "5.0.5", "@testing-library/dom": "9.3.3", diff --git a/packages/react/rollup.config.mjs b/packages/react/rollup.config.mjs index 7fa9433f01..b8dd0d2570 100644 --- a/packages/react/rollup.config.mjs +++ b/packages/react/rollup.config.mjs @@ -7,7 +7,6 @@ import nodeExternal from 'rollup-plugin-node-externals' import nodePolyfills from 'rollup-plugin-node-polyfills' import peerDepsExternal from 'rollup-plugin-peer-deps-external' import typescript from 'rollup-plugin-typescript2' -import image from '@rollup/plugin-image' const packageJson = JSON.parse(readFileSync('./package.json', 'utf8')) @@ -57,7 +56,6 @@ export default [ plugins: ['@babel/plugin-transform-runtime'], }), filesize(), - image(), ], }, ] diff --git a/packages/react/src/Logo/Logo.tsx b/packages/react/src/Logo/Logo.tsx index 21db0c4ed1..86e4120cd7 100644 --- a/packages/react/src/Logo/Logo.tsx +++ b/packages/react/src/Logo/Logo.tsx @@ -3,39 +3,34 @@ * Copyright (c) 2023 Gemeente Amsterdam */ -import LogoAmsterdam from '@amsterdam/design-system-assets/logo/amsterdam.svg' -import LogoGGD from '@amsterdam/design-system-assets/logo/ggd-amsterdam.svg' -import LogoStadsarchief from '@amsterdam/design-system-assets/logo/stadsarchief.svg' -import LogoStadsbankLening from '@amsterdam/design-system-assets/logo/stadsbank-lening.svg' -import LogoVGA from '@amsterdam/design-system-assets/logo/vga-verzekeringen.svg' import clsx from 'clsx' import { ForwardedRef, forwardRef, HTMLAttributes } from 'react' +import { LogoAmsterdam, LogoGgdAmsterdam, LogoStadsarchief, LogoStadsbankVanLening, LogoVgaVerzekeringen } from '.' + +type LogoBrand = 'amsterdam' | 'ggd-amsterdam' | 'stadsarchief' | 'stadsbank-van-lening' | 'vga-verzekeringen' export interface LogoProps extends HTMLAttributes { - variant?: 'amsterdam' | 'ggd-amsterdam' | 'stadsarchief' | 'stadsbank-lening' | 'vga-verzekeringen' + variant?: LogoBrand } -function getLogoVariant(variant: LogoProps['variant']) { - switch (variant) { - case 'amsterdam': - return { logo: LogoAmsterdam, alt: 'Gemeente Amsterdam' } - case 'ggd-amsterdam': - return { logo: LogoGGD, alt: 'GGD Amsterdam' } - case 'stadsarchief': - return { logo: LogoStadsarchief, alt: 'Stadsarchief Amsterdam' } - case 'stadsbank-lening': - return { logo: LogoStadsbankLening, alt: 'Stadsbank van Lening' } - case 'vga-verzekeringen': - return { logo: LogoVGA, alt: 'VGA Verzekeringen' } - default: - return { logo: LogoAmsterdam, alt: 'Gemeente Amsterdam' } - } +const logoConfig: Record = { + amsterdam: LogoAmsterdam, + 'ggd-amsterdam': LogoGgdAmsterdam, + stadsarchief: LogoStadsarchief, + 'stadsbank-van-lening': LogoStadsbankVanLening, + 'vga-verzekeringen': LogoVgaVerzekeringen, } -export const Logo = forwardRef(({ variant, className, ...restProps }: LogoProps, ref: ForwardedRef) => ( - - {`Logo - -)) +export const Logo = forwardRef( + ({ variant = 'amsterdam', className, ...restProps }: LogoProps, ref: ForwardedRef) => { + const LogoComponent = logoConfig[variant] + + return ( + + {LogoComponent()} + + ) + }, +) Logo.displayName = 'Logo' diff --git a/packages/react/src/Logo/LogoAmsterdam.tsx b/packages/react/src/Logo/LogoAmsterdam.tsx new file mode 100644 index 0000000000..69c2fb0012 --- /dev/null +++ b/packages/react/src/Logo/LogoAmsterdam.tsx @@ -0,0 +1,11 @@ +import type { SVGProps } from 'react' +const LogoAmsterdam = (props: SVGProps) => ( + + Gemeente Amsterdam + + +) +export default LogoAmsterdam diff --git a/packages/react/src/Logo/LogoGgdAmsterdam.tsx b/packages/react/src/Logo/LogoGgdAmsterdam.tsx new file mode 100644 index 0000000000..eb486250fb --- /dev/null +++ b/packages/react/src/Logo/LogoGgdAmsterdam.tsx @@ -0,0 +1,15 @@ +import type { SVGProps } from 'react' +const LogoGgdAmsterdam = (props: SVGProps) => ( + + GGD Amsterdam + + + +) +export default LogoGgdAmsterdam diff --git a/packages/react/src/Logo/LogoStadsarchief.tsx b/packages/react/src/Logo/LogoStadsarchief.tsx new file mode 100644 index 0000000000..b05bf5703b --- /dev/null +++ b/packages/react/src/Logo/LogoStadsarchief.tsx @@ -0,0 +1,15 @@ +import type { SVGProps } from 'react' +const LogoStadsarchief = (props: SVGProps) => ( + + Stadsarchief + + + +) +export default LogoStadsarchief diff --git a/packages/react/src/Logo/LogoStadsbankVanLening.tsx b/packages/react/src/Logo/LogoStadsbankVanLening.tsx new file mode 100644 index 0000000000..8ad9dac7a6 --- /dev/null +++ b/packages/react/src/Logo/LogoStadsbankVanLening.tsx @@ -0,0 +1,15 @@ +import type { SVGProps } from 'react' +const LogoStadsbankVanLening = (props: SVGProps) => ( + + Stadsbank van Lening + + + +) +export default LogoStadsbankVanLening diff --git a/packages/react/src/Logo/LogoVgaVerzekeringen.tsx b/packages/react/src/Logo/LogoVgaVerzekeringen.tsx new file mode 100644 index 0000000000..c7ba102b79 --- /dev/null +++ b/packages/react/src/Logo/LogoVgaVerzekeringen.tsx @@ -0,0 +1,15 @@ +import type { SVGProps } from 'react' +const LogoVgaVerzekeringen = (props: SVGProps) => ( + + VGA Verzekeringen + + + +) +export default LogoVgaVerzekeringen diff --git a/packages/react/src/Logo/index.ts b/packages/react/src/Logo/index.ts index 42283d84d8..1db784dc8f 100644 --- a/packages/react/src/Logo/index.ts +++ b/packages/react/src/Logo/index.ts @@ -1,2 +1,7 @@ +export { default as LogoAmsterdam } from './LogoAmsterdam' +export { default as LogoGgdAmsterdam } from './LogoGgdAmsterdam' +export { default as LogoStadsarchief } from './LogoStadsarchief' +export { default as LogoStadsbankVanLening } from './LogoStadsbankVanLening' +export { default as LogoVgaVerzekeringen } from './LogoVgaVerzekeringen' export { Logo } from './Logo' export type { LogoProps } from './Logo' diff --git a/packages/react/tsconfig.json b/packages/react/tsconfig.json index f3df31d9d7..f44c67354a 100644 --- a/packages/react/tsconfig.json +++ b/packages/react/tsconfig.json @@ -22,6 +22,6 @@ "target": "es2020", "typeRoots": ["node_modules/@types", "src/**/*.d.ts"] }, - "include": ["next-env.d.ts", "src/**/*.ts", "src/**/*.tsx", "custom.d.ts"], + "include": ["next-env.d.ts", "src/**/*.ts", "src/**/*.tsx"], "exclude": ["node_modules"] } diff --git a/packages/react/tsconfig.test.json b/packages/react/tsconfig.test.json index 943e945d8b..a634a327fa 100644 --- a/packages/react/tsconfig.test.json +++ b/packages/react/tsconfig.test.json @@ -3,6 +3,6 @@ "compilerOptions": { "noEmit": true }, - "include": ["next-env.d.ts", "src/**/*.test.ts", "src/**/*.test.tsx", "custom.d.ts"], + "include": ["next-env.d.ts", "src/**/*.test.ts", "src/**/*.test.tsx"], "exclude": ["node_modules"] } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index efd184dc40..404985292e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -155,9 +155,6 @@ importers: '@rollup/plugin-commonjs': specifier: 25.0.7 version: 25.0.7(rollup@4.3.0) - '@rollup/plugin-image': - specifier: 3.0.3 - version: 3.0.3(rollup@4.3.0) '@rollup/plugin-node-resolve': specifier: 15.2.3 version: 15.2.3(rollup@4.3.0) @@ -190,7 +187,7 @@ importers: version: 18.2.37 jest: specifier: 29.7.0 - version: 29.7.0(@types/node@20.9.0) + version: 29.7.0 jest-environment-jsdom: specifier: 29.7.0 version: 29.7.0 @@ -418,19 +415,19 @@ importers: version: 2.3.0(react@18.2.0) '@storybook/addon-a11y': specifier: 7.5.3 - version: 7.5.3(@types/react-dom@18.2.15)(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + version: 7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) '@storybook/addon-actions': specifier: 7.5.3 - version: 7.5.3(@types/react-dom@18.2.15)(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + version: 7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) '@storybook/addon-docs': specifier: 7.5.3 - version: 7.5.3(@types/react-dom@18.2.15)(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + version: 7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) '@storybook/addon-essentials': specifier: 7.5.3 - version: 7.5.3(@types/react-dom@18.2.15)(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + version: 7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) '@storybook/addon-interactions': specifier: 7.5.3 - version: 7.5.3(@types/react-dom@18.2.15)(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + version: 7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) '@storybook/addon-links': specifier: 7.5.3 version: 7.5.3(react-dom@18.2.0)(react@18.2.0) @@ -442,10 +439,10 @@ importers: version: 7.5.3(react-dom@18.2.0)(react@18.2.0) '@storybook/blocks': specifier: 7.5.3 - version: 7.5.3(@types/react-dom@18.2.15)(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + version: 7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) '@storybook/components': specifier: 7.5.3 - version: 7.5.3(@types/react-dom@18.2.15)(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + version: 7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) '@storybook/core-events': specifier: 7.5.3 version: 7.5.3 @@ -493,7 +490,7 @@ importers: version: 7.5.3 vite: specifier: 4.5.0 - version: 4.5.0(@types/node@20.9.0)(sass@1.69.5) + version: 4.5.0 packages: @@ -576,7 +573,7 @@ packages: resolution: {integrity: sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.22.19 + '@babel/types': 7.23.0 dev: true /@babel/helper-builder-binary-assignment-operator-visitor@7.22.5: @@ -1936,15 +1933,6 @@ packages: to-fast-properties: 2.0.0 dev: true - /@babel/types@7.22.19: - resolution: {integrity: sha512-P7LAw/LbojPzkgp5oznjE6tQEIWbp4PkkfrZDINTro9zgBRtI324/EYsiSI7lhPbpIQ+DCeR2NNmMWANGGfZsg==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/helper-string-parser': 7.22.5 - '@babel/helper-validator-identifier': 7.22.20 - to-fast-properties: 2.0.0 - dev: true - /@babel/types@7.23.0: resolution: {integrity: sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==} engines: {node: '>=6.9.0'} @@ -2600,7 +2588,7 @@ packages: magic-string: 0.27.0 react-docgen-typescript: 2.2.2(typescript@5.2.2) typescript: 5.2.2 - vite: 4.5.0(@types/node@20.9.0)(sass@1.69.5) + vite: 4.5.0 dev: true /@jridgewell/gen-mapping@0.3.3: @@ -3467,6 +3455,26 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: true + /@radix-ui/react-arrow@1.0.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-wSP+pHsB/jQRaL6voubsQ/ZlrGBHHrOjmBnr19hxYgtS0WvAFwZhK2WP/YY5yF9uKECCEEDGxuLxq1NBK51wFA==} + peerDependencies: + '@types/react': '*' + '@types/react-dom': '*' + react: ^16.8 || ^17.0 || ^18.0 + react-dom: ^16.8 || ^17.0 || ^18.0 + peerDependenciesMeta: + '@types/react': + optional: true + '@types/react-dom': + optional: true + dependencies: + '@babel/runtime': 7.23.2 + '@radix-ui/react-primitive': 1.0.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@types/react': 18.2.37 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + dev: true + /@radix-ui/react-collection@1.0.3(@types/react-dom@18.2.15)(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-3SzW+0PW7yBBoQlT8wNcGtaxaD0XSu0uLUFgrtHY08Acx05TaHaOmVLR73c0j/cqpDy53KBMO7s0dx2wmOIDIA==} peerDependencies: @@ -3491,6 +3499,29 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: true + /@radix-ui/react-collection@1.0.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-3SzW+0PW7yBBoQlT8wNcGtaxaD0XSu0uLUFgrtHY08Acx05TaHaOmVLR73c0j/cqpDy53KBMO7s0dx2wmOIDIA==} + peerDependencies: + '@types/react': '*' + '@types/react-dom': '*' + react: ^16.8 || ^17.0 || ^18.0 + react-dom: ^16.8 || ^17.0 || ^18.0 + peerDependenciesMeta: + '@types/react': + optional: true + '@types/react-dom': + optional: true + dependencies: + '@babel/runtime': 7.23.2 + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.37)(react@18.2.0) + '@radix-ui/react-context': 1.0.1(@types/react@18.2.37)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-slot': 1.0.2(@types/react@18.2.37)(react@18.2.0) + '@types/react': 18.2.37 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + dev: true + /@radix-ui/react-compose-refs@1.0.1(@types/react@18.2.37)(react@18.2.0): resolution: {integrity: sha512-fDSBgd44FKHa1FRMU59qBMPFcl2PZE+2nmqunj+BWFyYYjnhIDWL2ItDs3rrbJDQOtzt5nIebLCQc4QRfz6LJw==} peerDependencies: @@ -3558,6 +3589,30 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: true + /@radix-ui/react-dismissable-layer@1.0.4(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-7UpBa/RKMoHJYjie1gkF1DlK8l1fdU/VKDpoS3rCCo8YBJR294GwcEHyxHw72yvphJ7ld0AXEcSLAzY2F/WyCg==} + peerDependencies: + '@types/react': '*' + '@types/react-dom': '*' + react: ^16.8 || ^17.0 || ^18.0 + react-dom: ^16.8 || ^17.0 || ^18.0 + peerDependenciesMeta: + '@types/react': + optional: true + '@types/react-dom': + optional: true + dependencies: + '@babel/runtime': 7.23.2 + '@radix-ui/primitive': 1.0.1 + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.37)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.37)(react@18.2.0) + '@radix-ui/react-use-escape-keydown': 1.0.3(@types/react@18.2.37)(react@18.2.0) + '@types/react': 18.2.37 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + dev: true + /@radix-ui/react-focus-guards@1.0.1(@types/react@18.2.37)(react@18.2.0): resolution: {integrity: sha512-Rect2dWbQ8waGzhMavsIbmSVCgYxkXLxxR3ZvCX79JOglzdEy4JXMb98lq4hPxUbLr77nP0UOGf4rcMU+s1pUA==} peerDependencies: @@ -3595,6 +3650,28 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: true + /@radix-ui/react-focus-scope@1.0.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-upXdPfqI4islj2CslyfUBNlaJCPybbqRHAi1KER7Isel9Q2AtSJ0zRBZv8mWQiFXD2nyAJ4BhC3yXgZ6kMBSrQ==} + peerDependencies: + '@types/react': '*' + '@types/react-dom': '*' + react: ^16.8 || ^17.0 || ^18.0 + react-dom: ^16.8 || ^17.0 || ^18.0 + peerDependenciesMeta: + '@types/react': + optional: true + '@types/react-dom': + optional: true + dependencies: + '@babel/runtime': 7.23.2 + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.37)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.37)(react@18.2.0) + '@types/react': 18.2.37 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + dev: true + /@radix-ui/react-id@1.0.1(@types/react@18.2.37)(react@18.2.0): resolution: {integrity: sha512-tI7sT/kqYp8p96yGWY1OAnLHrqDgzHefRBKQ2YAkBS5ja7QLcZ9Z/uY7bEjPUatf8RomoXM8/1sMj1IJaE5UzQ==} peerDependencies: @@ -3640,6 +3717,35 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: true + /@radix-ui/react-popper@1.1.2(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-1CnGGfFi/bbqtJZZ0P/NQY20xdG3E0LALJaLUEoKwPLwl6PPPfbeiCqMVQnhoFRAxjJj4RpBRJzDmUgsex2tSg==} + peerDependencies: + '@types/react': '*' + '@types/react-dom': '*' + react: ^16.8 || ^17.0 || ^18.0 + react-dom: ^16.8 || ^17.0 || ^18.0 + peerDependenciesMeta: + '@types/react': + optional: true + '@types/react-dom': + optional: true + dependencies: + '@babel/runtime': 7.23.2 + '@floating-ui/react-dom': 2.0.2(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-arrow': 1.0.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.37)(react@18.2.0) + '@radix-ui/react-context': 1.0.1(@types/react@18.2.37)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.37)(react@18.2.0) + '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.37)(react@18.2.0) + '@radix-ui/react-use-rect': 1.0.1(@types/react@18.2.37)(react@18.2.0) + '@radix-ui/react-use-size': 1.0.1(@types/react@18.2.37)(react@18.2.0) + '@radix-ui/rect': 1.0.1 + '@types/react': 18.2.37 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + dev: true + /@radix-ui/react-portal@1.0.3(@types/react-dom@18.2.15)(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-xLYZeHrWoPmA5mEKEfZZevoVRK/Q43GfzRXkWV6qawIWWK8t6ifIiLQdd7rmQ4Vk1bmI21XhqF9BN3jWf+phpA==} peerDependencies: @@ -3661,6 +3767,26 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: true + /@radix-ui/react-portal@1.0.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-xLYZeHrWoPmA5mEKEfZZevoVRK/Q43GfzRXkWV6qawIWWK8t6ifIiLQdd7rmQ4Vk1bmI21XhqF9BN3jWf+phpA==} + peerDependencies: + '@types/react': '*' + '@types/react-dom': '*' + react: ^16.8 || ^17.0 || ^18.0 + react-dom: ^16.8 || ^17.0 || ^18.0 + peerDependenciesMeta: + '@types/react': + optional: true + '@types/react-dom': + optional: true + dependencies: + '@babel/runtime': 7.23.2 + '@radix-ui/react-primitive': 1.0.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@types/react': 18.2.37 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + dev: true + /@radix-ui/react-primitive@1.0.3(@types/react-dom@18.2.15)(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-yi58uVyoAcK/Nq1inRY56ZSjKypBNKTa/1mcL8qdl6oJeEaDbOldlzrGn7P6Q3Id5d+SYNGc5AJgc4vGhjs5+g==} peerDependencies: @@ -3682,6 +3808,26 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: true + /@radix-ui/react-primitive@1.0.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-yi58uVyoAcK/Nq1inRY56ZSjKypBNKTa/1mcL8qdl6oJeEaDbOldlzrGn7P6Q3Id5d+SYNGc5AJgc4vGhjs5+g==} + peerDependencies: + '@types/react': '*' + '@types/react-dom': '*' + react: ^16.8 || ^17.0 || ^18.0 + react-dom: ^16.8 || ^17.0 || ^18.0 + peerDependenciesMeta: + '@types/react': + optional: true + '@types/react-dom': + optional: true + dependencies: + '@babel/runtime': 7.23.2 + '@radix-ui/react-slot': 1.0.2(@types/react@18.2.37)(react@18.2.0) + '@types/react': 18.2.37 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + dev: true + /@radix-ui/react-roving-focus@1.0.4(@types/react-dom@18.2.15)(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-2mUg5Mgcu001VkGy+FfzZyzbmuUWzgWkj3rvv4yu+mLw03+mTzbxZHvfcGyFp2b8EkQeMkpRQ5FiA2Vr2O6TeQ==} peerDependencies: @@ -3711,6 +3857,34 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: true + /@radix-ui/react-roving-focus@1.0.4(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-2mUg5Mgcu001VkGy+FfzZyzbmuUWzgWkj3rvv4yu+mLw03+mTzbxZHvfcGyFp2b8EkQeMkpRQ5FiA2Vr2O6TeQ==} + peerDependencies: + '@types/react': '*' + '@types/react-dom': '*' + react: ^16.8 || ^17.0 || ^18.0 + react-dom: ^16.8 || ^17.0 || ^18.0 + peerDependenciesMeta: + '@types/react': + optional: true + '@types/react-dom': + optional: true + dependencies: + '@babel/runtime': 7.23.2 + '@radix-ui/primitive': 1.0.1 + '@radix-ui/react-collection': 1.0.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.37)(react@18.2.0) + '@radix-ui/react-context': 1.0.1(@types/react@18.2.37)(react@18.2.0) + '@radix-ui/react-direction': 1.0.1(@types/react@18.2.37)(react@18.2.0) + '@radix-ui/react-id': 1.0.1(@types/react@18.2.37)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.37)(react@18.2.0) + '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.37)(react@18.2.0) + '@types/react': 18.2.37 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + dev: true + /@radix-ui/react-select@1.2.2(@types/react-dom@18.2.15)(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-zI7McXr8fNaSrUY9mZe4x/HC0jTLY9fWNhO1oLWYMQGDXuV4UCivIGTxwioSzO0ZCYX9iSLyWmAh/1TOmX3Cnw==} peerDependencies: @@ -3752,6 +3926,46 @@ packages: react-remove-scroll: 2.5.5(@types/react@18.2.37)(react@18.2.0) dev: true + /@radix-ui/react-select@1.2.2(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-zI7McXr8fNaSrUY9mZe4x/HC0jTLY9fWNhO1oLWYMQGDXuV4UCivIGTxwioSzO0ZCYX9iSLyWmAh/1TOmX3Cnw==} + peerDependencies: + '@types/react': '*' + '@types/react-dom': '*' + react: ^16.8 || ^17.0 || ^18.0 + react-dom: ^16.8 || ^17.0 || ^18.0 + peerDependenciesMeta: + '@types/react': + optional: true + '@types/react-dom': + optional: true + dependencies: + '@babel/runtime': 7.23.2 + '@radix-ui/number': 1.0.1 + '@radix-ui/primitive': 1.0.1 + '@radix-ui/react-collection': 1.0.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.37)(react@18.2.0) + '@radix-ui/react-context': 1.0.1(@types/react@18.2.37)(react@18.2.0) + '@radix-ui/react-direction': 1.0.1(@types/react@18.2.37)(react@18.2.0) + '@radix-ui/react-dismissable-layer': 1.0.4(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-focus-guards': 1.0.1(@types/react@18.2.37)(react@18.2.0) + '@radix-ui/react-focus-scope': 1.0.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-id': 1.0.1(@types/react@18.2.37)(react@18.2.0) + '@radix-ui/react-popper': 1.1.2(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-portal': 1.0.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-slot': 1.0.2(@types/react@18.2.37)(react@18.2.0) + '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.37)(react@18.2.0) + '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.37)(react@18.2.0) + '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.37)(react@18.2.0) + '@radix-ui/react-use-previous': 1.0.1(@types/react@18.2.37)(react@18.2.0) + '@radix-ui/react-visually-hidden': 1.0.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@types/react': 18.2.37 + aria-hidden: 1.2.3 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + react-remove-scroll: 2.5.5(@types/react@18.2.37)(react@18.2.0) + dev: true + /@radix-ui/react-separator@1.0.3(@types/react-dom@18.2.15)(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-itYmTy/kokS21aiV5+Z56MZB54KrhPgn6eHDKkFeOLR34HMN2s8PaN47qZZAGnvupcjxHaFZnW4pQEh0BvvVuw==} peerDependencies: @@ -3773,6 +3987,26 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: true + /@radix-ui/react-separator@1.0.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-itYmTy/kokS21aiV5+Z56MZB54KrhPgn6eHDKkFeOLR34HMN2s8PaN47qZZAGnvupcjxHaFZnW4pQEh0BvvVuw==} + peerDependencies: + '@types/react': '*' + '@types/react-dom': '*' + react: ^16.8 || ^17.0 || ^18.0 + react-dom: ^16.8 || ^17.0 || ^18.0 + peerDependenciesMeta: + '@types/react': + optional: true + '@types/react-dom': + optional: true + dependencies: + '@babel/runtime': 7.23.2 + '@radix-ui/react-primitive': 1.0.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@types/react': 18.2.37 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + dev: true + /@radix-ui/react-slot@1.0.2(@types/react@18.2.37)(react@18.2.0): resolution: {integrity: sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg==} peerDependencies: @@ -3815,6 +4049,32 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: true + /@radix-ui/react-toggle-group@1.0.4(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-Uaj/M/cMyiyT9Bx6fOZO0SAG4Cls0GptBWiBmBxofmDbNVnYYoyRWj/2M/6VCi/7qcXFWnHhRUfdfZFvvkuu8A==} + peerDependencies: + '@types/react': '*' + '@types/react-dom': '*' + react: ^16.8 || ^17.0 || ^18.0 + react-dom: ^16.8 || ^17.0 || ^18.0 + peerDependenciesMeta: + '@types/react': + optional: true + '@types/react-dom': + optional: true + dependencies: + '@babel/runtime': 7.23.2 + '@radix-ui/primitive': 1.0.1 + '@radix-ui/react-context': 1.0.1(@types/react@18.2.37)(react@18.2.0) + '@radix-ui/react-direction': 1.0.1(@types/react@18.2.37)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-roving-focus': 1.0.4(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-toggle': 1.0.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.37)(react@18.2.0) + '@types/react': 18.2.37 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + dev: true + /@radix-ui/react-toggle@1.0.3(@types/react-dom@18.2.15)(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-Pkqg3+Bc98ftZGsl60CLANXQBBQ4W3mTFS9EJvNxKMZ7magklKV69/id1mlAlOFDDfHvlCms0fx8fA4CMKDJHg==} peerDependencies: @@ -3838,6 +4098,28 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: true + /@radix-ui/react-toggle@1.0.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-Pkqg3+Bc98ftZGsl60CLANXQBBQ4W3mTFS9EJvNxKMZ7magklKV69/id1mlAlOFDDfHvlCms0fx8fA4CMKDJHg==} + peerDependencies: + '@types/react': '*' + '@types/react-dom': '*' + react: ^16.8 || ^17.0 || ^18.0 + react-dom: ^16.8 || ^17.0 || ^18.0 + peerDependenciesMeta: + '@types/react': + optional: true + '@types/react-dom': + optional: true + dependencies: + '@babel/runtime': 7.23.2 + '@radix-ui/primitive': 1.0.1 + '@radix-ui/react-primitive': 1.0.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.37)(react@18.2.0) + '@types/react': 18.2.37 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + dev: true + /@radix-ui/react-toolbar@1.0.4(@types/react-dom@18.2.15)(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-tBgmM/O7a07xbaEkYJWYTXkIdU/1pW4/KZORR43toC/4XWyBCURK0ei9kMUdp+gTPPKBgYLxXmRSH1EVcIDp8Q==} peerDependencies: @@ -3865,6 +4147,32 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: true + /@radix-ui/react-toolbar@1.0.4(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-tBgmM/O7a07xbaEkYJWYTXkIdU/1pW4/KZORR43toC/4XWyBCURK0ei9kMUdp+gTPPKBgYLxXmRSH1EVcIDp8Q==} + peerDependencies: + '@types/react': '*' + '@types/react-dom': '*' + react: ^16.8 || ^17.0 || ^18.0 + react-dom: ^16.8 || ^17.0 || ^18.0 + peerDependenciesMeta: + '@types/react': + optional: true + '@types/react-dom': + optional: true + dependencies: + '@babel/runtime': 7.23.2 + '@radix-ui/primitive': 1.0.1 + '@radix-ui/react-context': 1.0.1(@types/react@18.2.37)(react@18.2.0) + '@radix-ui/react-direction': 1.0.1(@types/react@18.2.37)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-roving-focus': 1.0.4(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-separator': 1.0.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-toggle-group': 1.0.4(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@types/react': 18.2.37 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + dev: true + /@radix-ui/react-use-callback-ref@1.0.1(@types/react@18.2.37)(react@18.2.0): resolution: {integrity: sha512-D94LjX4Sp0xJFVaoQOd3OO9k7tpBYNOXdVhkltUbGv2Qb9OXdrg/CpsjlZv7ia14Sylv398LswWBVVu5nqKzAQ==} peerDependencies: @@ -3988,6 +4296,26 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: true + /@radix-ui/react-visually-hidden@1.0.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-D4w41yN5YRKtu464TLnByKzMDG/JlMPHtfZgQAu9v6mNakUqGUI9vUrfQKz8NK41VMm/xbZbh76NUTVtIYqOMA==} + peerDependencies: + '@types/react': '*' + '@types/react-dom': '*' + react: ^16.8 || ^17.0 || ^18.0 + react-dom: ^16.8 || ^17.0 || ^18.0 + peerDependenciesMeta: + '@types/react': + optional: true + '@types/react-dom': + optional: true + dependencies: + '@babel/runtime': 7.23.2 + '@radix-ui/react-primitive': 1.0.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@types/react': 18.2.37 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + dev: true + /@radix-ui/rect@1.0.1: resolution: {integrity: sha512-fyrgCaedtvMg9NK3en0pnOYJdtfwxUcNolezkNPUsoX57X8oQk+NkqcvzHXD2uKNij6GXmWU9NDru2IWjrO4BQ==} dependencies: @@ -4031,20 +4359,6 @@ packages: rollup: 4.3.0 dev: true - /@rollup/plugin-image@3.0.3(rollup@4.3.0): - resolution: {integrity: sha512-qXWQwsXpvD4trSb8PeFPFajp8JLpRtqqOeNYRUKnEQNHm7e5UP7fuSRcbjQAJ7wDZBbnJvSdY5ujNBQd9B1iFg==} - engines: {node: '>=14.0.0'} - peerDependencies: - rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 - peerDependenciesMeta: - rollup: - optional: true - dependencies: - '@rollup/pluginutils': 5.0.5(rollup@4.3.0) - mini-svg-data-uri: 1.4.4 - rollup: 4.3.0 - dev: true - /@rollup/plugin-node-resolve@15.2.3(rollup@4.3.0): resolution: {integrity: sha512-j/lym8nf5E21LwBT4Df1VD6hRO2L2iwUeUmP7litikRsVp1H6NWx20NEp0Y7su+7XGc476GnXXc4kFeZNGmaSQ==} engines: {node: '>=14.0.0'} @@ -4071,6 +4385,20 @@ packages: picomatch: 2.3.1 dev: true + /@rollup/pluginutils@5.0.5: + resolution: {integrity: sha512-6aEYR910NyP73oHiJglti74iRyOwgFU4x3meH/H8OJx6Ry0j6cOVZ5X/wTvub7G7Ao6qaHBEaNsV3GLJkSsF+Q==} + engines: {node: '>=14.0.0'} + peerDependencies: + rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 + peerDependenciesMeta: + rollup: + optional: true + dependencies: + '@types/estree': 1.0.2 + estree-walker: 2.0.2 + picomatch: 2.3.1 + dev: true + /@rollup/pluginutils@5.0.5(rollup@4.3.0): resolution: {integrity: sha512-6aEYR910NyP73oHiJglti74iRyOwgFU4x3meH/H8OJx6Ry0j6cOVZ5X/wTvub7G7Ao6qaHBEaNsV3GLJkSsF+Q==} engines: {node: '>=14.0.0'} @@ -4325,6 +4653,37 @@ packages: - '@types/react-dom' dev: true + /@storybook/addon-a11y@7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-Fs6BA4P0xBfsevo8H5E2IhMLLR3Q+FBRWHWAxGzhlkpNeH7ZZd87L5GrrLUmhzbCQvlHdWCVujWkwb21KX7Vsw==} + peerDependencies: + react: ^16.8.0 || ^17.0.0 || ^18.0.0 + react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 + peerDependenciesMeta: + react: + optional: true + react-dom: + optional: true + dependencies: + '@storybook/addon-highlight': 7.5.3 + '@storybook/channels': 7.5.3 + '@storybook/client-logger': 7.5.3 + '@storybook/components': 7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@storybook/core-events': 7.5.3 + '@storybook/global': 5.0.0 + '@storybook/manager-api': 7.5.3(react-dom@18.2.0)(react@18.2.0) + '@storybook/preview-api': 7.5.3 + '@storybook/theming': 7.5.3(react-dom@18.2.0)(react@18.2.0) + '@storybook/types': 7.5.3 + axe-core: 4.7.0 + lodash: 4.17.21 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + react-resize-detector: 7.1.2(react-dom@18.2.0)(react@18.2.0) + transitivePeerDependencies: + - '@types/react' + - '@types/react-dom' + dev: true + /@storybook/addon-actions@7.5.3(@types/react-dom@18.2.15)(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-v3yL6Eq/jCiXfA24JjRdbEQUuorms6tmrywaKcd1tAy4Ftgof0KHB4tTcTyiajrI5bh6PVJoRBkE8IDqmNAHkA==} peerDependencies: @@ -4359,6 +4718,40 @@ packages: - '@types/react-dom' dev: true + /@storybook/addon-actions@7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-v3yL6Eq/jCiXfA24JjRdbEQUuorms6tmrywaKcd1tAy4Ftgof0KHB4tTcTyiajrI5bh6PVJoRBkE8IDqmNAHkA==} + peerDependencies: + react: ^16.8.0 || ^17.0.0 || ^18.0.0 + react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 + peerDependenciesMeta: + react: + optional: true + react-dom: + optional: true + dependencies: + '@storybook/client-logger': 7.5.3 + '@storybook/components': 7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@storybook/core-events': 7.5.3 + '@storybook/global': 5.0.0 + '@storybook/manager-api': 7.5.3(react-dom@18.2.0)(react@18.2.0) + '@storybook/preview-api': 7.5.3 + '@storybook/theming': 7.5.3(react-dom@18.2.0)(react@18.2.0) + '@storybook/types': 7.5.3 + dequal: 2.0.3 + lodash: 4.17.21 + polished: 4.2.2 + prop-types: 15.8.1 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + react-inspector: 6.0.1(react@18.2.0) + telejson: 7.2.0 + ts-dedent: 2.2.0 + uuid: 9.0.1 + transitivePeerDependencies: + - '@types/react' + - '@types/react-dom' + dev: true + /@storybook/addon-backgrounds@7.5.3(@types/react-dom@18.2.15)(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-UCOVd4UNIL5FRiwi9nyiWFocn/7ewwS6bIWnq66AaHg/sv92YwsPmgQJn0DMBGDOvUAWpiHdVsZNOTX6nvw4gA==} peerDependencies: @@ -4387,6 +4780,34 @@ packages: - '@types/react-dom' dev: true + /@storybook/addon-backgrounds@7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-UCOVd4UNIL5FRiwi9nyiWFocn/7ewwS6bIWnq66AaHg/sv92YwsPmgQJn0DMBGDOvUAWpiHdVsZNOTX6nvw4gA==} + peerDependencies: + react: ^16.8.0 || ^17.0.0 || ^18.0.0 + react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 + peerDependenciesMeta: + react: + optional: true + react-dom: + optional: true + dependencies: + '@storybook/client-logger': 7.5.3 + '@storybook/components': 7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@storybook/core-events': 7.5.3 + '@storybook/global': 5.0.0 + '@storybook/manager-api': 7.5.3(react-dom@18.2.0)(react@18.2.0) + '@storybook/preview-api': 7.5.3 + '@storybook/theming': 7.5.3(react-dom@18.2.0)(react@18.2.0) + '@storybook/types': 7.5.3 + memoizerific: 1.11.3 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + ts-dedent: 2.2.0 + transitivePeerDependencies: + - '@types/react' + - '@types/react-dom' + dev: true + /@storybook/addon-controls@7.5.3(@types/react-dom@18.2.15)(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-KEuU4X5Xr6cJI9xrzOUVGEmUf1iHPfK7cj0GACKv0GElsdIsQryv+OZ7gRnvmNax/e2hm2t9cJcFxB24/p6rVg==} peerDependencies: @@ -4419,7 +4840,73 @@ packages: - supports-color dev: true - /@storybook/addon-docs@7.5.3(@types/react-dom@18.2.15)(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): + /@storybook/addon-controls@7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-KEuU4X5Xr6cJI9xrzOUVGEmUf1iHPfK7cj0GACKv0GElsdIsQryv+OZ7gRnvmNax/e2hm2t9cJcFxB24/p6rVg==} + peerDependencies: + react: ^16.8.0 || ^17.0.0 || ^18.0.0 + react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 + peerDependenciesMeta: + react: + optional: true + react-dom: + optional: true + dependencies: + '@storybook/blocks': 7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@storybook/client-logger': 7.5.3 + '@storybook/components': 7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@storybook/core-common': 7.5.3 + '@storybook/core-events': 7.5.3 + '@storybook/manager-api': 7.5.3(react-dom@18.2.0)(react@18.2.0) + '@storybook/node-logger': 7.5.3 + '@storybook/preview-api': 7.5.3 + '@storybook/theming': 7.5.3(react-dom@18.2.0)(react@18.2.0) + '@storybook/types': 7.5.3 + lodash: 4.17.21 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + ts-dedent: 2.2.0 + transitivePeerDependencies: + - '@types/react' + - '@types/react-dom' + - encoding + - supports-color + dev: true + + /@storybook/addon-docs@7.5.3(@types/react-dom@18.2.15)(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-JVQ6iCXKESij/SbE4Wq47dkSSgBRulvA8SUf8NWL5m9qpiHrg0lPSERHfoTLiB5uC/JwF0OKIlhxoWl+zCmtYg==} + peerDependencies: + react: ^16.8.0 || ^17.0.0 || ^18.0.0 + react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 + dependencies: + '@jest/transform': 29.7.0 + '@mdx-js/react': 2.3.0(react@18.2.0) + '@storybook/blocks': 7.5.3(@types/react-dom@18.2.15)(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@storybook/client-logger': 7.5.3 + '@storybook/components': 7.5.3(@types/react-dom@18.2.15)(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@storybook/csf-plugin': 7.5.3 + '@storybook/csf-tools': 7.5.3 + '@storybook/global': 5.0.0 + '@storybook/mdx2-csf': 1.1.0 + '@storybook/node-logger': 7.5.3 + '@storybook/postinstall': 7.5.3 + '@storybook/preview-api': 7.5.3 + '@storybook/react-dom-shim': 7.5.3(react-dom@18.2.0)(react@18.2.0) + '@storybook/theming': 7.5.3(react-dom@18.2.0)(react@18.2.0) + '@storybook/types': 7.5.3 + fs-extra: 11.1.1 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + remark-external-links: 8.0.0 + remark-slug: 6.1.0 + ts-dedent: 2.2.0 + transitivePeerDependencies: + - '@types/react' + - '@types/react-dom' + - encoding + - supports-color + dev: true + + /@storybook/addon-docs@7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-JVQ6iCXKESij/SbE4Wq47dkSSgBRulvA8SUf8NWL5m9qpiHrg0lPSERHfoTLiB5uC/JwF0OKIlhxoWl+zCmtYg==} peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 @@ -4427,9 +4914,9 @@ packages: dependencies: '@jest/transform': 29.7.0 '@mdx-js/react': 2.3.0(react@18.2.0) - '@storybook/blocks': 7.5.3(@types/react-dom@18.2.15)(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@storybook/blocks': 7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) '@storybook/client-logger': 7.5.3 - '@storybook/components': 7.5.3(@types/react-dom@18.2.15)(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@storybook/components': 7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) '@storybook/csf-plugin': 7.5.3 '@storybook/csf-tools': 7.5.3 '@storybook/global': 5.0.0 @@ -4482,6 +4969,35 @@ packages: - supports-color dev: true + /@storybook/addon-essentials@7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-PYj6swEI4nEzIbOTyHJB8u3K8ABYKoaW8XB5emMwsnrzB/TN7auHVhze2bQ/+ax5wyPKZpArPjxbWlSHtSws+A==} + peerDependencies: + react: ^16.8.0 || ^17.0.0 || ^18.0.0 + react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 + dependencies: + '@storybook/addon-actions': 7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@storybook/addon-backgrounds': 7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@storybook/addon-controls': 7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@storybook/addon-docs': 7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@storybook/addon-highlight': 7.5.3 + '@storybook/addon-measure': 7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@storybook/addon-outline': 7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@storybook/addon-toolbars': 7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@storybook/addon-viewport': 7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@storybook/core-common': 7.5.3 + '@storybook/manager-api': 7.5.3(react-dom@18.2.0)(react@18.2.0) + '@storybook/node-logger': 7.5.3 + '@storybook/preview-api': 7.5.3 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + ts-dedent: 2.2.0 + transitivePeerDependencies: + - '@types/react' + - '@types/react-dom' + - encoding + - supports-color + dev: true + /@storybook/addon-highlight@7.5.3: resolution: {integrity: sha512-jb+aNRhj+tFK7EqqTlNCjGkTrkWqWHGdD1ubgnj29v8XhRuCR9YboPS+306KYwBEkuF4kNCHZofLiEBPf6nCJg==} dependencies: @@ -4523,6 +5039,39 @@ packages: - supports-color dev: true + /@storybook/addon-interactions@7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-gD3cU8sYSM/mdbA9ooYIb4c689JkDsJbZ17vfYJ5RjNkSmqKehybdpZOfkj27sVIyFtmscSi75t+pzK4Pv4rZw==} + peerDependencies: + react: ^16.8.0 || ^17.0.0 || ^18.0.0 + react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 + peerDependenciesMeta: + react: + optional: true + react-dom: + optional: true + dependencies: + '@storybook/client-logger': 7.5.3 + '@storybook/components': 7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@storybook/core-common': 7.5.3 + '@storybook/core-events': 7.5.3 + '@storybook/global': 5.0.0 + '@storybook/instrumenter': 7.5.3 + '@storybook/manager-api': 7.5.3(react-dom@18.2.0)(react@18.2.0) + '@storybook/preview-api': 7.5.3 + '@storybook/theming': 7.5.3(react-dom@18.2.0)(react@18.2.0) + '@storybook/types': 7.5.3 + jest-mock: 27.5.1 + polished: 4.2.2 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + ts-dedent: 2.2.0 + transitivePeerDependencies: + - '@types/react' + - '@types/react-dom' + - encoding + - supports-color + dev: true + /@storybook/addon-links@7.5.3(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-NcigW0HX8AllZ/KJ4u1KMiK30QvjqtC+zApI6Yc3tTaa6+BldbLv06fEgHgMY0yC8R+Ly9mUN7S1HiU7LQ7Qxg==} peerDependencies: @@ -4574,6 +5123,32 @@ packages: - '@types/react-dom' dev: true + /@storybook/addon-measure@7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-fun9BqUTGXgcMpcbX9wUowGDkjCL8oKasZbjp/MvGM3vPTM6HQdwzHTLJGPBnmJ1xK92NhwFRs0BrQX6uF1yrg==} + peerDependencies: + react: ^16.8.0 || ^17.0.0 || ^18.0.0 + react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 + peerDependenciesMeta: + react: + optional: true + react-dom: + optional: true + dependencies: + '@storybook/client-logger': 7.5.3 + '@storybook/components': 7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@storybook/core-events': 7.5.3 + '@storybook/global': 5.0.0 + '@storybook/manager-api': 7.5.3(react-dom@18.2.0)(react@18.2.0) + '@storybook/preview-api': 7.5.3 + '@storybook/types': 7.5.3 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + tiny-invariant: 1.3.1 + transitivePeerDependencies: + - '@types/react' + - '@types/react-dom' + dev: true + /@storybook/addon-outline@7.5.3(@types/react-dom@18.2.15)(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-c9vCi1SCGrtWr8qaOu/1GNWlrlrpl2lg4F9r+xtYf/KopenI3jSMz0YeTfmepZGAl+6Yc2Ywhm60jgpQ6SKciA==} peerDependencies: @@ -4600,6 +5175,32 @@ packages: - '@types/react-dom' dev: true + /@storybook/addon-outline@7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-c9vCi1SCGrtWr8qaOu/1GNWlrlrpl2lg4F9r+xtYf/KopenI3jSMz0YeTfmepZGAl+6Yc2Ywhm60jgpQ6SKciA==} + peerDependencies: + react: ^16.8.0 || ^17.0.0 || ^18.0.0 + react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 + peerDependenciesMeta: + react: + optional: true + react-dom: + optional: true + dependencies: + '@storybook/client-logger': 7.5.3 + '@storybook/components': 7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@storybook/core-events': 7.5.3 + '@storybook/global': 5.0.0 + '@storybook/manager-api': 7.5.3(react-dom@18.2.0)(react@18.2.0) + '@storybook/preview-api': 7.5.3 + '@storybook/types': 7.5.3 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + ts-dedent: 2.2.0 + transitivePeerDependencies: + - '@types/react' + - '@types/react-dom' + dev: true + /@storybook/addon-toolbars@7.5.3(@types/react-dom@18.2.15)(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-KdLr4sGMJzhtjNTNE2ocfu58yOHHUyZ/cI3BTp7a0gq9YbUpHmC3XTNr26/yOYYrdjkiMD26XusJUjXe+/V2xw==} peerDependencies: @@ -4623,6 +5224,29 @@ packages: - '@types/react-dom' dev: true + /@storybook/addon-toolbars@7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-KdLr4sGMJzhtjNTNE2ocfu58yOHHUyZ/cI3BTp7a0gq9YbUpHmC3XTNr26/yOYYrdjkiMD26XusJUjXe+/V2xw==} + peerDependencies: + react: ^16.8.0 || ^17.0.0 || ^18.0.0 + react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 + peerDependenciesMeta: + react: + optional: true + react-dom: + optional: true + dependencies: + '@storybook/client-logger': 7.5.3 + '@storybook/components': 7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@storybook/manager-api': 7.5.3(react-dom@18.2.0)(react@18.2.0) + '@storybook/preview-api': 7.5.3 + '@storybook/theming': 7.5.3(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + transitivePeerDependencies: + - '@types/react' + - '@types/react-dom' + dev: true + /@storybook/addon-viewport@7.5.3(@types/react-dom@18.2.15)(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-gT2XX0NNBrzSs1nrxadl6LnvcwgN7z2R0LzTK8/hxvx4D0EnXrV3feXLzjewr8ZYjzfEeSpO+W+bQTVNm3fNsg==} peerDependencies: @@ -4650,6 +5274,33 @@ packages: - '@types/react-dom' dev: true + /@storybook/addon-viewport@7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-gT2XX0NNBrzSs1nrxadl6LnvcwgN7z2R0LzTK8/hxvx4D0EnXrV3feXLzjewr8ZYjzfEeSpO+W+bQTVNm3fNsg==} + peerDependencies: + react: ^16.8.0 || ^17.0.0 || ^18.0.0 + react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 + peerDependenciesMeta: + react: + optional: true + react-dom: + optional: true + dependencies: + '@storybook/client-logger': 7.5.3 + '@storybook/components': 7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@storybook/core-events': 7.5.3 + '@storybook/global': 5.0.0 + '@storybook/manager-api': 7.5.3(react-dom@18.2.0)(react@18.2.0) + '@storybook/preview-api': 7.5.3 + '@storybook/theming': 7.5.3(react-dom@18.2.0)(react@18.2.0) + memoizerific: 1.11.3 + prop-types: 15.8.1 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + transitivePeerDependencies: + - '@types/react' + - '@types/react-dom' + dev: true + /@storybook/addons@7.5.3(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-1JDndMZ/Pju4YJ4aXegeF0O6BVT19c+Gu7WOlsD0aHbmAsPK5qH9QvcpR04nby6VrVZYtBOEJhGsWtAytzLVZw==} peerDependencies: @@ -4718,6 +5369,44 @@ packages: - supports-color dev: true + /@storybook/blocks@7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-Z8yF820v78clQWkwG5OA5qugbQn7rtutq9XCsd03NDB+IEfDaTFQAZG8gs62ZX2ZaXAJsqJSr/mL9oURzXto2A==} + peerDependencies: + react: ^16.8.0 || ^17.0.0 || ^18.0.0 + react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 + dependencies: + '@storybook/channels': 7.5.3 + '@storybook/client-logger': 7.5.3 + '@storybook/components': 7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@storybook/core-events': 7.5.3 + '@storybook/csf': 0.1.0 + '@storybook/docs-tools': 7.5.3 + '@storybook/global': 5.0.0 + '@storybook/manager-api': 7.5.3(react-dom@18.2.0)(react@18.2.0) + '@storybook/preview-api': 7.5.3 + '@storybook/theming': 7.5.3(react-dom@18.2.0)(react@18.2.0) + '@storybook/types': 7.5.3 + '@types/lodash': 4.14.201 + color-convert: 2.0.1 + dequal: 2.0.3 + lodash: 4.17.21 + markdown-to-jsx: 7.2.0(react@18.2.0) + memoizerific: 1.11.3 + polished: 4.2.2 + react: 18.2.0 + react-colorful: 5.6.1(react-dom@18.2.0)(react@18.2.0) + react-dom: 18.2.0(react@18.2.0) + telejson: 7.2.0 + tocbot: 4.21.0 + ts-dedent: 2.2.0 + util-deprecate: 1.0.2 + transitivePeerDependencies: + - '@types/react' + - '@types/react-dom' + - encoding + - supports-color + dev: true + /@storybook/builder-manager@7.5.3: resolution: {integrity: sha512-uf4Vyj8ofHaq94m065SMvFKak1XrrxgI83VZAxc2QjiPcbRwcVOZd+wcKFdZydqqA6FlBDdJrU+k9INA4Qkfcw==} dependencies: @@ -4774,7 +5463,7 @@ packages: magic-string: 0.30.5 rollup: 3.29.4 typescript: 5.2.2 - vite: 4.5.0(@types/node@20.9.0)(sass@1.69.5) + vite: 4.5.0 transitivePeerDependencies: - encoding - supports-color @@ -4893,6 +5582,29 @@ packages: - '@types/react-dom' dev: true + /@storybook/components@7.5.3(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-M3+cjvEsDGLUx8RvK5wyF6/13LNlUnKbMgiDE8Sxk/v/WPpyhOAIh/B8VmrU1psahS61Jd4MTkFmLf1cWau1vw==} + peerDependencies: + react: ^16.8.0 || ^17.0.0 || ^18.0.0 + react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 + dependencies: + '@radix-ui/react-select': 1.2.2(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-toolbar': 1.0.4(@types/react@18.2.37)(react-dom@18.2.0)(react@18.2.0) + '@storybook/client-logger': 7.5.3 + '@storybook/csf': 0.1.0 + '@storybook/global': 5.0.0 + '@storybook/theming': 7.5.3(react-dom@18.2.0)(react@18.2.0) + '@storybook/types': 7.5.3 + memoizerific: 1.11.3 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + use-resize-observer: 9.1.0(react-dom@18.2.0)(react@18.2.0) + util-deprecate: 1.0.2 + transitivePeerDependencies: + - '@types/react' + - '@types/react-dom' + dev: true + /@storybook/core-client@7.5.3: resolution: {integrity: sha512-sIviDytbhos02TVXxU8XLymzty7IAtLs5e16hv49JSdBp47iBajRaNBmBj/l+sgTH+3M+R6gP8yGFMsZSCnU2g==} dependencies: @@ -5134,7 +5846,7 @@ packages: vite: ^3.0.0 || ^4.0.0 || ^5.0.0 dependencies: '@joshwooding/vite-plugin-react-docgen-typescript': 0.3.0(typescript@5.2.2)(vite@4.5.0) - '@rollup/pluginutils': 5.0.5(rollup@4.3.0) + '@rollup/pluginutils': 5.0.5 '@storybook/builder-vite': 7.5.3(typescript@5.2.2)(vite@4.5.0) '@storybook/react': 7.5.3(react-dom@18.2.0)(react@18.2.0)(typescript@5.2.2) '@vitejs/plugin-react': 3.1.0(vite@4.5.0) @@ -5142,7 +5854,7 @@ packages: react: 18.2.0 react-docgen: 6.0.4 react-dom: 18.2.0(react@18.2.0) - vite: 4.5.0(@types/node@20.9.0)(sass@1.69.5) + vite: 4.5.0 transitivePeerDependencies: - '@preact/preset-vite' - encoding @@ -5372,6 +6084,20 @@ packages: - supports-color dev: true + /@svgr/core@8.1.0(typescript@5.2.2): + resolution: {integrity: sha512-8QqtOQT5ACVlmsvKOJNEaWmRPmcojMOzCz4Hs2BGG/toAp/K38LcsMRyLp349glq5AzJbCEeimEoxaX6v/fLrA==} + engines: {node: '>=14'} + dependencies: + '@babel/core': 7.23.2 + '@svgr/babel-preset': 8.1.0(@babel/core@7.23.2) + camelcase: 6.3.0 + cosmiconfig: 8.3.6(typescript@5.2.2) + snake-case: 3.0.4 + transitivePeerDependencies: + - supports-color + - typescript + dev: true + /@svgr/hast-util-to-babel-ast@8.0.0: resolution: {integrity: sha512-EbDKwO9GpfWP4jN9sGdYwPBU0kdomaPIL2Eu4YwmgP+sJeXT+L7bMwJUBnhzfH8Q2qMBqZ4fJwpCyYsAN3mt2Q==} engines: {node: '>=14'} @@ -5388,7 +6114,7 @@ packages: dependencies: '@babel/core': 7.23.2 '@svgr/babel-preset': 8.1.0(@babel/core@7.23.2) - '@svgr/core': 8.1.0 + '@svgr/core': 8.1.0(typescript@5.2.2) '@svgr/hast-util-to-babel-ast': 8.0.0 svg-parser: 2.0.4 transitivePeerDependencies: @@ -5470,7 +6196,7 @@ packages: chalk: 3.0.0 css.escape: 1.5.1 dom-accessibility-api: 0.5.16 - jest: 29.7.0(@types/node@20.9.0) + jest: 29.7.0 lodash: 4.17.21 redent: 3.0.0 dev: true @@ -6166,7 +6892,7 @@ packages: '@babel/plugin-transform-react-jsx-source': 7.22.5(@babel/core@7.23.2) magic-string: 0.27.0 react-refresh: 0.14.0 - vite: 4.5.0(@types/node@20.9.0)(sass@1.69.5) + vite: 4.5.0 transitivePeerDependencies: - supports-color dev: true @@ -6182,7 +6908,7 @@ packages: '@babel/plugin-transform-react-jsx-source': 7.22.5(@babel/core@7.23.2) '@types/babel__core': 7.20.4 react-refresh: 0.14.0 - vite: 4.5.0(@types/node@20.9.0)(sass@1.69.5) + vite: 4.5.0 transitivePeerDependencies: - supports-color dev: true @@ -7806,7 +8532,7 @@ packages: typescript: 5.2.2 dev: true - /create-jest@29.7.0(@types/node@20.9.0): + /create-jest@29.7.0: resolution: {integrity: sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: @@ -11027,7 +11753,7 @@ packages: - supports-color dev: true - /jest-cli@29.7.0(@types/node@20.9.0): + /jest-cli@29.7.0: resolution: {integrity: sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} hasBin: true @@ -11041,7 +11767,7 @@ packages: '@jest/test-result': 29.7.0 '@jest/types': 29.6.3 chalk: 4.1.2 - create-jest: 29.7.0(@types/node@20.9.0) + create-jest: 29.7.0 exit: 0.1.2 import-local: 3.1.0 jest-config: 29.7.0(@types/node@20.9.0) @@ -11409,7 +12135,7 @@ packages: supports-color: 8.1.1 dev: true - /jest@29.7.0(@types/node@20.9.0): + /jest@29.7.0: resolution: {integrity: sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} hasBin: true @@ -11422,7 +12148,7 @@ packages: '@jest/core': 29.7.0 '@jest/types': 29.6.3 import-local: 3.1.0 - jest-cli: 29.7.0(@types/node@20.9.0) + jest-cli: 29.7.0 transitivePeerDependencies: - '@types/node' - babel-plugin-macros @@ -12826,11 +13552,6 @@ packages: engines: {node: '>=4'} dev: true - /mini-svg-data-uri@1.4.4: - resolution: {integrity: sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg==} - hasBin: true - dev: true - /minimatch@3.1.2: resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} dependencies: @@ -17090,6 +17811,41 @@ packages: unist-util-stringify-position: 3.0.3 vfile-message: 3.1.4 + /vite@4.5.0: + resolution: {integrity: sha512-ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw==} + engines: {node: ^14.18.0 || >=16.0.0} + hasBin: true + peerDependencies: + '@types/node': '>= 14' + less: '*' + lightningcss: ^1.21.0 + sass: '*' + stylus: '*' + sugarss: '*' + terser: ^5.4.0 + peerDependenciesMeta: + '@types/node': + optional: true + less: + optional: true + lightningcss: + optional: true + sass: + optional: true + stylus: + optional: true + sugarss: + optional: true + terser: + optional: true + dependencies: + esbuild: 0.18.12 + postcss: 8.4.31 + rollup: 3.29.4 + optionalDependencies: + fsevents: 2.3.3 + dev: true + /vite@4.5.0(@types/node@20.9.0)(sass@1.69.5): resolution: {integrity: sha512-ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw==} engines: {node: ^14.18.0 || >=16.0.0} diff --git a/proprietary/assets/logo/amsterdam.svg b/proprietary/assets/logo/amsterdam.svg index 7fca3dca85..7c36db3540 100644 --- a/proprietary/assets/logo/amsterdam.svg +++ b/proprietary/assets/logo/amsterdam.svg @@ -1 +1,4 @@ - + + Gemeente Amsterdam + + diff --git a/proprietary/assets/logo/ggd-amsterdam.svg b/proprietary/assets/logo/ggd-amsterdam.svg index ceccf46a90..11d4a94ec2 100644 --- a/proprietary/assets/logo/ggd-amsterdam.svg +++ b/proprietary/assets/logo/ggd-amsterdam.svg @@ -1,17 +1,5 @@ - - - - - - - - - - - - - - - - + + GGD Amsterdam + + diff --git a/proprietary/assets/logo/stadsarchief.svg b/proprietary/assets/logo/stadsarchief.svg index fbb33f4b60..4303fa8ebe 100644 --- a/proprietary/assets/logo/stadsarchief.svg +++ b/proprietary/assets/logo/stadsarchief.svg @@ -1,34 +1,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + Stadsarchief + + diff --git a/proprietary/assets/logo/stadsbank-lening.svg b/proprietary/assets/logo/stadsbank-lening.svg deleted file mode 100644 index 11fc94e095..0000000000 --- a/proprietary/assets/logo/stadsbank-lening.svg +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/proprietary/assets/logo/stadsbank-van-lening.svg b/proprietary/assets/logo/stadsbank-van-lening.svg new file mode 100644 index 0000000000..55e1c29e2f --- /dev/null +++ b/proprietary/assets/logo/stadsbank-van-lening.svg @@ -0,0 +1,5 @@ + + Stadsbank van Lening + + + diff --git a/proprietary/assets/logo/vga-verzekeringen.svg b/proprietary/assets/logo/vga-verzekeringen.svg index 56d61977d8..12fdf92312 100644 --- a/proprietary/assets/logo/vga-verzekeringen.svg +++ b/proprietary/assets/logo/vga-verzekeringen.svg @@ -1,38 +1,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + VGA Verzekeringen + + diff --git a/storybook/storybook-react/src/Logo/Logo.docs.mdx b/storybook/storybook-react/src/Logo/Logo.docs.mdx index 483d3dd471..f82f1fc595 100644 --- a/storybook/storybook-react/src/Logo/Logo.docs.mdx +++ b/storybook/storybook-react/src/Logo/Logo.docs.mdx @@ -20,7 +20,7 @@ import README from "../../../../packages/css/src/logo/README.md?raw"; ## Stadsbank van Lening - + ## VGA Verzekeringen diff --git a/storybook/storybook-react/src/Logo/Logo.stories.tsx b/storybook/storybook-react/src/Logo/Logo.stories.tsx index dbeb078abb..fb8306c919 100644 --- a/storybook/storybook-react/src/Logo/Logo.stories.tsx +++ b/storybook/storybook-react/src/Logo/Logo.stories.tsx @@ -14,7 +14,7 @@ const meta = { control: { type: 'select', }, - options: ['amsterdam', 'ggd-amsterdam', 'stadsarchief', 'stadsbank-lening', 'vga-verzekeringen'], + options: ['amsterdam', 'ggd-amsterdam', 'stadsarchief', 'stadsbank-van-lening', 'vga-verzekeringen'], }, }, } satisfies Meta @@ -37,9 +37,9 @@ export const Stadsarchief: Story = { }, } -export const StadsbankLening: Story = { +export const StadsbankVanLening: Story = { args: { - variant: 'stadsbank-lening', + variant: 'stadsbank-van-lening', }, } From 634e5434e0e5996d8745d3586bf17603a5a37b1c Mon Sep 17 00:00:00 2001 From: Niels Roozemond Date: Wed, 15 Nov 2023 11:52:55 +0100 Subject: [PATCH 10/33] Role IMG for svg's --- proprietary/assets/logo/amsterdam.svg | 2 +- proprietary/assets/logo/ggd-amsterdam.svg | 2 +- proprietary/assets/logo/stadsarchief.svg | 2 +- proprietary/assets/logo/stadsbank-van-lening.svg | 2 +- proprietary/assets/logo/vga-verzekeringen.svg | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/proprietary/assets/logo/amsterdam.svg b/proprietary/assets/logo/amsterdam.svg index 7c36db3540..0d40299436 100644 --- a/proprietary/assets/logo/amsterdam.svg +++ b/proprietary/assets/logo/amsterdam.svg @@ -1,4 +1,4 @@ - + Gemeente Amsterdam diff --git a/proprietary/assets/logo/ggd-amsterdam.svg b/proprietary/assets/logo/ggd-amsterdam.svg index 11d4a94ec2..6b990da982 100644 --- a/proprietary/assets/logo/ggd-amsterdam.svg +++ b/proprietary/assets/logo/ggd-amsterdam.svg @@ -1,4 +1,4 @@ - + GGD Amsterdam diff --git a/proprietary/assets/logo/stadsarchief.svg b/proprietary/assets/logo/stadsarchief.svg index 4303fa8ebe..0a54108051 100644 --- a/proprietary/assets/logo/stadsarchief.svg +++ b/proprietary/assets/logo/stadsarchief.svg @@ -1,4 +1,4 @@ - + Stadsarchief diff --git a/proprietary/assets/logo/stadsbank-van-lening.svg b/proprietary/assets/logo/stadsbank-van-lening.svg index 55e1c29e2f..368b2f456e 100644 --- a/proprietary/assets/logo/stadsbank-van-lening.svg +++ b/proprietary/assets/logo/stadsbank-van-lening.svg @@ -1,4 +1,4 @@ - + Stadsbank van Lening diff --git a/proprietary/assets/logo/vga-verzekeringen.svg b/proprietary/assets/logo/vga-verzekeringen.svg index 12fdf92312..47f76fa91c 100644 --- a/proprietary/assets/logo/vga-verzekeringen.svg +++ b/proprietary/assets/logo/vga-verzekeringen.svg @@ -1,4 +1,4 @@ - + VGA Verzekeringen From 97dd99f4cd0b6ecd02a78fa6ecbe1907fc4feef4 Mon Sep 17 00:00:00 2001 From: Niels Roozemond Date: Wed, 15 Nov 2023 11:56:14 +0100 Subject: [PATCH 11/33] Role for component --- packages/react/src/Logo/LogoAmsterdam.tsx | 2 +- packages/react/src/Logo/LogoGgdAmsterdam.tsx | 2 +- packages/react/src/Logo/LogoStadsarchief.tsx | 2 +- packages/react/src/Logo/LogoStadsbankVanLening.tsx | 2 +- packages/react/src/Logo/LogoVgaVerzekeringen.tsx | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/react/src/Logo/LogoAmsterdam.tsx b/packages/react/src/Logo/LogoAmsterdam.tsx index 69c2fb0012..dc8e3c830c 100644 --- a/packages/react/src/Logo/LogoAmsterdam.tsx +++ b/packages/react/src/Logo/LogoAmsterdam.tsx @@ -1,6 +1,6 @@ import type { SVGProps } from 'react' const LogoAmsterdam = (props: SVGProps) => ( - + Gemeente Amsterdam ) => ( - + GGD Amsterdam ) => ( - + Stadsarchief ) => ( - + Stadsbank van Lening ) => ( - + VGA Verzekeringen Date: Wed, 15 Nov 2023 12:01:26 +0100 Subject: [PATCH 12/33] Deleted empty tokens --- proprietary/tokens/src/components/amsterdam/logo.tokens.json | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 proprietary/tokens/src/components/amsterdam/logo.tokens.json diff --git a/proprietary/tokens/src/components/amsterdam/logo.tokens.json b/proprietary/tokens/src/components/amsterdam/logo.tokens.json deleted file mode 100644 index 07dd027c69..0000000000 --- a/proprietary/tokens/src/components/amsterdam/logo.tokens.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "amsterdam": { - "logo": {} - } -} From 7616b25cbc57efbca127095dd34f474dc8cbe055 Mon Sep 17 00:00:00 2001 From: Vincent Smedinga Date: Wed, 15 Nov 2023 12:20:21 +0100 Subject: [PATCH 13/33] Remove unwanted whitespace --- packages/css/src/logo/logo.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/css/src/logo/logo.scss b/packages/css/src/logo/logo.scss index c1214703ed..93a00badd0 100644 --- a/packages/css/src/logo/logo.scss +++ b/packages/css/src/logo/logo.scss @@ -8,6 +8,7 @@ svg { height: 40px; + vertical-align: middle; width: auto; } } From 16eb093a75e18f44e62a99346849ae5689a2532c Mon Sep 17 00:00:00 2001 From: Vincent Smedinga Date: Wed, 15 Nov 2023 12:35:52 +0100 Subject: [PATCH 14/33] Style a class rather than a child element --- packages/css/src/logo/logo.scss | 10 +++++----- packages/react/src/Logo/LogoAmsterdam.tsx | 2 +- packages/react/src/Logo/LogoGgdAmsterdam.tsx | 9 ++++++++- packages/react/src/Logo/LogoStadsarchief.tsx | 9 ++++++++- packages/react/src/Logo/LogoStadsbankVanLening.tsx | 9 ++++++++- packages/react/src/Logo/LogoVgaVerzekeringen.tsx | 9 ++++++++- proprietary/assets/logo/amsterdam.svg | 2 +- proprietary/assets/logo/ggd-amsterdam.svg | 2 +- proprietary/assets/logo/stadsarchief.svg | 2 +- proprietary/assets/logo/stadsbank-van-lening.svg | 2 +- proprietary/assets/logo/vga-verzekeringen.svg | 2 +- 11 files changed, 43 insertions(+), 15 deletions(-) diff --git a/packages/css/src/logo/logo.scss b/packages/css/src/logo/logo.scss index 93a00badd0..4c659a224e 100644 --- a/packages/css/src/logo/logo.scss +++ b/packages/css/src/logo/logo.scss @@ -5,10 +5,10 @@ .amsterdam-logo { display: inline-block; +} - svg { - height: 40px; - vertical-align: middle; - width: auto; - } +.amsterdam-logo__image { + height: 40px; + vertical-align: middle; + width: auto; } diff --git a/packages/react/src/Logo/LogoAmsterdam.tsx b/packages/react/src/Logo/LogoAmsterdam.tsx index dc8e3c830c..816744a49a 100644 --- a/packages/react/src/Logo/LogoAmsterdam.tsx +++ b/packages/react/src/Logo/LogoAmsterdam.tsx @@ -1,6 +1,6 @@ import type { SVGProps } from 'react' const LogoAmsterdam = (props: SVGProps) => ( - + Gemeente Amsterdam ) => ( - + GGD Amsterdam ) => ( - + Stadsarchief ) => ( - + Stadsbank van Lening ) => ( - + VGA Verzekeringen + Gemeente Amsterdam diff --git a/proprietary/assets/logo/ggd-amsterdam.svg b/proprietary/assets/logo/ggd-amsterdam.svg index 6b990da982..9bf1faade3 100644 --- a/proprietary/assets/logo/ggd-amsterdam.svg +++ b/proprietary/assets/logo/ggd-amsterdam.svg @@ -1,4 +1,4 @@ - + GGD Amsterdam diff --git a/proprietary/assets/logo/stadsarchief.svg b/proprietary/assets/logo/stadsarchief.svg index 0a54108051..7b42e9ef82 100644 --- a/proprietary/assets/logo/stadsarchief.svg +++ b/proprietary/assets/logo/stadsarchief.svg @@ -1,4 +1,4 @@ - + Stadsarchief diff --git a/proprietary/assets/logo/stadsbank-van-lening.svg b/proprietary/assets/logo/stadsbank-van-lening.svg index 368b2f456e..5be1ae7754 100644 --- a/proprietary/assets/logo/stadsbank-van-lening.svg +++ b/proprietary/assets/logo/stadsbank-van-lening.svg @@ -1,4 +1,4 @@ - + Stadsbank van Lening diff --git a/proprietary/assets/logo/vga-verzekeringen.svg b/proprietary/assets/logo/vga-verzekeringen.svg index 47f76fa91c..578f9bbbbf 100644 --- a/proprietary/assets/logo/vga-verzekeringen.svg +++ b/proprietary/assets/logo/vga-verzekeringen.svg @@ -1,4 +1,4 @@ - + VGA Verzekeringen From 910260d632d46a92c93b8eb1536743580df3f2bd Mon Sep 17 00:00:00 2001 From: Vincent Smedinga Date: Wed, 15 Nov 2023 12:39:11 +0100 Subject: [PATCH 15/33] Add whitespace and sort attributes --- packages/react/src/Logo/LogoAmsterdam.tsx | 16 +++++++++++----- packages/react/src/Logo/LogoGgdAmsterdam.tsx | 6 ++++-- packages/react/src/Logo/LogoStadsarchief.tsx | 6 ++++-- .../react/src/Logo/LogoStadsbankVanLening.tsx | 6 ++++-- packages/react/src/Logo/LogoVgaVerzekeringen.tsx | 6 ++++-- 5 files changed, 27 insertions(+), 13 deletions(-) diff --git a/packages/react/src/Logo/LogoAmsterdam.tsx b/packages/react/src/Logo/LogoAmsterdam.tsx index 816744a49a..c53a5b4d42 100644 --- a/packages/react/src/Logo/LogoAmsterdam.tsx +++ b/packages/react/src/Logo/LogoAmsterdam.tsx @@ -1,11 +1,17 @@ import type { SVGProps } from 'react' + const LogoAmsterdam = (props: SVGProps) => ( - + Gemeente Amsterdam - + ) + export default LogoAmsterdam diff --git a/packages/react/src/Logo/LogoGgdAmsterdam.tsx b/packages/react/src/Logo/LogoGgdAmsterdam.tsx index 77f8cd8b07..5cbe396f29 100644 --- a/packages/react/src/Logo/LogoGgdAmsterdam.tsx +++ b/packages/react/src/Logo/LogoGgdAmsterdam.tsx @@ -1,11 +1,12 @@ import type { SVGProps } from 'react' + const LogoGgdAmsterdam = (props: SVGProps) => ( GGD Amsterdam @@ -19,4 +20,5 @@ const LogoGgdAmsterdam = (props: SVGProps) => ( /> ) + export default LogoGgdAmsterdam diff --git a/packages/react/src/Logo/LogoStadsarchief.tsx b/packages/react/src/Logo/LogoStadsarchief.tsx index 61cd28778c..d1642a64d3 100644 --- a/packages/react/src/Logo/LogoStadsarchief.tsx +++ b/packages/react/src/Logo/LogoStadsarchief.tsx @@ -1,11 +1,12 @@ import type { SVGProps } from 'react' + const LogoStadsarchief = (props: SVGProps) => ( Stadsarchief @@ -19,4 +20,5 @@ const LogoStadsarchief = (props: SVGProps) => ( /> ) + export default LogoStadsarchief diff --git a/packages/react/src/Logo/LogoStadsbankVanLening.tsx b/packages/react/src/Logo/LogoStadsbankVanLening.tsx index 8b329fb2e5..9110db34d8 100644 --- a/packages/react/src/Logo/LogoStadsbankVanLening.tsx +++ b/packages/react/src/Logo/LogoStadsbankVanLening.tsx @@ -1,11 +1,12 @@ import type { SVGProps } from 'react' + const LogoStadsbankVanLening = (props: SVGProps) => ( Stadsbank van Lening @@ -19,4 +20,5 @@ const LogoStadsbankVanLening = (props: SVGProps) => ( /> ) + export default LogoStadsbankVanLening diff --git a/packages/react/src/Logo/LogoVgaVerzekeringen.tsx b/packages/react/src/Logo/LogoVgaVerzekeringen.tsx index 8d27eb2787..97c6e7edeb 100644 --- a/packages/react/src/Logo/LogoVgaVerzekeringen.tsx +++ b/packages/react/src/Logo/LogoVgaVerzekeringen.tsx @@ -1,11 +1,12 @@ import type { SVGProps } from 'react' + const LogoVgaVerzekeringen = (props: SVGProps) => ( VGA Verzekeringen @@ -19,4 +20,5 @@ const LogoVgaVerzekeringen = (props: SVGProps) => ( /> ) + export default LogoVgaVerzekeringen From 43aa5f7669f3489b2af471010dae38164a141ec0 Mon Sep 17 00:00:00 2001 From: Vincent Smedinga Date: Wed, 15 Nov 2023 13:07:39 +0100 Subject: [PATCH 16/33] Replace hardcoded color codes with design tokens --- packages/css/src/logo/logo.scss | 25 +++++++++++++++++++ packages/react/src/Logo/LogoAmsterdam.tsx | 14 ++++------- packages/react/src/Logo/LogoGgdAmsterdam.tsx | 13 +++------- packages/react/src/Logo/LogoStadsarchief.tsx | 13 +++------- .../react/src/Logo/LogoStadsbankVanLening.tsx | 13 +++------- .../react/src/Logo/LogoVgaVerzekeringen.tsx | 13 +++------- proprietary/assets/logo/amsterdam.svg | 4 ++- proprietary/assets/logo/ggd-amsterdam.svg | 10 +++++--- proprietary/assets/logo/stadsarchief.svg | 10 +++++--- .../assets/logo/stadsbank-van-lening.svg | 10 +++++--- proprietary/assets/logo/vga-verzekeringen.svg | 10 +++++--- 11 files changed, 73 insertions(+), 62 deletions(-) diff --git a/packages/css/src/logo/logo.scss b/packages/css/src/logo/logo.scss index 4c659a224e..00177b672b 100644 --- a/packages/css/src/logo/logo.scss +++ b/packages/css/src/logo/logo.scss @@ -12,3 +12,28 @@ vertical-align: middle; width: auto; } + +/** @deprecated */ +.amsterdam-logo--color-black { + fill: var(--amsterdam-color-primary-black); +} + +/** @deprecated */ +.amsterdam-logo--color-red { + fill: var(--amsterdam-color-primary-red); +} + +// Three classes below for future use +// Maybe even better: .amsterdam-svg__* + +.amsterdam-logo__emblem { + fill: var(--amsterdam-color-primary-red); +} + +.amsterdam-logo__text--primary { + fill: var(--amsterdam-color-primary-red); +} + +.amsterdam-logo__text--secondary { + fill: var(--amsterdam-color-primary-black); +} diff --git a/packages/react/src/Logo/LogoAmsterdam.tsx b/packages/react/src/Logo/LogoAmsterdam.tsx index c53a5b4d42..adb9118caf 100644 --- a/packages/react/src/Logo/LogoAmsterdam.tsx +++ b/packages/react/src/Logo/LogoAmsterdam.tsx @@ -1,16 +1,12 @@ import type { SVGProps } from 'react' const LogoAmsterdam = (props: SVGProps) => ( - + Gemeente Amsterdam - + ) diff --git a/packages/react/src/Logo/LogoGgdAmsterdam.tsx b/packages/react/src/Logo/LogoGgdAmsterdam.tsx index 5cbe396f29..fa551b673a 100644 --- a/packages/react/src/Logo/LogoGgdAmsterdam.tsx +++ b/packages/react/src/Logo/LogoGgdAmsterdam.tsx @@ -1,21 +1,14 @@ import type { SVGProps } from 'react' const LogoGgdAmsterdam = (props: SVGProps) => ( - + GGD Amsterdam diff --git a/packages/react/src/Logo/LogoStadsarchief.tsx b/packages/react/src/Logo/LogoStadsarchief.tsx index d1642a64d3..4dd5578a36 100644 --- a/packages/react/src/Logo/LogoStadsarchief.tsx +++ b/packages/react/src/Logo/LogoStadsarchief.tsx @@ -1,21 +1,14 @@ import type { SVGProps } from 'react' const LogoStadsarchief = (props: SVGProps) => ( - + Stadsarchief diff --git a/packages/react/src/Logo/LogoStadsbankVanLening.tsx b/packages/react/src/Logo/LogoStadsbankVanLening.tsx index 9110db34d8..2a3ed8cbff 100644 --- a/packages/react/src/Logo/LogoStadsbankVanLening.tsx +++ b/packages/react/src/Logo/LogoStadsbankVanLening.tsx @@ -1,21 +1,14 @@ import type { SVGProps } from 'react' const LogoStadsbankVanLening = (props: SVGProps) => ( - + Stadsbank van Lening diff --git a/packages/react/src/Logo/LogoVgaVerzekeringen.tsx b/packages/react/src/Logo/LogoVgaVerzekeringen.tsx index 97c6e7edeb..f0fb7349f3 100644 --- a/packages/react/src/Logo/LogoVgaVerzekeringen.tsx +++ b/packages/react/src/Logo/LogoVgaVerzekeringen.tsx @@ -1,21 +1,14 @@ import type { SVGProps } from 'react' const LogoVgaVerzekeringen = (props: SVGProps) => ( - + VGA Verzekeringen diff --git a/proprietary/assets/logo/amsterdam.svg b/proprietary/assets/logo/amsterdam.svg index c9ab81dada..064c5c53de 100644 --- a/proprietary/assets/logo/amsterdam.svg +++ b/proprietary/assets/logo/amsterdam.svg @@ -1,4 +1,6 @@ Gemeente Amsterdam - + diff --git a/proprietary/assets/logo/ggd-amsterdam.svg b/proprietary/assets/logo/ggd-amsterdam.svg index 9bf1faade3..d4f0e5cadd 100644 --- a/proprietary/assets/logo/ggd-amsterdam.svg +++ b/proprietary/assets/logo/ggd-amsterdam.svg @@ -1,5 +1,9 @@ - + GGD Amsterdam - - + + diff --git a/proprietary/assets/logo/stadsarchief.svg b/proprietary/assets/logo/stadsarchief.svg index 7b42e9ef82..2526b617bf 100644 --- a/proprietary/assets/logo/stadsarchief.svg +++ b/proprietary/assets/logo/stadsarchief.svg @@ -1,5 +1,9 @@ - + Stadsarchief - - + + diff --git a/proprietary/assets/logo/stadsbank-van-lening.svg b/proprietary/assets/logo/stadsbank-van-lening.svg index 5be1ae7754..8d657ba47c 100644 --- a/proprietary/assets/logo/stadsbank-van-lening.svg +++ b/proprietary/assets/logo/stadsbank-van-lening.svg @@ -1,5 +1,9 @@ - + Stadsbank van Lening - - + + diff --git a/proprietary/assets/logo/vga-verzekeringen.svg b/proprietary/assets/logo/vga-verzekeringen.svg index 578f9bbbbf..92a1b21075 100644 --- a/proprietary/assets/logo/vga-verzekeringen.svg +++ b/proprietary/assets/logo/vga-verzekeringen.svg @@ -1,5 +1,9 @@ - + VGA Verzekeringen - - + + From d271dc5eb5516110b23540ee954604ce67b5644d Mon Sep 17 00:00:00 2001 From: Vincent Smedinga Date: Wed, 15 Nov 2023 13:10:26 +0100 Subject: [PATCH 17/33] Use consistent casing for abbreviations --- storybook/storybook-react/src/Logo/Logo.docs.mdx | 4 ++-- storybook/storybook-react/src/Logo/Logo.stories.tsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/storybook/storybook-react/src/Logo/Logo.docs.mdx b/storybook/storybook-react/src/Logo/Logo.docs.mdx index f82f1fc595..ddd0285322 100644 --- a/storybook/storybook-react/src/Logo/Logo.docs.mdx +++ b/storybook/storybook-react/src/Logo/Logo.docs.mdx @@ -12,7 +12,7 @@ import README from "../../../../packages/css/src/logo/README.md?raw"; ## GGD Amsterdam - + ## Stadsarchief @@ -24,4 +24,4 @@ import README from "../../../../packages/css/src/logo/README.md?raw"; ## VGA Verzekeringen - + diff --git a/storybook/storybook-react/src/Logo/Logo.stories.tsx b/storybook/storybook-react/src/Logo/Logo.stories.tsx index fb8306c919..a19b4d6ee2 100644 --- a/storybook/storybook-react/src/Logo/Logo.stories.tsx +++ b/storybook/storybook-react/src/Logo/Logo.stories.tsx @@ -25,7 +25,7 @@ type Story = StoryObj export const Default: Story = {} -export const GGDAmsterdam: Story = { +export const GgdAmsterdam: Story = { args: { variant: 'ggd-amsterdam', }, @@ -43,7 +43,7 @@ export const StadsbankVanLening: Story = { }, } -export const VGAVerzekeringen: Story = { +export const VgaVerzekeringen: Story = { args: { variant: 'vga-verzekeringen', }, From a8e476b80931bbab7a1ad5e82d7dd11dec340d69 Mon Sep 17 00:00:00 2001 From: Vincent Smedinga Date: Wed, 15 Nov 2023 13:11:40 +0100 Subject: [PATCH 18/33] =?UTF-8?q?Rename=20=E2=80=98variant=E2=80=99=20prop?= =?UTF-8?q?=20to=20=E2=80=98brand=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/react/src/Logo/Logo.tsx | 6 +++--- storybook/storybook-react/src/Logo/Logo.stories.tsx | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/react/src/Logo/Logo.tsx b/packages/react/src/Logo/Logo.tsx index 86e4120cd7..80168cd25c 100644 --- a/packages/react/src/Logo/Logo.tsx +++ b/packages/react/src/Logo/Logo.tsx @@ -10,7 +10,7 @@ import { LogoAmsterdam, LogoGgdAmsterdam, LogoStadsarchief, LogoStadsbankVanLeni type LogoBrand = 'amsterdam' | 'ggd-amsterdam' | 'stadsarchief' | 'stadsbank-van-lening' | 'vga-verzekeringen' export interface LogoProps extends HTMLAttributes { - variant?: LogoBrand + brand?: LogoBrand } const logoConfig: Record = { @@ -22,8 +22,8 @@ const logoConfig: Record = { } export const Logo = forwardRef( - ({ variant = 'amsterdam', className, ...restProps }: LogoProps, ref: ForwardedRef) => { - const LogoComponent = logoConfig[variant] + ({ brand = 'amsterdam', className, ...restProps }: LogoProps, ref: ForwardedRef) => { + const LogoComponent = logoConfig[brand] return ( diff --git a/storybook/storybook-react/src/Logo/Logo.stories.tsx b/storybook/storybook-react/src/Logo/Logo.stories.tsx index a19b4d6ee2..de319d64ca 100644 --- a/storybook/storybook-react/src/Logo/Logo.stories.tsx +++ b/storybook/storybook-react/src/Logo/Logo.stories.tsx @@ -10,7 +10,7 @@ const meta = { title: 'Media/Logo', component: Logo, argTypes: { - variant: { + brand: { control: { type: 'select', }, @@ -27,24 +27,24 @@ export const Default: Story = {} export const GgdAmsterdam: Story = { args: { - variant: 'ggd-amsterdam', + brand: 'ggd-amsterdam', }, } export const Stadsarchief: Story = { args: { - variant: 'stadsarchief', + brand: 'stadsarchief', }, } export const StadsbankVanLening: Story = { args: { - variant: 'stadsbank-van-lening', + brand: 'stadsbank-van-lening', }, } export const VgaVerzekeringen: Story = { args: { - variant: 'vga-verzekeringen', + brand: 'vga-verzekeringen', }, } From 86367fdac9ff051753c7feea6cfabb843bfeef82 Mon Sep 17 00:00:00 2001 From: Vincent Smedinga Date: Wed, 15 Nov 2023 14:09:13 +0100 Subject: [PATCH 19/33] Apply suggestions from code review Co-authored-by: Aram <37216945+alimpens@users.noreply.github.com> --- packages/css/src/logo/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/css/src/logo/README.md b/packages/css/src/logo/README.md index f10485664c..ad247df5dd 100644 --- a/packages/css/src/logo/README.md +++ b/packages/css/src/logo/README.md @@ -26,7 +26,7 @@ De submerken zijn: - Het logo wordt altijd getoond. - Het logo is linksboven uitgelijnd in de header. - Het logo verwijst naar de homepage. -- Als de applicatie een formulier, applicatie of tool is zonder homepage, dan linkt het logo naar de pagina op Amsterdam.nl van waar naar het formulier, applicatie of tool wordt verwezen. +- Als de applicatie een formulier, applicatie of tool is zonder homepage, dan linkt het logo naar de pagina van waar naar het formulier, applicatie of tool wordt verwezen. De hoogte van het logo is altijd 40 pixels. Dit geldt ook voor de submerklogo´s. From dc9364e3b9c10232aa548eb84fc09ca8ba643e12 Mon Sep 17 00:00:00 2001 From: Vincent Smedinga Date: Wed, 15 Nov 2023 14:20:34 +0100 Subject: [PATCH 20/33] Restore fill colours in SVG as fallback for missing CSS --- packages/react/src/Logo/LogoAmsterdam.tsx | 1 + packages/react/src/Logo/LogoGgdAmsterdam.tsx | 2 ++ packages/react/src/Logo/LogoStadsarchief.tsx | 2 ++ packages/react/src/Logo/LogoStadsbankVanLening.tsx | 2 ++ packages/react/src/Logo/LogoVgaVerzekeringen.tsx | 2 ++ proprietary/assets/logo/amsterdam.svg | 3 ++- proprietary/assets/logo/ggd-amsterdam.svg | 6 ++++-- proprietary/assets/logo/stadsarchief.svg | 6 ++++-- proprietary/assets/logo/stadsbank-van-lening.svg | 6 ++++-- proprietary/assets/logo/vga-verzekeringen.svg | 6 ++++-- 10 files changed, 27 insertions(+), 9 deletions(-) diff --git a/packages/react/src/Logo/LogoAmsterdam.tsx b/packages/react/src/Logo/LogoAmsterdam.tsx index adb9118caf..df90b4d97d 100644 --- a/packages/react/src/Logo/LogoAmsterdam.tsx +++ b/packages/react/src/Logo/LogoAmsterdam.tsx @@ -6,6 +6,7 @@ const LogoAmsterdam = (props: SVGProps) => ( ) diff --git a/packages/react/src/Logo/LogoGgdAmsterdam.tsx b/packages/react/src/Logo/LogoGgdAmsterdam.tsx index fa551b673a..73fe0f65b2 100644 --- a/packages/react/src/Logo/LogoGgdAmsterdam.tsx +++ b/packages/react/src/Logo/LogoGgdAmsterdam.tsx @@ -6,10 +6,12 @@ const LogoGgdAmsterdam = (props: SVGProps) => ( ) diff --git a/packages/react/src/Logo/LogoStadsarchief.tsx b/packages/react/src/Logo/LogoStadsarchief.tsx index 4dd5578a36..57cfe4eb01 100644 --- a/packages/react/src/Logo/LogoStadsarchief.tsx +++ b/packages/react/src/Logo/LogoStadsarchief.tsx @@ -6,10 +6,12 @@ const LogoStadsarchief = (props: SVGProps) => ( ) diff --git a/packages/react/src/Logo/LogoStadsbankVanLening.tsx b/packages/react/src/Logo/LogoStadsbankVanLening.tsx index 2a3ed8cbff..c76ce56f3b 100644 --- a/packages/react/src/Logo/LogoStadsbankVanLening.tsx +++ b/packages/react/src/Logo/LogoStadsbankVanLening.tsx @@ -6,10 +6,12 @@ const LogoStadsbankVanLening = (props: SVGProps) => ( ) diff --git a/packages/react/src/Logo/LogoVgaVerzekeringen.tsx b/packages/react/src/Logo/LogoVgaVerzekeringen.tsx index f0fb7349f3..418127c329 100644 --- a/packages/react/src/Logo/LogoVgaVerzekeringen.tsx +++ b/packages/react/src/Logo/LogoVgaVerzekeringen.tsx @@ -6,10 +6,12 @@ const LogoVgaVerzekeringen = (props: SVGProps) => ( ) diff --git a/proprietary/assets/logo/amsterdam.svg b/proprietary/assets/logo/amsterdam.svg index 064c5c53de..c499ff2d19 100644 --- a/proprietary/assets/logo/amsterdam.svg +++ b/proprietary/assets/logo/amsterdam.svg @@ -2,5 +2,6 @@ Gemeente Amsterdam + d="M16.436 8.581c0-3.752 2.629-6.4 6.343-6.4 1.886 0 3.466.609 4.59 1.829l-1.637 1.561c-.705-.781-1.715-1.238-2.915-1.238-2.248 0-3.81 1.752-3.81 4.248 0 2.496 1.524 4.324 3.714 4.324 2.001 0 3.392-1.143 3.392-2.8v-.323h-2.991V7.705h5.506v1.924c0 3.162-2.458 5.391-5.982 5.391s-6.209-2.667-6.209-6.439h-.001Zm13.79 1.505c0-2.915 1.962-4.934 4.762-4.934 2.799 0 4.743 2 4.743 4.877 0 .228-.038.59-.077.838h-7.048C32.778 12.143 33.863 13 35.254 13c1.029 0 1.924-.381 2.514-1.067l1.429 1.391c-.857 1.106-2.344 1.696-4.058 1.696-2.895 0-4.915-2.038-4.915-4.934h.002Zm2.38-.952h4.744c-.153-1.238-1.105-2.077-2.381-2.077-1.276 0-2.229.839-2.363 2.077Zm11.297-3.752v1.275h.037c.476-.971 1.315-1.505 2.4-1.505 1.219 0 2.133.534 2.704 1.601.572-1.029 1.62-1.601 2.953-1.601 2.323 0 3.447 1.296 3.447 3.943v5.696h-2.362V9.495c0-1.543-.534-2.286-1.638-2.286-1.104 0-1.695.819-1.695 2.362v5.22h-2.362V9.495c0-1.562-.514-2.286-1.638-2.286-1.124 0-1.696.838-1.696 2.362v5.22h-2.362V5.382h2.212Zm13.41 4.704c0-2.915 1.962-4.934 4.762-4.934 2.799 0 4.743 2 4.743 4.877 0 .228-.038.59-.076.838h-7.048C59.865 12.143 60.951 13 62.342 13c1.029 0 1.923-.381 2.514-1.067l1.428 1.391c-.857 1.106-2.343 1.696-4.058 1.696-2.894 0-4.914-2.038-4.914-4.934h.001Zm2.381-.952h4.743c-.153-1.238-1.105-2.077-2.381-2.077-1.276 0-2.228.839-2.362 2.077Zm8.495.952c0-2.915 1.962-4.934 4.762-4.934s4.743 2 4.743 4.877c0 .228-.037.59-.076.838H70.57C70.742 12.143 71.827 13 73.218 13c1.029 0 1.923-.381 2.514-1.067l1.428 1.391c-.857 1.106-2.343 1.696-4.057 1.696-2.895 0-4.915-2.038-4.915-4.934h.001Zm2.381-.952h4.743c-.153-1.238-1.105-2.077-2.381-2.077-1.276 0-2.228.839-2.362 2.077Zm11.314-3.752v1.275h.037c.439-.933 1.391-1.505 2.495-1.505 2.363 0 3.582 1.353 3.582 3.943v5.696h-2.362V9.552c0-1.6-.572-2.343-1.772-2.343-1.201 0-1.848.838-1.848 2.4v5.18h-2.362V5.382h2.23Zm9.143 6.037V7.343h-1.619V5.381h.857c.781 0 1.085-.305 1.085-1.086V2.829h2.019v2.553h2.286v1.962h-2.286v4.077c0 .915.476 1.428 1.352 1.428.267 0 .59-.037.781-.095v1.981c-.286.077-.82.133-1.238.133-2.133 0-3.238-1.18-3.238-3.447l.001-.002Zm5.791-1.333c0-2.915 1.962-4.934 4.762-4.934 2.799 0 4.743 2 4.743 4.877 0 .228-.038.59-.076.838h-7.048c.171 1.276 1.257 2.133 2.648 2.133 1.028 0 1.923-.381 2.514-1.067l1.428 1.391c-.857 1.106-2.343 1.696-4.058 1.696-2.894 0-4.914-2.038-4.914-4.934h.001Zm2.381-.952h4.743c-.153-1.238-1.105-2.077-2.381-2.077-1.276 0-2.228.839-2.362 2.077ZM23.73 25.267l4.953 12.381h-2.648l-1.029-2.724h-5.505l-1.029 2.724h-2.553l4.953-12.381h2.858Zm-3.486 7.601h4l-1.981-5.22h-.038l-1.981 5.22Zm12.211-4.628v1.275h.037c.477-.971 1.315-1.505 2.4-1.505 1.22 0 2.133.534 2.705 1.6.571-1.028 1.619-1.6 2.952-1.6 2.324 0 3.448 1.296 3.448 3.944v5.696h-2.363v-5.296c0-1.543-.533-2.286-1.637-2.286-1.105 0-1.696.819-1.696 2.362v5.22h-2.362v-5.296c0-1.562-.514-2.286-1.638-2.286-1.124 0-1.696.838-1.696 2.362v5.22h-2.362v-9.41h2.212Zm15.886 5.466c-1.275-.381-2.514-1.067-2.514-2.781 0-1.714 1.448-2.915 3.601-2.915 1.447 0 2.571.514 3.2 1.467l-1.352 1.352c-.476-.591-1.124-.915-1.828-.915-.8 0-1.296.362-1.296.934 0 .761.8.894 1.962 1.256 1.276.381 2.514 1.067 2.514 2.781 0 1.715-1.524 2.99-3.772 2.99-1.466 0-2.648-.513-3.333-1.486l1.352-1.352c.514.609 1.201.934 1.962.934.915 0 1.467-.381 1.467-1.01 0-.762-.8-.895-1.963-1.257v.002Zm6.781.571v-4.076h-1.619v-1.963h.857c.781 0 1.086-.304 1.086-1.085v-1.466h2.018v2.553h2.286v1.962h-2.286v4.077c0 .914.477 1.428 1.353 1.428.267 0 .59-.037.78-.095v1.981c-.285.077-.819.133-1.238.133-2.133 0-3.238-1.181-3.238-3.447l.001-.002Zm5.79-1.333c0-2.915 1.962-4.934 4.762-4.934s4.743 2 4.743 4.876c0 .228-.038.591-.076.839h-7.048c.172 1.275 1.257 2.133 2.648 2.133 1.029 0 1.923-.381 2.514-1.067l1.428 1.391c-.857 1.105-2.343 1.696-4.057 1.696-2.895 0-4.915-2.038-4.915-4.934h.001Zm2.381-.953h4.743c-.153-1.238-1.105-2.076-2.381-2.076-1.276 0-2.228.838-2.362 2.076Zm11.315-3.751v1.561h.037c.458-1.066 1.296-1.638 2.4-1.638.286 0 .686.038.839.095v2.249c-.267-.077-.781-.133-1.162-.133-1.201 0-1.981.914-1.981 2.323v4.953h-2.363v-9.41h2.23Zm3.943 4.743c0-2.915 1.924-4.972 4.648-4.972 1.257 0 2.286.553 2.934 1.562h.038V23.84h2.362v13.81h-2.228v-1.467h-.038c-.609 1.067-1.752 1.696-3.066 1.696-2.725 0-4.648-2.038-4.648-4.895l-.002-.001Zm7.62-.038c0-1.695-1.048-2.819-2.591-2.819-1.542 0-2.609 1.142-2.609 2.819s1.048 2.82 2.609 2.82c1.562 0 2.591-1.124 2.591-2.82Zm4.17 2.018c0-1.81 1.505-2.895 4.019-2.915l1.829-.019v-.304c0-1.106-.705-1.677-1.982-1.677-.838 0-1.581.323-2.095.915l-1.429-1.391c.82-1.01 2.133-1.562 3.753-1.562 2.513 0 4.114 1.371 4.114 3.562v3.733c0 .343.153.495.534.495h.171v1.847H98.15c-.895 0-1.505-.418-1.696-1.105h-.037c-.591.857-1.562 1.333-2.743 1.333-1.982 0-3.334-1.18-3.334-2.914l.001.002Zm5.848-.82v-.534l-1.562.019c-1.238.019-1.905.458-1.905 1.276 0 .724.572 1.238 1.371 1.238 1.238 0 2.096-.819 2.096-2v.001Zm7.124-5.903v1.275h.037c.477-.971 1.315-1.505 2.4-1.505 1.22 0 2.133.534 2.705 1.6.571-1.028 1.619-1.6 2.952-1.6 2.324 0 3.448 1.296 3.448 3.944v5.696h-2.363v-5.296c0-1.543-.533-2.286-1.637-2.286-1.105 0-1.696.819-1.696 2.362v5.22h-2.362v-5.296c0-1.562-.514-2.286-1.638-2.286-1.124 0-1.696.838-1.696 2.362v5.22h-2.362v-9.41h2.212ZM0 37.648l3.527-3.527L0 30.593l2.352-2.351 3.527 3.527 3.528-3.527 2.351 2.351-3.527 3.528 3.527 3.527L9.407 40l-3.528-3.527L2.352 40 0 37.648ZM0 23.54l3.527-3.528L0 16.485l2.352-2.352 3.527 3.528 3.528-3.528 2.351 2.352-3.527 3.527 3.527 3.528-2.351 2.351-3.528-3.527-3.527 3.527L0 23.54ZM0 9.407l3.527-3.528L0 2.352 2.352 0l3.527 3.527L9.407 0l2.351 2.352-3.527 3.527 3.527 3.528-2.351 2.351-3.528-3.527-3.526 3.527L0 9.407Z" + fill="#ec0000"/> diff --git a/proprietary/assets/logo/ggd-amsterdam.svg b/proprietary/assets/logo/ggd-amsterdam.svg index d4f0e5cadd..117954d25a 100644 --- a/proprietary/assets/logo/ggd-amsterdam.svg +++ b/proprietary/assets/logo/ggd-amsterdam.svg @@ -2,8 +2,10 @@ GGD Amsterdam + d="M16.436 8.581c0-3.752 2.629-6.4 6.343-6.4 1.886 0 3.466.61 4.59 1.829L25.732 5.57c-.705-.78-1.715-1.238-2.915-1.238-2.248 0-3.81 1.752-3.81 4.248 0 2.496 1.524 4.324 3.714 4.324 2 0 3.392-1.143 3.392-2.8v-.323h-2.99V7.705h5.505V9.63c0 3.162-2.458 5.39-5.982 5.39s-6.21-2.666-6.21-6.438ZM30.34 8.581c0-3.752 2.63-6.4 6.344-6.4 1.886 0 3.467.61 4.59 1.829L39.638 5.57c-.705-.78-1.715-1.238-2.915-1.238-2.248 0-3.81 1.752-3.81 4.248 0 2.496 1.524 4.324 3.715 4.324 2 0 3.39-1.143 3.39-2.8v-.323h-2.99V7.705h5.506V9.63c0 3.162-2.458 5.39-5.982 5.39s-6.21-2.666-6.21-6.438ZM44.836 2.41h4.61c3.809 0 6.343 2.476 6.343 6.19 0 3.714-2.59 6.19-6.363 6.19h-4.59V2.41Zm4.419 10.229c2.38 0 3.942-1.543 3.942-4.02 0-2.475-1.524-4.057-3.923-4.057H47.35v8.077h1.905Z" + fill="#000000"/> + d="m23.73 25.267 4.953 12.381h-2.648l-1.029-2.724h-5.505l-1.029 2.724h-2.553l4.953-12.38h2.858Zm-3.486 7.6h4l-1.981-5.219h-.038l-1.981 5.22ZM32.455 28.24v1.275h.037c.477-.97 1.315-1.505 2.4-1.505 1.22 0 2.133.534 2.705 1.6.571-1.028 1.619-1.6 2.952-1.6 2.324 0 3.448 1.296 3.448 3.944v5.696h-2.363v-5.296c0-1.543-.533-2.286-1.638-2.286-1.104 0-1.695.82-1.695 2.362v5.22h-2.362v-5.296c0-1.562-.514-2.286-1.638-2.286-1.124 0-1.696.838-1.696 2.362v5.22h-2.362v-9.41h2.212ZM48.341 33.706c-1.276-.381-2.514-1.067-2.514-2.78 0-1.715 1.448-2.916 3.6-2.916 1.448 0 2.572.514 3.201 1.466l-1.352 1.353c-.476-.59-1.124-.915-1.828-.915-.8 0-1.296.362-1.296.933 0 .762.8.895 1.962 1.257 1.276.381 2.514 1.067 2.514 2.781 0 1.715-1.524 2.99-3.772 2.99-1.466 0-2.648-.514-3.333-1.486l1.352-1.352c.514.609 1.2.934 1.962.934.915 0 1.467-.381 1.467-1.01 0-.762-.8-.895-1.963-1.258v.003ZM55.122 34.277v-4.076h-1.619v-1.963h.857c.781 0 1.086-.304 1.086-1.085v-1.466h2.018v2.552h2.286v1.963h-2.286v4.076c0 .915.477 1.43 1.352 1.43.267 0 .59-.038.781-.096v1.981c-.285.076-.82.133-1.238.133-2.133 0-3.238-1.18-3.238-3.447l.001-.002ZM60.912 32.944c0-2.915 1.962-4.934 4.762-4.934s4.743 2 4.743 4.876c0 .228-.038.59-.076.839h-7.048c.172 1.275 1.257 2.133 2.648 2.133 1.029 0 1.923-.381 2.514-1.067l1.428 1.391c-.857 1.105-2.343 1.696-4.057 1.696-2.895 0-4.915-2.038-4.915-4.934Zm2.38-.953h4.744c-.153-1.238-1.105-2.076-2.38-2.076-1.277 0-2.23.838-2.363 2.076ZM74.608 28.24V29.8h.037c.458-1.066 1.296-1.638 2.4-1.638.286 0 .686.038.838.095v2.248c-.266-.076-.78-.132-1.161-.132-1.2 0-1.981.914-1.981 2.323v4.953h-2.363v-9.41h2.23ZM78.551 32.983c0-2.915 1.924-4.972 4.648-4.972 1.257 0 2.286.553 2.934 1.562h.038V23.84h2.362v13.81h-2.228v-1.467h-.038c-.609 1.067-1.752 1.696-3.066 1.696-2.725 0-4.648-2.038-4.648-4.895l-.002-.001Zm7.62-.038c0-1.695-1.048-2.82-2.59-2.82-1.543 0-2.61 1.143-2.61 2.82 0 1.677 1.048 2.82 2.61 2.82 1.56 0 2.59-1.124 2.59-2.82ZM90.341 34.963c0-1.81 1.505-2.895 4.02-2.915l1.828-.019v-.304c0-1.106-.705-1.677-1.982-1.677-.838 0-1.581.323-2.095.915l-1.429-1.391c.82-1.01 2.133-1.562 3.752-1.562 2.514 0 4.115 1.371 4.115 3.562v3.733c0 .343.153.495.534.495h.171v1.847H98.15c-.895 0-1.505-.418-1.696-1.105h-.037c-.59.857-1.562 1.333-2.743 1.333-1.982 0-3.334-1.18-3.334-2.914l.001.002Zm5.848-.82v-.534l-1.562.02c-1.238.018-1.905.457-1.905 1.275 0 .724.572 1.238 1.371 1.238 1.238 0 2.096-.82 2.096-2v.001ZM103.313 28.24v1.275h.037c.477-.97 1.315-1.505 2.4-1.505 1.22 0 2.133.534 2.705 1.6.571-1.028 1.619-1.6 2.952-1.6 2.324 0 3.448 1.296 3.448 3.944v5.696h-2.363v-5.296c0-1.543-.533-2.286-1.637-2.286-1.105 0-1.696.82-1.696 2.362v5.22h-2.362v-5.296c0-1.562-.514-2.286-1.638-2.286-1.124 0-1.696.838-1.696 2.362v5.22h-2.362v-9.41h2.212ZM0 37.648l3.527-3.527L0 30.593l2.352-2.351 3.527 3.527 3.528-3.527 2.351 2.351-3.527 3.528 3.527 3.527L9.407 40l-3.528-3.527L2.352 40 0 37.648ZM0 23.54l3.527-3.528L0 16.485l2.352-2.352 3.527 3.528 3.528-3.528 2.351 2.352-3.527 3.527 3.527 3.528-2.351 2.351-3.528-3.527-3.527 3.527L0 23.54ZM0 9.407l3.527-3.528L0 2.352 2.352 0l3.527 3.527L9.407 0l2.351 2.352-3.527 3.527 3.527 3.528-2.351 2.351-3.528-3.527-3.526 3.527L0 9.407Z" + fill="#ec0000"/> diff --git a/proprietary/assets/logo/stadsarchief.svg b/proprietary/assets/logo/stadsarchief.svg index 2526b617bf..2d748ac8d3 100644 --- a/proprietary/assets/logo/stadsarchief.svg +++ b/proprietary/assets/logo/stadsarchief.svg @@ -2,8 +2,10 @@ Stadsarchief + d="m17.335 37.353 1.302-1.084a2.07 2.07 0 0 0 1.779.983c.867 0 1.46-.463 1.46-1.143 0-.766-.636-1.041-1.866-1.49-1.143-.42-2.343-1.012-2.343-2.747 0-1.62 1.315-2.734 3.239-2.734 1.302 0 2.328.52 2.907 1.446L22.51 31.67c-.39-.578-.955-.897-1.62-.897-.781 0-1.302.42-1.302 1.042 0 .767.636 1.042 1.866 1.49 1.143.42 2.344 1.012 2.344 2.748 0 1.735-1.375 2.834-3.4 2.834-1.374 0-2.458-.549-3.066-1.533h.002ZM25.737 36.153v-3.095h-1.23v-1.49h.65c.593 0 .825-.231.825-.824v-1.113h1.533v1.937h1.736v1.49h-1.736v3.095c0 .694.362 1.085 1.027 1.085.202 0 .448-.03.592-.073v1.504a4.37 4.37 0 0 1-.94.101c-1.62 0-2.459-.897-2.459-2.617h.002ZM30.134 36.674c0-1.375 1.143-2.2 3.051-2.213l1.389-.014v-.232c0-.838-.535-1.272-1.504-1.272-.636 0-1.2.245-1.591.694l-1.084-1.056c.622-.767 1.62-1.187 2.849-1.187 1.91 0 3.124 1.042 3.124 2.705v2.835c0 .26.115.376.404.376h.13v1.402h-.837c-.68 0-1.143-.318-1.288-.838h-.03c-.447.651-1.186 1.012-2.082 1.012-1.504 0-2.53-.897-2.53-2.212h-.001Zm4.44-.622v-.405l-1.187.014c-.94.014-1.446.347-1.446.97 0 .548.434.94 1.042.94.94 0 1.59-.622 1.59-1.52ZM37.813 35.17c0-2.213 1.46-3.775 3.529-3.775.954 0 1.735.42 2.227 1.187h.029v-4.353h1.793v10.486H43.7V37.6h-.03c-.463.81-1.33 1.288-2.327 1.288-2.069 0-3.529-1.547-3.529-3.717v-.002Zm5.785-.03c0-1.287-.796-2.14-1.967-2.14s-1.981.868-1.981 2.14c0 1.273.796 2.14 1.98 2.14 1.186 0 1.968-.853 1.968-2.14ZM48.762 35.719c-.969-.29-1.91-.81-1.91-2.112 0-1.301 1.1-2.213 2.734-2.213 1.1 0 1.952.39 2.43 1.114l-1.027 1.026c-.362-.448-.853-.694-1.389-.694-.607 0-.983.276-.983.71 0 .578.608.68 1.49.954.97.29 1.91.81 1.91 2.112s-1.157 2.27-2.863 2.27c-1.114 0-2.01-.39-2.532-1.127l1.027-1.027c.39.464.91.71 1.49.71.693 0 1.113-.29 1.113-.767 0-.579-.608-.68-1.49-.955v-.001ZM52.97 36.674c0-1.375 1.143-2.2 3.052-2.213l1.388-.014v-.232c0-.838-.535-1.272-1.504-1.272-.636 0-1.2.245-1.59.694L53.23 32.58c.622-.767 1.62-1.187 2.85-1.187 1.909 0 3.124 1.042 3.124 2.705v2.835c0 .26.115.376.404.376h.13v1.402h-.838c-.68 0-1.143-.318-1.287-.838h-.03c-.448.651-1.186 1.012-2.082 1.012-1.504 0-2.53-.897-2.53-2.212h-.002Zm4.44-.622v-.405l-1.186.014c-.94.014-1.446.347-1.446.97 0 .548.434.94 1.041.94.941 0 1.591-.622 1.591-1.52ZM61.141 31.568h1.692v1.187h.03c.346-.81.983-1.244 1.822-1.244.218 0 .52.029.636.073v1.706a3.906 3.906 0 0 0-.882-.102c-.911 0-1.504.694-1.504 1.765v3.76h-1.793V31.57ZM65.827 35.14c0-2.227 1.49-3.746 3.688-3.746 1.085 0 2.04.405 2.647 1.128l-1.2 1.127c-.363-.404-.868-.622-1.447-.622-1.1 0-1.85.868-1.85 2.112 0 1.244.752 2.112 1.85 2.112.579 0 1.085-.218 1.476-.636l1.186 1.127c-.636.738-1.576 1.143-2.646 1.143-2.2 0-3.703-1.519-3.703-3.746l-.001.001ZM73.492 28.228h1.793v4.15h.03c.42-.636 1.041-.983 1.793-.983 1.793 0 2.718 1.027 2.718 2.994v4.325h-1.793v-3.978c0-1.215-.434-1.78-1.345-1.78-.912 0-1.403.637-1.403 1.823v3.935h-1.793V28.228ZM82.56 30.657c-.622 0-1.07-.434-1.07-1.042 0-.608.448-1.042 1.07-1.042.622 0 1.07.434 1.07 1.042 0 .608-.448 1.042-1.07 1.042Zm-.897.911h1.793v7.144h-1.793v-7.144ZM84.947 35.14c0-2.212 1.49-3.746 3.615-3.746 2.126 0 3.602 1.52 3.602 3.703 0 .174-.03.448-.058.636h-5.35c.13.969.954 1.62 2.01 1.62.78 0 1.46-.289 1.91-.81l1.083 1.056c-.651.838-1.779 1.288-3.08 1.288-2.2 0-3.731-1.548-3.731-3.747h-.001Zm1.808-.723h3.602c-.116-.94-.839-1.577-1.809-1.577s-1.692.637-1.793 1.577ZM92.886 33.058v-1.49H94.1v-.925c0-1.634.97-2.59 2.633-2.59.202 0 .506.03.665.058v1.548a2.82 2.82 0 0 0-.621-.072c-.565 0-.882.376-.882 1.056v.925h1.735v1.49h-1.735v5.654h-1.793v-5.654h-1.216Z" + fill="#000000"/> + d="M20.936 15.334h2.17l3.76 9.4h-2.01l-.781-2.068h-4.18l-.781 2.068h-1.938l3.76-9.4Zm-.477 5.77h3.037l-1.504-3.962h-.029l-1.504 3.963ZM28.051 17.59h1.678v.969h.03c.36-.737.998-1.143 1.822-1.143.926 0 1.62.405 2.054 1.215.434-.781 1.229-1.215 2.241-1.215 1.765 0 2.618.983 2.618 2.994v4.324H36.7v-4.02c0-1.17-.405-1.735-1.244-1.735-.84 0-1.288.622-1.288 1.793v3.962h-1.793v-4.02c0-1.186-.39-1.735-1.244-1.735s-1.288.636-1.288 1.793v3.962h-1.793V17.59ZM41.79 21.74c-.968-.288-1.909-.81-1.909-2.111 0-1.302 1.1-2.213 2.734-2.213 1.1 0 1.952.39 2.43 1.114l-1.027 1.026c-.362-.448-.854-.694-1.389-.694-.608 0-.983.276-.983.71 0 .578.608.679 1.49.954.969.29 1.91.81 1.91 2.112s-1.158 2.27-2.864 2.27c-1.113 0-2.01-.39-2.531-1.127l1.026-1.027c.39.464.912.71 1.49.71.694 0 1.114-.29 1.114-.767 0-.579-.608-.68-1.49-.955v-.001ZM46.94 22.175V19.08h-1.23v-1.49h.651c.593 0 .824-.232.824-.824v-1.114h1.534v1.938h1.735v1.49H48.72v3.095c0 .693.36 1.085 1.026 1.085.202 0 .448-.03.593-.073v1.504a4.362 4.362 0 0 1-.94.101c-1.621 0-2.46-.897-2.46-2.617h.002ZM51.336 21.162c0-2.213 1.49-3.746 3.616-3.746 2.126 0 3.601 1.52 3.601 3.703 0 .174-.03.448-.057.636h-5.352c.13.969.955 1.62 2.011 1.62.78 0 1.46-.29 1.91-.81l1.084 1.056c-.652.838-1.78 1.287-3.08 1.287-2.2 0-3.732-1.547-3.732-3.746h-.001Zm1.808-.723h3.602c-.115-.94-.838-1.577-1.809-1.577-.97 0-1.691.637-1.793 1.577ZM60.042 17.59h1.692v1.187h.03c.346-.81.982-1.244 1.822-1.244.217 0 .52.029.636.071v1.706a3.908 3.908 0 0 0-.882-.1c-.911 0-1.504.693-1.504 1.764v3.76h-1.793V17.59h-.001ZM64.728 21.192c0-2.213 1.46-3.775 3.53-3.775.954 0 1.735.42 2.226 1.187h.03V14.25h1.793v10.486h-1.692v-1.114h-.03c-.463.81-1.33 1.288-2.328 1.288-2.068 0-3.529-1.548-3.529-3.717v-.002Zm5.785-.03c0-1.287-.796-2.14-1.967-2.14-1.17 0-1.98.868-1.98 2.14 0 1.273.795 2.14 1.98 2.14 1.186 0 1.967-.853 1.967-2.14ZM73.68 22.696c0-1.375 1.143-2.2 3.051-2.213l1.389-.014v-.232c0-.838-.535-1.272-1.504-1.272-.636 0-1.2.245-1.59.693l-1.085-1.056c.622-.766 1.62-1.186 2.849-1.186 1.908 0 3.124 1.042 3.124 2.704v2.835c0 .26.115.377.405.377h.13v1.402h-.838c-.68 0-1.143-.318-1.288-.838h-.03c-.447.651-1.186 1.012-2.082 1.012-1.503 0-2.53-.897-2.53-2.212h-.001Zm4.44-.623v-.404l-1.185.014c-.941.014-1.447.347-1.447.969 0 .55.434.94 1.042.94.94 0 1.591-.621 1.591-1.518h-.001ZM81.85 17.59h1.679v.969h.029c.362-.737.998-1.143 1.822-1.143.926 0 1.62.405 2.055 1.215.433-.781 1.228-1.215 2.24-1.215 1.766 0 2.618.983 2.618 2.994v4.324H90.5v-4.02c0-1.17-.404-1.735-1.244-1.735s-1.287.622-1.287 1.793v3.962h-1.794v-4.02c0-1.186-.39-1.735-1.244-1.735-.853 0-1.287.636-1.287 1.793v3.962H81.85V17.59ZM17.575 5.857c0-2.85 1.995-4.86 4.816-4.86 1.432 0 2.633.463 3.485 1.389l-1.244 1.186c-.535-.592-1.302-.94-2.213-.94-1.706 0-2.892 1.33-2.892 3.225 0 1.894 1.157 3.283 2.82 3.283 1.52 0 2.574-.868 2.574-2.126v-.246h-2.27V5.191h4.18v1.46c0 2.402-1.866 4.094-4.541 4.094-2.675 0-4.715-2.025-4.715-4.888ZM28.047 7c0-2.213 1.49-3.747 3.615-3.747 2.126 0 3.602 1.52 3.602 3.703 0 .174-.03.448-.058.636h-5.35c.13.97.954 1.62 2.01 1.62.78 0 1.46-.289 1.91-.81l1.084 1.056c-.65.839-1.779 1.288-3.08 1.288-2.199 0-3.731-1.548-3.731-3.746h-.002Zm1.808-.724h3.602c-.116-.94-.839-1.576-1.809-1.576s-1.692.636-1.793 1.576ZM36.752 3.426h1.678v.97h.03c.362-.738.998-1.144 1.822-1.144.926 0 1.62.405 2.054 1.215.434-.78 1.23-1.215 2.241-1.215 1.765 0 2.618.983 2.618 2.994v4.325h-1.793V6.55c0-1.172-.405-1.736-1.244-1.736-.84 0-1.288.622-1.288 1.793v3.963h-1.793V6.55c0-1.187-.39-1.736-1.244-1.736s-1.288.636-1.288 1.793v3.963h-1.793V3.426ZM48.612 7c0-2.213 1.49-3.747 3.615-3.747 2.126 0 3.602 1.52 3.602 3.703 0 .174-.03.448-.058.636h-5.35c.13.97.954 1.62 2.01 1.62.78 0 1.46-.289 1.91-.81l1.083 1.056c-.651.839-1.779 1.288-3.08 1.288-2.2 0-3.731-1.548-3.731-3.746h-.001Zm1.808-.724h3.602c-.116-.94-.839-1.576-1.808-1.576-.968 0-1.692.636-1.793 1.576ZM56.87 7c0-2.213 1.49-3.747 3.615-3.747 2.126 0 3.602 1.52 3.602 3.703 0 .174-.03.448-.058.636h-5.351c.13.97.955 1.62 2.01 1.62.781 0 1.46-.289 1.91-.81l1.084 1.056c-.651.839-1.779 1.288-3.08 1.288-2.2 0-3.731-1.548-3.731-3.746h-.002Zm1.808-.724h3.601c-.115-.94-.838-1.576-1.808-1.576-.97 0-1.692.636-1.793 1.576ZM65.576 3.426h1.692v.97h.03c.332-.71 1.056-1.144 1.894-1.144 1.793 0 2.718 1.027 2.718 2.994v4.325h-1.793V6.594c0-1.215-.434-1.779-1.345-1.779s-1.403.636-1.403 1.822v3.935h-1.793V3.426ZM74.21 8.012V4.917h-1.23v-1.49h.652c.592 0 .824-.231.824-.824V1.49h1.533v1.937h1.736v1.49h-1.736v3.095c0 .694.361 1.085 1.027 1.085.202 0 .448-.03.592-.073v1.504a4.362 4.362 0 0 1-.94.101c-1.62 0-2.459-.897-2.459-2.617l.001.001ZM78.607 7c0-2.213 1.49-3.747 3.615-3.747 2.126 0 3.602 1.52 3.602 3.703 0 .174-.03.448-.058.636h-5.35c.13.97.954 1.62 2.01 1.62.78 0 1.46-.289 1.91-.81l1.083 1.056c-.651.839-1.779 1.288-3.08 1.288-2.2 0-3.731-1.548-3.731-3.746h-.001Zm1.808-.724h3.602c-.116-.94-.839-1.576-1.809-1.576s-1.692.636-1.793 1.576ZM0 37.648l3.527-3.527L0 30.593l2.352-2.351 3.527 3.527 3.528-3.527 2.351 2.351-3.527 3.528 3.527 3.527L9.407 40l-3.528-3.527L2.352 40 0 37.648ZM0 9.407l3.527-3.528L0 2.352 2.352 0l3.527 3.527L9.407 0l2.351 2.352-3.527 3.527 3.527 3.528-2.351 2.351-3.528-3.527-3.526 3.527L0 9.407ZM0 23.54l3.527-3.528L0 16.485l2.352-2.352 3.527 3.528 3.528-3.528 2.351 2.352-3.527 3.527 3.527 3.528-2.351 2.351-3.528-3.527-3.527 3.527L0 23.54Z" + fill="#ec0000"/> diff --git a/proprietary/assets/logo/stadsbank-van-lening.svg b/proprietary/assets/logo/stadsbank-van-lening.svg index 8d657ba47c..59415dac24 100644 --- a/proprietary/assets/logo/stadsbank-van-lening.svg +++ b/proprietary/assets/logo/stadsbank-van-lening.svg @@ -2,8 +2,10 @@ Stadsbank van Lening + d="m17.34 37.35 1.3-1.08c.4.64 1.06.98 1.78.98.87 0 1.46-.46 1.46-1.14 0-.77-.64-1.04-1.87-1.49-1.14-.42-2.34-1.01-2.34-2.75 0-1.62 1.32-2.73 3.24-2.73 1.3 0 2.33.52 2.91 1.45l-1.3 1.08c-.39-.58-.95-.9-1.62-.9-.78 0-1.3.42-1.3 1.04 0 .77.64 1.04 1.87 1.49 1.14.42 2.34 1.01 2.34 2.75s-1.37 2.83-3.4 2.83c-1.37 0-2.46-.55-3.07-1.53ZM25.74 36.15v-3.1h-1.23v-1.49h.65c.59 0 .82-.23.82-.82v-1.11h1.53v1.94h1.74v1.49h-1.74v3.1c0 .69.36 1.08 1.03 1.08.2 0 .45-.03.59-.07v1.5c-.22.06-.62.1-.94.1-1.62 0-2.46-.9-2.46-2.62h.01ZM30.13 36.67c0-1.37 1.14-2.2 3.05-2.21h1.39v-.25c0-.84-.54-1.27-1.5-1.27-.64 0-1.2.25-1.59.69l-1.08-1.06c.62-.77 1.62-1.19 2.85-1.19 1.91 0 3.12 1.04 3.12 2.7v2.83c0 .26.12.38.4.38h.13v1.4h-.84c-.68 0-1.14-.32-1.29-.84h-.03c-.45.65-1.19 1.01-2.08 1.01-1.5 0-2.53-.9-2.53-2.21v.02Zm4.44-.62v-.4h-1.19c-.94.03-1.45.36-1.45.98 0 .55.43.94 1.04.94.94 0 1.59-.62 1.59-1.52h.01ZM37.81 35.17c0-2.21 1.46-3.77 3.53-3.77.95 0 1.74.42 2.23 1.19h.03v-4.35h1.79v10.49H43.7v-1.11h-.03c-.46.81-1.33 1.29-2.33 1.29-2.07 0-3.53-1.55-3.53-3.72v-.02Zm5.79-.03c0-1.29-.8-2.14-1.97-2.14s-1.98.87-1.98 2.14.8 2.14 1.98 2.14 1.97-.85 1.97-2.14ZM48.76 35.72c-.97-.29-1.91-.81-1.91-2.11 0-1.3 1.1-2.21 2.73-2.21 1.1 0 1.95.39 2.43 1.11l-1.03 1.03c-.36-.45-.85-.69-1.39-.69-.61 0-.98.27-.98.71 0 .58.61.68 1.49.95.97.29 1.91.81 1.91 2.11 0 1.3-1.16 2.27-2.86 2.27-1.11 0-2.01-.39-2.53-1.13l1.03-1.03c.39.46.91.71 1.49.71.69 0 1.11-.29 1.11-.77 0-.58-.61-.68-1.49-.95ZM55.18 37.6h-.03v1.11h-1.71V28.22h1.79v4.35h.03c.52-.77 1.3-1.19 2.26-1.19 2.04 0 3.5 1.56 3.5 3.75s-1.46 3.75-3.5 3.75c-1 0-1.82-.46-2.34-1.29v.01Zm4.01-2.46c0-1.29-.8-2.14-1.97-2.14s-1.98.87-1.98 2.14.81 2.14 1.98 2.14 1.97-.85 1.97-2.14ZM61.95 36.67c0-1.37 1.14-2.2 3.05-2.21h1.39v-.25c0-.84-.54-1.27-1.5-1.27-.64 0-1.2.25-1.59.69l-1.08-1.06c.62-.77 1.62-1.19 2.85-1.19 1.91 0 3.12 1.04 3.12 2.7v2.83c0 .26.12.38.4.38h.13v1.4h-.84c-.68 0-1.14-.32-1.29-.84h-.03c-.45.65-1.19 1.01-2.08 1.01-1.5 0-2.53-.9-2.53-2.21v.02Zm4.44-.62v-.4H65.2c-.94.03-1.45.36-1.45.98 0 .55.43.94 1.04.94.94 0 1.59-.62 1.59-1.52h.01ZM70.12 31.57h1.69v.97h.03c.33-.71 1.06-1.14 1.89-1.14 1.79 0 2.72 1.03 2.72 2.99v4.32h-1.79v-3.98c0-1.21-.43-1.78-1.35-1.78-.92 0-1.4.64-1.4 1.82v3.93h-1.79v-7.14.01ZM80.09 38.71H78.3V28.22h1.79v6.57h.03l2.66-3.23h2.17l-2.76 3.17 2.89 3.98h-2.17l-1.98-2.81-.84.97v1.84ZM88.97 31.57h1.95l1.66 5.15h.03l1.71-5.15h1.91l-2.69 7.14h-1.92l-2.65-7.14ZM96.6 36.67c0-1.37 1.14-2.2 3.05-2.21h1.39v-.25c0-.84-.54-1.27-1.5-1.27-.64 0-1.2.25-1.59.69l-1.08-1.06c.62-.77 1.62-1.19 2.85-1.19 1.91 0 3.12 1.04 3.12 2.7v2.83c0 .26.12.38.4.38h.13v1.4h-.84c-.68 0-1.14-.32-1.29-.84h-.03c-.45.65-1.19 1.01-2.08 1.01-1.5 0-2.53-.9-2.53-2.21v.02Zm4.44-.62v-.4h-1.19c-.94.03-1.45.36-1.45.98 0 .55.43.94 1.04.94.94 0 1.59-.62 1.59-1.52h.01ZM104.77 31.57h1.69v.97h.03c.33-.71 1.06-1.14 1.89-1.14 1.79 0 2.72 1.03 2.72 2.99v4.32h-1.79v-3.98c0-1.21-.43-1.78-1.34-1.78-.91 0-1.4.64-1.4 1.82v3.93h-1.79v-7.14l-.01.01ZM116.65 29.31h1.91v7.78h3.49v1.62h-5.39v-9.4h-.01ZM122.87 35.14c0-2.21 1.49-3.75 3.62-3.75s3.6 1.52 3.6 3.7c0 .17-.03.45-.06.64h-5.35c.13.97.95 1.62 2.01 1.62.78 0 1.46-.29 1.91-.81l1.08 1.06c-.65.84-1.78 1.29-3.08 1.29-2.2 0-3.73-1.55-3.73-3.75Zm1.81-.72h3.6c-.12-.94-.84-1.58-1.81-1.58-.97 0-1.69.64-1.79 1.58ZM131.57 31.57h1.69v.97h.03c.33-.71 1.06-1.14 1.89-1.14 1.79 0 2.72 1.03 2.72 2.99v4.32h-1.79v-3.98c0-1.21-.43-1.78-1.35-1.78-.92 0-1.4.64-1.4 1.82v3.93h-1.79v-7.14.01ZM140.64 30.66c-.62 0-1.07-.43-1.07-1.04 0-.61.45-1.04 1.07-1.04.62 0 1.07.43 1.07 1.04 0 .61-.45 1.04-1.07 1.04Zm-.9.91h1.79v7.14h-1.79v-7.14ZM143.47 31.57h1.69v.97h.03c.33-.71 1.06-1.14 1.89-1.14 1.79 0 2.72 1.03 2.72 2.99v4.32h-1.79v-3.98c0-1.21-.43-1.78-1.35-1.78-.92 0-1.4.64-1.4 1.82v3.93h-1.79v-7.14.01ZM151.54 40.42l1.16-1.13c.39.45 1.1.72 1.87.72 1.3 0 2.02-.59 2.02-1.63v-1.1h-.03c-.4.75-1.16 1.17-2.1 1.17-2.01 0-3.34-1.42-3.34-3.53s1.37-3.51 3.34-3.51c1.01 0 1.81.45 2.2 1.21h.03v-1.06h1.69v6.88c0 1.91-1.46 3.11-3.79 3.11-1.33 0-2.43-.42-3.05-1.14v.01Zm5.06-5.5c0-1.19-.74-2.01-1.82-2.01s-1.82.82-1.82 2.01.75 2 1.82 2 1.82-.82 1.82-2Z" + fill="#000000"/> + d="M20.94 15.33h2.17l3.76 9.4h-2.01l-.78-2.07H19.9l-.78 2.07h-1.94l3.76-9.4Zm-.48 5.77h3.04L22 17.14h-.03l-1.5 3.96h-.01ZM28.05 17.59h1.68v.97h.03c.36-.74 1-1.14 1.82-1.14.93 0 1.62.4 2.05 1.21.43-.78 1.23-1.21 2.24-1.21 1.76 0 2.62.98 2.62 2.99v4.32H36.7v-4.02c0-1.17-.4-1.74-1.24-1.74s-1.29.62-1.29 1.79v3.96h-1.79V20.7c0-1.19-.39-1.74-1.24-1.74s-1.29.64-1.29 1.79v3.96h-1.79v-7.14l-.01.02ZM41.79 21.74c-.97-.29-1.91-.81-1.91-2.11 0-1.3 1.1-2.21 2.73-2.21 1.1 0 1.95.39 2.43 1.11l-1.03 1.03c-.36-.45-.85-.69-1.39-.69-.61 0-.98.27-.98.71 0 .58.61.68 1.49.95.97.29 1.91.81 1.91 2.11 0 1.3-1.16 2.27-2.86 2.27-1.11 0-2.01-.39-2.53-1.13l1.03-1.03c.39.46.91.71 1.49.71.69 0 1.11-.29 1.11-.77 0-.58-.61-.68-1.49-.95ZM46.94 22.17v-3.09h-1.23v-1.49h.65c.59 0 .82-.23.82-.82v-1.11h1.53v1.94h1.74v1.49h-1.74v3.09c0 .69.36 1.08 1.03 1.08.2 0 .45-.03.59-.07v1.5c-.22.06-.62.1-.94.1-1.62 0-2.46-.9-2.46-2.62h.01ZM51.34 21.16c0-2.21 1.49-3.75 3.62-3.75s3.6 1.52 3.6 3.7c0 .17-.03.45-.06.64h-5.35c.13.97.95 1.62 2.01 1.62.78 0 1.46-.29 1.91-.81l1.08 1.06c-.65.84-1.78 1.29-3.08 1.29-2.2 0-3.73-1.55-3.73-3.75Zm1.81-.72h3.6c-.12-.94-.84-1.58-1.81-1.58-.97 0-1.69.64-1.79 1.58ZM60.04 17.59h1.69v1.19h.03c.35-.81.98-1.24 1.82-1.24.22 0 .52.03.64.07v1.71c-.2-.06-.59-.1-.88-.1-.91 0-1.5.69-1.5 1.76v3.76h-1.79V17.6l-.01-.01ZM64.73 21.19c0-2.21 1.46-3.77 3.53-3.77.95 0 1.74.42 2.23 1.19h.03v-4.35h1.79v10.49h-1.69v-1.11h-.03c-.46.81-1.33 1.29-2.33 1.29-2.07 0-3.53-1.55-3.53-3.72v-.02Zm5.79-.03c0-1.29-.8-2.14-1.97-2.14s-1.98.87-1.98 2.14.8 2.14 1.98 2.14 1.97-.85 1.97-2.14ZM73.68 22.7c0-1.37 1.14-2.2 3.05-2.21h1.39v-.25c0-.84-.54-1.27-1.5-1.27-.64 0-1.2.25-1.59.69l-1.08-1.06c.62-.77 1.62-1.19 2.85-1.19 1.91 0 3.12 1.04 3.12 2.7v2.83c0 .26.12.38.4.38h.13v1.4h-.84c-.68 0-1.14-.32-1.29-.84h-.03c-.45.65-1.19 1.01-2.08 1.01-1.5 0-2.53-.9-2.53-2.21v.02Zm4.44-.62v-.4h-1.19c-.94.03-1.45.36-1.45.98 0 .55.43.94 1.04.94.94 0 1.59-.62 1.59-1.52h.01ZM81.85 17.59h1.68v.97h.03c.36-.74 1-1.14 1.82-1.14.93 0 1.62.4 2.05 1.21.43-.78 1.23-1.21 2.24-1.21 1.76 0 2.62.98 2.62 2.99v4.32H90.5v-4.02c0-1.17-.4-1.74-1.24-1.74s-1.29.62-1.29 1.79v3.96h-1.79V20.7c0-1.19-.39-1.74-1.24-1.74s-1.29.64-1.29 1.79v3.96h-1.79v-7.14l-.01.02ZM17.58 5.86c0-2.85 2-4.86 4.82-4.86 1.43 0 2.63.46 3.49 1.39l-1.24 1.19c-.54-.59-1.3-.94-2.21-.94-1.71 0-2.89 1.33-2.89 3.23s1.16 3.28 2.82 3.28c1.52 0 2.57-.87 2.57-2.13v-.25h-2.27V5.19h4.18v1.46c0 2.4-1.87 4.09-4.54 4.09S17.6 8.72 17.6 5.85l-.02.01ZM28.05 7c0-2.21 1.49-3.75 3.62-3.75s3.6 1.52 3.6 3.7c0 .17-.03.45-.06.64h-5.35c.13.97.95 1.62 2.01 1.62.78 0 1.46-.29 1.91-.81l1.08 1.06c-.65.84-1.78 1.29-3.08 1.29-2.2 0-3.73-1.55-3.73-3.75Zm1.81-.72h3.6c-.12-.94-.84-1.58-1.81-1.58-.97 0-1.69.64-1.79 1.58ZM36.75 3.43h1.68v.97h.03c.36-.74 1-1.14 1.82-1.14.93 0 1.62.4 2.05 1.21.43-.78 1.23-1.21 2.24-1.21 1.76 0 2.62.98 2.62 2.99v4.32H45.4V6.55c0-1.17-.4-1.74-1.24-1.74s-1.29.62-1.29 1.79v3.96h-1.79V6.55c0-1.19-.39-1.74-1.24-1.74s-1.29.64-1.29 1.79v3.96h-1.79V3.43h-.01ZM48.61 7c0-2.21 1.49-3.75 3.62-3.75s3.6 1.52 3.6 3.7c0 .17-.03.45-.06.64h-5.35c.13.97.95 1.62 2.01 1.62.78 0 1.46-.29 1.91-.81l1.08 1.06c-.65.84-1.78 1.29-3.08 1.29-2.2 0-3.73-1.55-3.73-3.75Zm1.81-.72h3.6c-.12-.94-.84-1.58-1.81-1.58-.97 0-1.69.64-1.79 1.58ZM56.87 7c0-2.21 1.49-3.75 3.62-3.75s3.6 1.52 3.6 3.7c0 .17-.03.45-.06.64h-5.35c.13.97.95 1.62 2.01 1.62.78 0 1.46-.29 1.91-.81l1.08 1.06c-.65.84-1.78 1.29-3.08 1.29-2.2 0-3.73-1.55-3.73-3.75Zm1.81-.72h3.6c-.12-.94-.84-1.58-1.81-1.58-.97 0-1.69.64-1.79 1.58ZM65.58 3.43h1.69v.97h.03c.33-.71 1.06-1.14 1.89-1.14 1.79 0 2.72 1.03 2.72 2.99v4.32h-1.79V6.59c0-1.21-.43-1.78-1.34-1.78-.91 0-1.4.64-1.4 1.82v3.93h-1.79V3.43h-.01ZM74.21 8.01v-3.1h-1.23V3.42h.65c.59 0 .82-.23.82-.82V1.49h1.53v1.94h1.74v1.49h-1.74v3.1c0 .69.36 1.08 1.03 1.08.2 0 .45-.03.59-.07v1.5c-.22.06-.62.1-.94.1-1.62 0-2.46-.9-2.46-2.62h.01ZM78.61 7c0-2.21 1.49-3.75 3.62-3.75s3.6 1.52 3.6 3.7c0 .17-.03.45-.06.64h-5.35c.13.97.95 1.62 2.01 1.62.78 0 1.46-.29 1.91-.81l1.08 1.06c-.65.84-1.78 1.29-3.08 1.29-2.2 0-3.73-1.55-3.73-3.75Zm1.81-.72h3.6c-.12-.94-.84-1.58-1.81-1.58-.97 0-1.69.64-1.79 1.58ZM0 37.65l3.53-3.53L0 30.59l2.35-2.35 3.53 3.53 3.53-3.53 2.35 2.35-3.53 3.53 3.53 3.53L9.41 40l-3.53-3.53L2.35 40 0 37.65ZM0 9.41l3.53-3.53L0 2.35 2.35 0l3.53 3.53L9.41 0l2.35 2.35-3.53 3.53 3.53 3.53-2.35 2.35-3.53-3.53-3.53 3.53L0 9.41ZM0 23.54l3.53-3.53L0 16.48l2.35-2.35 3.53 3.53 3.53-3.53 2.35 2.35-3.53 3.53 3.53 3.53-2.35 2.35-3.53-3.53-3.53 3.53L0 23.54Z" + fill="#ec0000"/> diff --git a/proprietary/assets/logo/vga-verzekeringen.svg b/proprietary/assets/logo/vga-verzekeringen.svg index 92a1b21075..1d58fec97b 100644 --- a/proprietary/assets/logo/vga-verzekeringen.svg +++ b/proprietary/assets/logo/vga-verzekeringen.svg @@ -2,8 +2,10 @@ VGA Verzekeringen + d="M17.13 29.86h2.07l2.39 7.22h.03l2.42-7.22h1.98l-3.36 9.4h-2.17l-3.36-9.4ZM26.5 34.55c0-2.85 2-4.86 4.82-4.86 1.43 0 2.63.46 3.49 1.39l-1.24 1.19c-.54-.59-1.3-.94-2.21-.94-1.71 0-2.89 1.33-2.89 3.23s1.16 3.28 2.82 3.28c1.52 0 2.57-.87 2.57-2.13v-.25h-2.27v-1.58h4.18v1.46c0 2.4-1.87 4.09-4.54 4.09s-4.71-2.02-4.71-4.89l-.02.01ZM40.43 29.86h2.17l3.76 9.4h-2.01l-.78-2.07h-4.18l-.78 2.07h-1.94l3.76-9.4Zm-.48 5.77h3.04l-1.5-3.96h-.03l-1.5 3.96h-.01ZM50.38 29.86h2.07l2.39 7.22h.03l2.42-7.22h1.98l-3.36 9.4h-2.17l-3.36-9.4ZM59.42 35.69c0-2.21 1.49-3.75 3.62-3.75s3.6 1.52 3.6 3.7c0 .17-.03.45-.06.64h-5.35c.13.97.95 1.62 2.01 1.62.78 0 1.46-.29 1.91-.81l1.08 1.06c-.65.84-1.78 1.29-3.08 1.29-2.2 0-3.73-1.55-3.73-3.75Zm1.81-.72h3.6c-.12-.94-.84-1.58-1.81-1.58-.97 0-1.69.64-1.79 1.58ZM68.13 32.12h1.69v1.19h.03c.35-.81.98-1.24 1.82-1.24.22 0 .52.03.64.07v1.71c-.2-.06-.59-.1-.88-.1-.91 0-1.5.69-1.5 1.76v3.76h-1.79v-7.14l-.01-.01ZM73.01 38.06l3.4-4.45h-3.3v-1.49h5.73v1.2l-3.4 4.45h3.5v1.49h-5.93v-1.2ZM79.88 35.69c0-2.21 1.49-3.75 3.62-3.75s3.6 1.52 3.6 3.7c0 .17-.03.45-.06.64h-5.35c.13.97.95 1.62 2.01 1.62.78 0 1.46-.29 1.91-.81l1.08 1.06c-.65.84-1.78 1.29-3.08 1.29-2.2 0-3.73-1.55-3.73-3.75Zm1.81-.72h3.6c-.12-.94-.84-1.58-1.81-1.58-.97 0-1.69.64-1.79 1.58ZM90.38 39.26h-1.79V28.77h1.79v6.57h.03l2.66-3.23h2.17l-2.76 3.17 2.89 3.98H93.2l-1.98-2.81-.84.97v1.84ZM95.68 35.69c0-2.21 1.49-3.75 3.62-3.75s3.6 1.52 3.6 3.7c0 .17-.03.45-.06.64h-5.35c.13.97.95 1.62 2.01 1.62.78 0 1.46-.29 1.91-.81l1.08 1.06c-.65.84-1.78 1.29-3.08 1.29-2.2 0-3.73-1.55-3.73-3.75Zm1.81-.72h3.6c-.12-.94-.84-1.58-1.81-1.58-.97 0-1.69.64-1.79 1.58ZM104.38 32.12h1.69v1.19h.03c.35-.81.98-1.24 1.82-1.24.22 0 .52.03.64.07v1.71c-.2-.06-.59-.1-.88-.1-.91 0-1.5.69-1.5 1.76v3.76h-1.79v-7.14l-.01-.01ZM110.65 31.21c-.62 0-1.07-.43-1.07-1.04 0-.61.45-1.04 1.07-1.04.62 0 1.07.43 1.07 1.04 0 .61-.45 1.04-1.07 1.04Zm-.9.91h1.79v7.14h-1.79v-7.14ZM113.48 32.12h1.69v.97h.03c.33-.71 1.06-1.14 1.89-1.14 1.79 0 2.72 1.03 2.72 2.99v4.32h-1.79v-3.98c0-1.21-.43-1.78-1.35-1.78-.92 0-1.4.64-1.4 1.82v3.93h-1.79v-7.14.01ZM121.55 40.97l1.16-1.13c.39.45 1.1.72 1.87.72 1.3 0 2.02-.59 2.02-1.63v-1.1h-.03c-.4.75-1.16 1.17-2.1 1.17-2.01 0-3.34-1.42-3.34-3.53s1.37-3.51 3.34-3.51c1.01 0 1.81.45 2.2 1.21h.03v-1.06h1.69v6.88c0 1.91-1.46 3.11-3.79 3.11-1.33 0-2.43-.42-3.05-1.14v.01Zm5.06-5.5c0-1.19-.74-2.01-1.82-2.01s-1.82.82-1.82 2.01.75 2 1.82 2 1.82-.82 1.82-2ZM129.88 35.69c0-2.21 1.49-3.75 3.62-3.75s3.6 1.52 3.6 3.7c0 .17-.03.45-.06.64h-5.35c.13.97.95 1.62 2.01 1.62.78 0 1.46-.29 1.91-.81l1.08 1.06c-.65.84-1.78 1.29-3.08 1.29-2.2 0-3.73-1.55-3.73-3.75Zm1.81-.72h3.6c-.12-.94-.84-1.58-1.81-1.58-.97 0-1.69.64-1.79 1.58ZM138.59 32.12h1.69v.97h.03c.33-.71 1.06-1.14 1.89-1.14 1.79 0 2.72 1.03 2.72 2.99v4.32h-1.79v-3.98c0-1.21-.43-1.78-1.35-1.78-.92 0-1.4.64-1.4 1.82v3.93h-1.79v-7.14.01Z" + fill="#000000"/> + d="M20.94 15.88h2.17l3.76 9.4h-2.01l-.78-2.07H19.9l-.78 2.07h-1.94l3.76-9.4Zm-.48 5.77h3.04L22 17.69h-.03l-1.5 3.96h-.01ZM28.05 18.14h1.68v.97h.03c.36-.74 1-1.14 1.82-1.14.93 0 1.62.4 2.05 1.21.43-.78 1.23-1.21 2.24-1.21 1.76 0 2.62.98 2.62 2.99v4.32H36.7v-4.02c0-1.17-.4-1.74-1.24-1.74s-1.29.62-1.29 1.79v3.96h-1.79v-4.02c0-1.19-.39-1.74-1.24-1.74s-1.29.64-1.29 1.79v3.96h-1.79v-7.14l-.01.02ZM41.79 22.29c-.97-.29-1.91-.81-1.91-2.11 0-1.3 1.1-2.21 2.73-2.21 1.1 0 1.95.39 2.43 1.11l-1.03 1.03c-.36-.45-.85-.69-1.39-.69-.61 0-.98.27-.98.71 0 .58.61.68 1.49.95.97.29 1.91.81 1.91 2.11 0 1.3-1.16 2.27-2.86 2.27-1.11 0-2.01-.39-2.53-1.13l1.03-1.03c.39.46.91.71 1.49.71.69 0 1.11-.29 1.11-.77 0-.58-.61-.68-1.49-.95ZM46.94 22.72v-3.09h-1.23v-1.49h.65c.59 0 .82-.23.82-.82v-1.11h1.53v1.94h1.74v1.49h-1.74v3.09c0 .69.36 1.08 1.03 1.08.2 0 .45-.03.59-.07v1.5c-.22.06-.62.1-.94.1-1.62 0-2.46-.9-2.46-2.62h.01ZM51.34 21.71c0-2.21 1.49-3.75 3.62-3.75s3.6 1.52 3.6 3.7c0 .17-.03.45-.06.64h-5.35c.13.97.95 1.62 2.01 1.62.78 0 1.46-.29 1.91-.81l1.08 1.06c-.65.84-1.78 1.29-3.08 1.29-2.2 0-3.73-1.55-3.73-3.75Zm1.81-.72h3.6c-.12-.94-.84-1.58-1.81-1.58-.97 0-1.69.64-1.79 1.58ZM60.04 18.14h1.69v1.19h.03c.35-.81.98-1.24 1.82-1.24.22 0 .52.03.64.07v1.71c-.2-.06-.59-.1-.88-.1-.91 0-1.5.69-1.5 1.76v3.76h-1.79v-7.14l-.01-.01ZM64.73 21.74c0-2.21 1.46-3.77 3.53-3.77.95 0 1.74.42 2.23 1.19h.03v-4.35h1.79V25.3h-1.69v-1.11h-.03c-.46.81-1.33 1.29-2.33 1.29-2.07 0-3.53-1.55-3.53-3.72v-.02Zm5.79-.03c0-1.29-.8-2.14-1.97-2.14s-1.98.87-1.98 2.14.8 2.14 1.98 2.14 1.97-.85 1.97-2.14ZM73.68 23.25c0-1.37 1.14-2.2 3.05-2.21h1.39v-.25c0-.84-.54-1.27-1.5-1.27-.64 0-1.2.25-1.59.69l-1.08-1.06c.62-.77 1.62-1.19 2.85-1.19 1.91 0 3.12 1.04 3.12 2.7v2.83c0 .26.12.38.4.38h.13v1.4h-.84c-.68 0-1.14-.32-1.29-.84h-.03c-.45.65-1.19 1.01-2.08 1.01-1.5 0-2.53-.9-2.53-2.21v.02Zm4.44-.62v-.4h-1.19c-.94.03-1.45.36-1.45.98 0 .55.43.94 1.04.94.94 0 1.59-.62 1.59-1.52h.01ZM81.85 18.14h1.68v.97h.03c.36-.74 1-1.14 1.82-1.14.93 0 1.62.4 2.05 1.21.43-.78 1.23-1.21 2.24-1.21 1.76 0 2.62.98 2.62 2.99v4.32H90.5v-4.02c0-1.17-.4-1.74-1.24-1.74s-1.29.62-1.29 1.79v3.96h-1.79v-4.02c0-1.19-.39-1.74-1.24-1.74s-1.29.64-1.29 1.79v3.96h-1.79v-7.14l-.01.02ZM17.58 6.41c0-2.85 2-4.86 4.82-4.86 1.43 0 2.63.46 3.49 1.39l-1.24 1.19c-.54-.59-1.3-.94-2.21-.94-1.71 0-2.89 1.33-2.89 3.23s1.16 3.28 2.82 3.28c1.52 0 2.57-.87 2.57-2.13v-.25h-2.27V5.74h4.18V7.2c0 2.4-1.87 4.09-4.54 4.09S17.6 9.27 17.6 6.4l-.02.01ZM28.05 7.55c0-2.21 1.49-3.75 3.62-3.75s3.6 1.52 3.6 3.7c0 .17-.03.45-.06.64h-5.35c.13.97.95 1.62 2.01 1.62.78 0 1.46-.29 1.91-.81l1.08 1.06c-.65.84-1.78 1.29-3.08 1.29-2.2 0-3.73-1.55-3.73-3.75Zm1.81-.72h3.6c-.12-.94-.84-1.58-1.81-1.58-.97 0-1.69.64-1.79 1.58ZM36.75 3.98h1.68v.97h.03c.36-.74 1-1.14 1.82-1.14.93 0 1.62.4 2.05 1.21.43-.78 1.23-1.21 2.24-1.21 1.76 0 2.62.98 2.62 2.99v4.32H45.4V7.1c0-1.17-.4-1.74-1.24-1.74s-1.29.62-1.29 1.79v3.96h-1.79V7.1c0-1.19-.39-1.74-1.24-1.74s-1.29.64-1.29 1.79v3.96h-1.79V3.98h-.01ZM48.61 7.55c0-2.21 1.49-3.75 3.62-3.75s3.6 1.52 3.6 3.7c0 .17-.03.45-.06.64h-5.35c.13.97.95 1.62 2.01 1.62.78 0 1.46-.29 1.91-.81l1.08 1.06c-.65.84-1.78 1.29-3.08 1.29-2.2 0-3.73-1.55-3.73-3.75Zm1.81-.72h3.6c-.12-.94-.84-1.58-1.81-1.58-.97 0-1.69.64-1.79 1.58ZM56.87 7.55c0-2.21 1.49-3.75 3.62-3.75s3.6 1.52 3.6 3.7c0 .17-.03.45-.06.64h-5.35c.13.97.95 1.62 2.01 1.62.78 0 1.46-.29 1.91-.81l1.08 1.06c-.65.84-1.78 1.29-3.08 1.29-2.2 0-3.73-1.55-3.73-3.75Zm1.81-.72h3.6c-.12-.94-.84-1.58-1.81-1.58-.97 0-1.69.64-1.79 1.58ZM65.58 3.98h1.69v.97h.03c.33-.71 1.06-1.14 1.89-1.14 1.79 0 2.72 1.03 2.72 2.99v4.32h-1.79V7.14c0-1.21-.43-1.78-1.34-1.78-.91 0-1.4.64-1.4 1.82v3.93h-1.79V3.98h-.01ZM74.21 8.56V5.47h-1.23V3.98h.65c.59 0 .82-.23.82-.82V2.04h1.53v1.94h1.74v1.49h-1.74v3.09c0 .69.36 1.08 1.03 1.08.2 0 .45-.03.59-.07v1.5c-.22.06-.62.1-.94.1-1.62 0-2.46-.9-2.46-2.62l.01.01ZM78.61 7.55c0-2.21 1.49-3.75 3.62-3.75s3.6 1.52 3.6 3.7c0 .17-.03.45-.06.64h-5.35c.13.97.95 1.62 2.01 1.62.78 0 1.46-.29 1.91-.81l1.08 1.06c-.65.84-1.78 1.29-3.08 1.29-2.2 0-3.73-1.55-3.73-3.75Zm1.81-.72h3.6c-.12-.94-.84-1.58-1.81-1.58-.97 0-1.69.64-1.79 1.58ZM0 38.2l3.53-3.53L0 31.14l2.35-2.35 3.53 3.53 3.53-3.53 2.35 2.35-3.53 3.53 3.53 3.53-2.35 2.35-3.53-3.53-3.53 3.53L0 38.2ZM0 9.96l3.53-3.53L0 2.9 2.35.55l3.53 3.53L9.41.55l2.35 2.35-3.53 3.53 3.53 3.53-2.35 2.35-3.53-3.53-3.53 3.53L0 9.96ZM0 24.09l3.53-3.53L0 17.03l2.35-2.35 3.53 3.53 3.53-3.53 2.35 2.35-3.53 3.53 3.53 3.53-2.35 2.35-3.53-3.53-3.53 3.53L0 24.09Z" + fill="#ec0000"/> From df0b60c4a4d01f4db2c7560ee5d4b5b83778042a Mon Sep 17 00:00:00 2001 From: Niels Roozemond Date: Wed, 15 Nov 2023 17:00:10 +0100 Subject: [PATCH 21/33] Logo seperated graphic, text and subtitle --- packages/react/src/Logo/LogoAmsterdam.tsx | 17 +++++++---- packages/react/src/Logo/LogoGgdAmsterdam.tsx | 28 ++++++++++++------- packages/react/src/Logo/LogoStadsarchief.tsx | 28 ++++++++++++------- .../react/src/Logo/LogoStadsbankVanLening.tsx | 28 ++++++++++++------- .../react/src/Logo/LogoVgaVerzekeringen.tsx | 28 ++++++++++++------- proprietary/assets/logo/amsterdam.svg | 15 ++++++---- proprietary/assets/logo/ggd-amsterdam.svg | 22 ++++++++------- proprietary/assets/logo/stadsarchief.svg | 22 ++++++++------- .../assets/logo/stadsbank-van-lening.svg | 22 ++++++++------- proprietary/assets/logo/vga-verzekeringen.svg | 22 ++++++++------- 10 files changed, 141 insertions(+), 91 deletions(-) diff --git a/packages/react/src/Logo/LogoAmsterdam.tsx b/packages/react/src/Logo/LogoAmsterdam.tsx index df90b4d97d..0a5524121c 100644 --- a/packages/react/src/Logo/LogoAmsterdam.tsx +++ b/packages/react/src/Logo/LogoAmsterdam.tsx @@ -3,11 +3,18 @@ import type { SVGProps } from 'react' const LogoAmsterdam = (props: SVGProps) => ( Gemeente Amsterdam - + + + + + + ) diff --git a/packages/react/src/Logo/LogoGgdAmsterdam.tsx b/packages/react/src/Logo/LogoGgdAmsterdam.tsx index 73fe0f65b2..f56c686c71 100644 --- a/packages/react/src/Logo/LogoGgdAmsterdam.tsx +++ b/packages/react/src/Logo/LogoGgdAmsterdam.tsx @@ -3,16 +3,24 @@ import type { SVGProps } from 'react' const LogoGgdAmsterdam = (props: SVGProps) => ( GGD Amsterdam - - + + + + + + + + + ) diff --git a/packages/react/src/Logo/LogoStadsarchief.tsx b/packages/react/src/Logo/LogoStadsarchief.tsx index 57cfe4eb01..98ff8a4aef 100644 --- a/packages/react/src/Logo/LogoStadsarchief.tsx +++ b/packages/react/src/Logo/LogoStadsarchief.tsx @@ -3,16 +3,24 @@ import type { SVGProps } from 'react' const LogoStadsarchief = (props: SVGProps) => ( Stadsarchief - - + + + + + + + + + ) diff --git a/packages/react/src/Logo/LogoStadsbankVanLening.tsx b/packages/react/src/Logo/LogoStadsbankVanLening.tsx index c76ce56f3b..335f904b0c 100644 --- a/packages/react/src/Logo/LogoStadsbankVanLening.tsx +++ b/packages/react/src/Logo/LogoStadsbankVanLening.tsx @@ -3,16 +3,24 @@ import type { SVGProps } from 'react' const LogoStadsbankVanLening = (props: SVGProps) => ( Stadsbank van Lening - - + + + + + + + + + ) diff --git a/packages/react/src/Logo/LogoVgaVerzekeringen.tsx b/packages/react/src/Logo/LogoVgaVerzekeringen.tsx index 418127c329..6995d0a056 100644 --- a/packages/react/src/Logo/LogoVgaVerzekeringen.tsx +++ b/packages/react/src/Logo/LogoVgaVerzekeringen.tsx @@ -3,16 +3,24 @@ import type { SVGProps } from 'react' const LogoVgaVerzekeringen = (props: SVGProps) => ( VGA Verzekeringen - - + + + + + + + + + ) diff --git a/proprietary/assets/logo/amsterdam.svg b/proprietary/assets/logo/amsterdam.svg index c499ff2d19..1325f6d430 100644 --- a/proprietary/assets/logo/amsterdam.svg +++ b/proprietary/assets/logo/amsterdam.svg @@ -1,7 +1,10 @@ - - Gemeente Amsterdam - + + + + + + + + + diff --git a/proprietary/assets/logo/ggd-amsterdam.svg b/proprietary/assets/logo/ggd-amsterdam.svg index 117954d25a..6c44afe772 100644 --- a/proprietary/assets/logo/ggd-amsterdam.svg +++ b/proprietary/assets/logo/ggd-amsterdam.svg @@ -1,11 +1,13 @@ - - GGD Amsterdam - - + + + + + + + + + + + + diff --git a/proprietary/assets/logo/stadsarchief.svg b/proprietary/assets/logo/stadsarchief.svg index 2d748ac8d3..2340f92ec9 100644 --- a/proprietary/assets/logo/stadsarchief.svg +++ b/proprietary/assets/logo/stadsarchief.svg @@ -1,11 +1,13 @@ - - Stadsarchief - - + + + + + + + + + + + + diff --git a/proprietary/assets/logo/stadsbank-van-lening.svg b/proprietary/assets/logo/stadsbank-van-lening.svg index 59415dac24..503c1ef788 100644 --- a/proprietary/assets/logo/stadsbank-van-lening.svg +++ b/proprietary/assets/logo/stadsbank-van-lening.svg @@ -1,11 +1,13 @@ - - Stadsbank van Lening - - + + + + + + + + + + + + diff --git a/proprietary/assets/logo/vga-verzekeringen.svg b/proprietary/assets/logo/vga-verzekeringen.svg index 1d58fec97b..29aba22a5b 100644 --- a/proprietary/assets/logo/vga-verzekeringen.svg +++ b/proprietary/assets/logo/vga-verzekeringen.svg @@ -1,11 +1,13 @@ - - VGA Verzekeringen - - + + + + + + + + + + + + From 6b6473f42a398241cecde6945d2d12d639af0422 Mon Sep 17 00:00:00 2001 From: Niels Roozemond Date: Thu, 16 Nov 2023 10:56:56 +0100 Subject: [PATCH 22/33] Logo tokens and CSS for svg parts --- packages/css/src/logo/logo.scss | 27 +++++-------------- packages/react/src/Logo/LogoAmsterdam.tsx | 4 +-- packages/react/src/Logo/LogoGgdAmsterdam.tsx | 6 ++--- packages/react/src/Logo/LogoStadsarchief.tsx | 6 ++--- .../react/src/Logo/LogoStadsbankVanLening.tsx | 6 ++--- .../react/src/Logo/LogoVgaVerzekeringen.tsx | 6 ++--- proprietary/assets/logo/amsterdam.svg | 6 ++--- proprietary/assets/logo/ggd-amsterdam.svg | 18 ++++++------- proprietary/assets/logo/stadsarchief.svg | 18 ++++++------- .../assets/logo/stadsbank-van-lening.svg | 18 ++++++------- proprietary/assets/logo/vga-verzekeringen.svg | 18 ++++++------- .../src/components/amsterdam/logo.tokens.json | 10 +++++++ 12 files changed, 65 insertions(+), 78 deletions(-) create mode 100644 proprietary/tokens/src/components/amsterdam/logo.tokens.json diff --git a/packages/css/src/logo/logo.scss b/packages/css/src/logo/logo.scss index 00177b672b..3481142838 100644 --- a/packages/css/src/logo/logo.scss +++ b/packages/css/src/logo/logo.scss @@ -8,32 +8,19 @@ } .amsterdam-logo__image { - height: 40px; + height: var(--amsterdam-logo-height); vertical-align: middle; width: auto; } -/** @deprecated */ -.amsterdam-logo--color-black { - fill: var(--amsterdam-color-primary-black); +.amsterdam-logo__emblem path { + fill: var(--amsterdam-logo-emblem-color); } -/** @deprecated */ -.amsterdam-logo--color-red { - fill: var(--amsterdam-color-primary-red); +.amsterdam-logo__title path { + fill: var(--amsterdam-logo-title-color); } -// Three classes below for future use -// Maybe even better: .amsterdam-svg__* - -.amsterdam-logo__emblem { - fill: var(--amsterdam-color-primary-red); -} - -.amsterdam-logo__text--primary { - fill: var(--amsterdam-color-primary-red); -} - -.amsterdam-logo__text--secondary { - fill: var(--amsterdam-color-primary-black); +.amsterdam-logo__subsite path { + fill: var(--amsterdam-logo-subsite-color); } diff --git a/packages/react/src/Logo/LogoAmsterdam.tsx b/packages/react/src/Logo/LogoAmsterdam.tsx index 0a5524121c..e5a827b0e4 100644 --- a/packages/react/src/Logo/LogoAmsterdam.tsx +++ b/packages/react/src/Logo/LogoAmsterdam.tsx @@ -3,13 +3,13 @@ import type { SVGProps } from 'react' const LogoAmsterdam = (props: SVGProps) => ( Gemeente Amsterdam - + - + ) => ( GGD Amsterdam - + - + - + ) => ( Stadsarchief - + - + - + ) => ( Stadsbank van Lening - + - + - + ) => ( VGA Verzekeringen - + - + - + - - + - + - diff --git a/proprietary/assets/logo/ggd-amsterdam.svg b/proprietary/assets/logo/ggd-amsterdam.svg index 6c44afe772..b21837fd6d 100644 --- a/proprietary/assets/logo/ggd-amsterdam.svg +++ b/proprietary/assets/logo/ggd-amsterdam.svg @@ -1,13 +1,11 @@ - - - - - - - - - - + + + + + + + + diff --git a/proprietary/assets/logo/stadsarchief.svg b/proprietary/assets/logo/stadsarchief.svg index 2340f92ec9..15b4e4e7be 100644 --- a/proprietary/assets/logo/stadsarchief.svg +++ b/proprietary/assets/logo/stadsarchief.svg @@ -1,13 +1,11 @@ - - - - - - - - - - + + + + + + + + diff --git a/proprietary/assets/logo/stadsbank-van-lening.svg b/proprietary/assets/logo/stadsbank-van-lening.svg index 503c1ef788..73786f2d95 100644 --- a/proprietary/assets/logo/stadsbank-van-lening.svg +++ b/proprietary/assets/logo/stadsbank-van-lening.svg @@ -1,13 +1,11 @@ - - - - - - - - - - + + + + + + + + diff --git a/proprietary/assets/logo/vga-verzekeringen.svg b/proprietary/assets/logo/vga-verzekeringen.svg index 29aba22a5b..de459c2f14 100644 --- a/proprietary/assets/logo/vga-verzekeringen.svg +++ b/proprietary/assets/logo/vga-verzekeringen.svg @@ -1,13 +1,11 @@ - - - - - - - - - - + + + + + + + + diff --git a/proprietary/tokens/src/components/amsterdam/logo.tokens.json b/proprietary/tokens/src/components/amsterdam/logo.tokens.json new file mode 100644 index 0000000000..c5dc032e89 --- /dev/null +++ b/proprietary/tokens/src/components/amsterdam/logo.tokens.json @@ -0,0 +1,10 @@ +{ + "amsterdam": { + "logo": { + "height": { "value": "40px" }, + "emblem": { "color": { "value": "{amsterdam.color.primary-red}" } }, + "title": { "color": { "value": "{amsterdam.color.primary-red}" } }, + "subsite": { "color": { "value": "{amsterdam.color.primary-black}" } } + } + } +} From badd03271258c7f3e39accb4ff097efbe5e655cf Mon Sep 17 00:00:00 2001 From: Niels Roozemond Date: Thu, 16 Nov 2023 11:51:58 +0100 Subject: [PATCH 23/33] Remove a11y tweaks in svg --- packages/react/src/Logo/LogoAmsterdam.tsx | 10 ++++++++-- packages/react/src/Logo/LogoGgdAmsterdam.tsx | 10 ++++++++-- packages/react/src/Logo/LogoStadsarchief.tsx | 10 ++++++++-- packages/react/src/Logo/LogoStadsbankVanLening.tsx | 10 ++++++++-- packages/react/src/Logo/LogoVgaVerzekeringen.tsx | 10 ++++++++-- 5 files changed, 40 insertions(+), 10 deletions(-) diff --git a/packages/react/src/Logo/LogoAmsterdam.tsx b/packages/react/src/Logo/LogoAmsterdam.tsx index e5a827b0e4..5b913f1b3d 100644 --- a/packages/react/src/Logo/LogoAmsterdam.tsx +++ b/packages/react/src/Logo/LogoAmsterdam.tsx @@ -1,8 +1,14 @@ import type { SVGProps } from 'react' const LogoAmsterdam = (props: SVGProps) => ( - - Gemeente Amsterdam + - {LogoComponent()} - - ) + return }, ) diff --git a/packages/react/src/Logo/brand/LogoAmsterdam.tsx b/packages/react/src/Logo/brand/LogoAmsterdam.tsx index 5b913f1b3d..322b17c99e 100644 --- a/packages/react/src/Logo/brand/LogoAmsterdam.tsx +++ b/packages/react/src/Logo/brand/LogoAmsterdam.tsx @@ -2,25 +2,23 @@ import type { SVGProps } from 'react' const LogoAmsterdam = (props: SVGProps) => ( ) diff --git a/packages/react/src/Logo/brand/LogoGgdAmsterdam.tsx b/packages/react/src/Logo/brand/LogoGgdAmsterdam.tsx index 938ec85345..762fa9b886 100644 --- a/packages/react/src/Logo/brand/LogoGgdAmsterdam.tsx +++ b/packages/react/src/Logo/brand/LogoGgdAmsterdam.tsx @@ -2,31 +2,28 @@ import type { SVGProps } from 'react' const LogoGgdAmsterdam = (props: SVGProps) => ( ) diff --git a/packages/react/src/Logo/brand/LogoStadsarchief.tsx b/packages/react/src/Logo/brand/LogoStadsarchief.tsx index bf6eea109e..b256983c28 100644 --- a/packages/react/src/Logo/brand/LogoStadsarchief.tsx +++ b/packages/react/src/Logo/brand/LogoStadsarchief.tsx @@ -2,31 +2,28 @@ import type { SVGProps } from 'react' const LogoStadsarchief = (props: SVGProps) => ( ) diff --git a/packages/react/src/Logo/brand/LogoStadsbankVanLening.tsx b/packages/react/src/Logo/brand/LogoStadsbankVanLening.tsx index d6c92d005b..642dd36cbb 100644 --- a/packages/react/src/Logo/brand/LogoStadsbankVanLening.tsx +++ b/packages/react/src/Logo/brand/LogoStadsbankVanLening.tsx @@ -2,31 +2,28 @@ import type { SVGProps } from 'react' const LogoStadsbankVanLening = (props: SVGProps) => ( ) diff --git a/packages/react/src/Logo/brand/LogoVgaVerzekeringen.tsx b/packages/react/src/Logo/brand/LogoVgaVerzekeringen.tsx index 8c8ff0612b..d614ee6b24 100644 --- a/packages/react/src/Logo/brand/LogoVgaVerzekeringen.tsx +++ b/packages/react/src/Logo/brand/LogoVgaVerzekeringen.tsx @@ -2,31 +2,28 @@ import type { SVGProps } from 'react' const LogoVgaVerzekeringen = (props: SVGProps) => ( ) From 6b3a4eacff72eca86139f9f7d986162e60a6682e Mon Sep 17 00:00:00 2001 From: Niels Roozemond Date: Wed, 22 Nov 2023 10:56:42 +0100 Subject: [PATCH 30/33] logo height and path css --- packages/css/src/logo/logo.scss | 6 +++--- pnpm-lock.yaml | 9 --------- .../tokens/src/components/amsterdam/logo.tokens.json | 2 +- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/packages/css/src/logo/logo.scss b/packages/css/src/logo/logo.scss index 46123577d3..9f708b3c64 100644 --- a/packages/css/src/logo/logo.scss +++ b/packages/css/src/logo/logo.scss @@ -12,14 +12,14 @@ // vertical-align: middle; // } -.amsterdam-logo__emblem path { +.amsterdam-logo__emblem { fill: var(--amsterdam-logo-emblem-color); } -.amsterdam-logo__title path { +.amsterdam-logo__title { fill: var(--amsterdam-logo-title-color); } -.amsterdam-logo__subsite path { +.amsterdam-logo__subsite { fill: var(--amsterdam-logo-subsite-color); } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 23fa9c46f1..dd1fc3ffc4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -835,7 +835,6 @@ packages: /@babel/parser@7.23.0: resolution: {integrity: sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==} engines: {node: '>=6.0.0'} - hasBin: true dependencies: '@babel/types': 7.23.0 dev: true @@ -843,7 +842,6 @@ packages: /@babel/parser@7.23.3: resolution: {integrity: sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw==} engines: {node: '>=6.0.0'} - hasBin: true dependencies: '@babel/types': 7.23.3 dev: true @@ -7043,7 +7041,6 @@ packages: /browserslist@4.22.1: resolution: {integrity: sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} - hasBin: true dependencies: caniuse-lite: 1.0.30001550 electron-to-chromium: 1.4.557 @@ -11604,7 +11601,6 @@ packages: /jsesc@0.5.0: resolution: {integrity: sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==} - hasBin: true dev: true /jsesc@2.5.2: @@ -13204,7 +13200,6 @@ packages: /node-gyp@10.0.1: resolution: {integrity: sha512-gg3/bHehQfZivQVfqIyy8wTdSymF9yTyP4CJifK73imyNMU8AIGQE2pUa7dNWfmMeG9cDVF2eehiRMv0LC1iAg==} engines: {node: ^16.14.0 || >=18.0.0} - hasBin: true dependencies: env-paths: 2.2.1 exponential-backoff: 3.1.1 @@ -14389,13 +14384,11 @@ packages: /prettier@2.8.8: resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==} engines: {node: '>=10.13.0'} - hasBin: true dev: true /prettier@3.1.0: resolution: {integrity: sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==} engines: {node: '>=14'} - hasBin: true dev: true /pretty-format@27.5.1: @@ -15451,7 +15444,6 @@ packages: /semver@6.3.1: resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==} - hasBin: true dev: true /semver@7.5.4: @@ -16247,7 +16239,6 @@ packages: /svgo@3.0.3: resolution: {integrity: sha512-X4UZvLhOglD5Xrp834HzGHf8RKUW0Ahigg/08yRO1no9t2NxffOkMiQ0WmaMIbaGlVTlSst2zWANsdhz5ybXgA==} engines: {node: '>=14.0.0'} - hasBin: true dependencies: '@trysound/sax': 0.2.0 commander: 7.2.0 diff --git a/proprietary/tokens/src/components/amsterdam/logo.tokens.json b/proprietary/tokens/src/components/amsterdam/logo.tokens.json index c5dc032e89..c2033a0c85 100644 --- a/proprietary/tokens/src/components/amsterdam/logo.tokens.json +++ b/proprietary/tokens/src/components/amsterdam/logo.tokens.json @@ -1,7 +1,7 @@ { "amsterdam": { "logo": { - "height": { "value": "40px" }, + "height": { "value": "2.5rem" }, "emblem": { "color": { "value": "{amsterdam.color.primary-red}" } }, "title": { "color": { "value": "{amsterdam.color.primary-red}" } }, "subsite": { "color": { "value": "{amsterdam.color.primary-black}" } } From cad81839e76eca31584ad4d2e6994a008401ba89 Mon Sep 17 00:00:00 2001 From: Aram Limpens Date: Wed, 22 Nov 2023 13:04:24 +0100 Subject: [PATCH 31/33] Pass ref to LogoComponents --- packages/react/src/Logo/Logo.test.tsx | 2 +- packages/react/src/Logo/Logo.tsx | 7 +++++-- packages/react/src/Logo/brand/LogoAmsterdam.tsx | 9 ++++++--- packages/react/src/Logo/brand/LogoGgdAmsterdam.tsx | 9 ++++++--- packages/react/src/Logo/brand/LogoStadsarchief.tsx | 9 ++++++--- packages/react/src/Logo/brand/LogoStadsbankVanLening.tsx | 9 ++++++--- packages/react/src/Logo/brand/LogoVgaVerzekeringen.tsx | 9 ++++++--- 7 files changed, 36 insertions(+), 18 deletions(-) diff --git a/packages/react/src/Logo/Logo.test.tsx b/packages/react/src/Logo/Logo.test.tsx index 8841b26ed4..f178a597dd 100644 --- a/packages/react/src/Logo/Logo.test.tsx +++ b/packages/react/src/Logo/Logo.test.tsx @@ -31,7 +31,7 @@ describe('Logo', () => { expect(component).toHaveClass('amsterdam-logo') }) - it.skip('supports ForwardRef in React', () => { + it('supports ForwardRef in React', () => { const ref = createRef() const { container } = render() diff --git a/packages/react/src/Logo/Logo.tsx b/packages/react/src/Logo/Logo.tsx index c817b7f20e..6d5d8f1dbc 100644 --- a/packages/react/src/Logo/Logo.tsx +++ b/packages/react/src/Logo/Logo.tsx @@ -4,7 +4,7 @@ */ import clsx from 'clsx' -import { ForwardedRef, forwardRef, FunctionComponent, SVGProps } from 'react' +import { ForwardedRef, forwardRef, ForwardRefExoticComponent, RefAttributes, SVGProps } from 'react' import { LogoAmsterdam, LogoGgdAmsterdam, @@ -19,7 +19,10 @@ export interface LogoProps extends SVGProps { brand?: LogoBrand } -const logoConfig: Record>> = { +const logoConfig: Record< + LogoBrand, + ForwardRefExoticComponent & RefAttributes> +> = { amsterdam: LogoAmsterdam, 'ggd-amsterdam': LogoGgdAmsterdam, stadsarchief: LogoStadsarchief, diff --git a/packages/react/src/Logo/brand/LogoAmsterdam.tsx b/packages/react/src/Logo/brand/LogoAmsterdam.tsx index 322b17c99e..1ea8537c34 100644 --- a/packages/react/src/Logo/brand/LogoAmsterdam.tsx +++ b/packages/react/src/Logo/brand/LogoAmsterdam.tsx @@ -1,10 +1,11 @@ -import type { SVGProps } from 'react' +import { ForwardedRef, forwardRef, type SVGProps } from 'react' -const LogoAmsterdam = (props: SVGProps) => ( +const LogoAmsterdam = forwardRef((props: SVGProps, ref: ForwardedRef) => ( -) +)) + +LogoAmsterdam.displayName = 'LogoAmsterdam' export default LogoAmsterdam diff --git a/packages/react/src/Logo/brand/LogoGgdAmsterdam.tsx b/packages/react/src/Logo/brand/LogoGgdAmsterdam.tsx index 762fa9b886..a4f0be1e8e 100644 --- a/packages/react/src/Logo/brand/LogoGgdAmsterdam.tsx +++ b/packages/react/src/Logo/brand/LogoGgdAmsterdam.tsx @@ -1,10 +1,11 @@ -import type { SVGProps } from 'react' +import { ForwardedRef, forwardRef, type SVGProps } from 'react' -const LogoGgdAmsterdam = (props: SVGProps) => ( +const LogoGgdAmsterdam = forwardRef((props: SVGProps, ref: ForwardedRef) => ( -) +)) + +LogoGgdAmsterdam.displayName = 'LogoGgdAmsterdam' export default LogoGgdAmsterdam diff --git a/packages/react/src/Logo/brand/LogoStadsarchief.tsx b/packages/react/src/Logo/brand/LogoStadsarchief.tsx index b256983c28..efb5ded004 100644 --- a/packages/react/src/Logo/brand/LogoStadsarchief.tsx +++ b/packages/react/src/Logo/brand/LogoStadsarchief.tsx @@ -1,10 +1,11 @@ -import type { SVGProps } from 'react' +import { ForwardedRef, forwardRef, type SVGProps } from 'react' -const LogoStadsarchief = (props: SVGProps) => ( +const LogoStadsarchief = forwardRef((props: SVGProps, ref: ForwardedRef) => ( -) +)) + +LogoStadsarchief.displayName = 'LogoStadsarchief' export default LogoStadsarchief diff --git a/packages/react/src/Logo/brand/LogoStadsbankVanLening.tsx b/packages/react/src/Logo/brand/LogoStadsbankVanLening.tsx index 642dd36cbb..ad316059c3 100644 --- a/packages/react/src/Logo/brand/LogoStadsbankVanLening.tsx +++ b/packages/react/src/Logo/brand/LogoStadsbankVanLening.tsx @@ -1,10 +1,11 @@ -import type { SVGProps } from 'react' +import { ForwardedRef, forwardRef, type SVGProps } from 'react' -const LogoStadsbankVanLening = (props: SVGProps) => ( +const LogoStadsbankVanLening = forwardRef((props: SVGProps, ref: ForwardedRef) => ( -) +)) + +LogoStadsbankVanLening.displayName = 'LogoStadsbankVanLening' export default LogoStadsbankVanLening diff --git a/packages/react/src/Logo/brand/LogoVgaVerzekeringen.tsx b/packages/react/src/Logo/brand/LogoVgaVerzekeringen.tsx index d614ee6b24..80446aaf2e 100644 --- a/packages/react/src/Logo/brand/LogoVgaVerzekeringen.tsx +++ b/packages/react/src/Logo/brand/LogoVgaVerzekeringen.tsx @@ -1,10 +1,11 @@ -import type { SVGProps } from 'react' +import { ForwardedRef, forwardRef, type SVGProps } from 'react' -const LogoVgaVerzekeringen = (props: SVGProps) => ( +const LogoVgaVerzekeringen = forwardRef((props: SVGProps, ref: ForwardedRef) => ( -) +)) + +LogoVgaVerzekeringen.displayName = 'LogoVgaVerzekeringen' export default LogoVgaVerzekeringen From e36be0f7ed07aa4cc7127607f34cd9fc66157e19 Mon Sep 17 00:00:00 2001 From: Aram Limpens Date: Wed, 22 Nov 2023 13:08:35 +0100 Subject: [PATCH 32/33] Fix lockfile --- pnpm-lock.yaml | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dd1fc3ffc4..24e90562ba 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -510,6 +510,7 @@ packages: /@aw-web-design/x-default-browser@1.4.126: resolution: {integrity: sha512-Xk1sIhyNC/esHGGVjL/niHLowM0csl/kFO5uawBy4IrWwy0o1G8LGt3jP6nmWGz+USxeeqbihAmp/oVZju6wug==} + hasBin: true dependencies: default-browser-id: 3.0.0 dev: true @@ -835,6 +836,7 @@ packages: /@babel/parser@7.23.0: resolution: {integrity: sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==} engines: {node: '>=6.0.0'} + hasBin: true dependencies: '@babel/types': 7.23.0 dev: true @@ -842,6 +844,7 @@ packages: /@babel/parser@7.23.3: resolution: {integrity: sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw==} engines: {node: '>=6.0.0'} + hasBin: true dependencies: '@babel/types': 7.23.3 dev: true @@ -882,6 +885,7 @@ packages: /@babel/plugin-proposal-class-properties@7.18.6(@babel/core@7.23.3): resolution: {integrity: sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==} engines: {node: '>=6.9.0'} + deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-properties instead. peerDependencies: '@babel/core': ^7.0.0-0 dependencies: @@ -893,6 +897,7 @@ packages: /@babel/plugin-proposal-nullish-coalescing-operator@7.18.6(@babel/core@7.23.3): resolution: {integrity: sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==} engines: {node: '>=6.9.0'} + deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-nullish-coalescing-operator instead. peerDependencies: '@babel/core': ^7.0.0-0 dependencies: @@ -904,6 +909,7 @@ packages: /@babel/plugin-proposal-optional-chaining@7.21.0(@babel/core@7.23.3): resolution: {integrity: sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==} engines: {node: '>=6.9.0'} + deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-chaining instead. peerDependencies: '@babel/core': ^7.0.0-0 dependencies: @@ -2736,6 +2742,7 @@ packages: /@lerna-lite/cli@2.7.0(@lerna-lite/publish@2.7.0)(@lerna-lite/run@2.7.0)(@lerna-lite/version@2.7.0)(typescript@5.2.2): resolution: {integrity: sha512-O6x75UFU87dk8CL8Zq4N2WBYP1jmYQOw8Xi+jpJiSNY29VuewnbijVpkslkvCdxEe2Qu7zqTV4TBGHT6fa5Z1Q==} engines: {node: '>=16.15.0', npm: '>=8.5.0'} + hasBin: true peerDependencies: '@lerna-lite/exec': '*' '@lerna-lite/list': '*' @@ -3115,6 +3122,7 @@ packages: /@npmcli/arborist@7.2.1: resolution: {integrity: sha512-o1QIAX56FC8HEPF+Hf4V4/hck9j0a3UiLnMX4aDHPbtU4Po1tUOUSmc2GAx947VWT+acrdMYTDkqUt2CaSXt7A==} engines: {node: ^16.14.0 || >=18.0.0} + hasBin: true dependencies: '@isaacs/string-locale-compare': 1.1.0 '@npmcli/fs': 3.1.0 @@ -4882,6 +4890,7 @@ packages: /@storybook/cli@7.5.3: resolution: {integrity: sha512-XysHSnknZTAcTbQ0bQsbfv5J8ifHpOBsmXjk1HCA05E9WGGrn9JrQRCfpDUQJ6O6UWq0bpMqzP8gFLWXFE7hug==} + hasBin: true dependencies: '@babel/core': 7.23.3 '@babel/preset-env': 7.23.3(@babel/core@7.23.3) @@ -6303,6 +6312,7 @@ packages: /JSONStream@1.3.5: resolution: {integrity: sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==} + hasBin: true dependencies: jsonparse: 1.3.1 through: 2.3.8 @@ -6372,11 +6382,13 @@ packages: /acorn@7.4.1: resolution: {integrity: sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==} engines: {node: '>=0.4.0'} + hasBin: true dev: true /acorn@8.10.0: resolution: {integrity: sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==} engines: {node: '>=0.4.0'} + hasBin: true dev: true /add-stream@1.0.0: @@ -7041,6 +7053,7 @@ packages: /browserslist@4.22.1: resolution: {integrity: sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} + hasBin: true dependencies: caniuse-lite: 1.0.30001550 electron-to-chromium: 1.4.557 @@ -7564,6 +7577,7 @@ packages: /color-support@1.1.3: resolution: {integrity: sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==} + hasBin: true dev: true /colord@2.9.3: @@ -7768,6 +7782,7 @@ packages: /conventional-changelog-writer@6.0.1: resolution: {integrity: sha512-359t9aHorPw+U+nHzUXHS5ZnPBOizRxfQsWT5ZDHBfvfxQOAik+yfuhKXG66CN5LEWPpMNnIMHUTCKeYNprvHQ==} engines: {node: '>=14'} + hasBin: true dependencies: conventional-commits-filter: 3.0.0 dateformat: 3.0.3 @@ -7789,6 +7804,7 @@ packages: /conventional-commits-parser@4.0.0: resolution: {integrity: sha512-WRv5j1FsVM5FISJkoYMR6tPk07fkKT0UodruX4je86V4owk451yjXAKzKAPOs9l7y59E2viHUS9eQ+dfUA9NSg==} engines: {node: '>=14'} + hasBin: true dependencies: JSONStream: 1.3.5 is-text-path: 1.0.1 @@ -7799,6 +7815,7 @@ packages: /conventional-commits-parser@5.0.0: resolution: {integrity: sha512-ZPMl0ZJbw74iS9LuX9YIAiW8pfM5p3yh2o/NbXHbkFuZzY5jvdi5jFycEOkmBW5H5I7nA+D6f3UcsCLP2vvSEA==} engines: {node: '>=16'} + hasBin: true dependencies: JSONStream: 1.3.5 is-text-path: 2.0.0 @@ -7809,6 +7826,7 @@ packages: /conventional-recommended-bump@7.0.1: resolution: {integrity: sha512-Ft79FF4SlOFvX4PkwFDRnaNiIVX7YbmqGU0RwccUaiGvgp3S0a8ipR2/Qxk31vclDNM+GSdJOVs2KrsUCjblVA==} engines: {node: '>=14'} + hasBin: true dependencies: concat-stream: 2.0.0 conventional-changelog-preset-loader: 3.0.0 @@ -8310,6 +8328,7 @@ packages: /detect-port@1.5.1: resolution: {integrity: sha512-aBzdj76lueB6uUst5iAs7+0H/oOjqI5D16XUWxlWMIMROhcM0rfsNVk93zTngq1dDNpoXRr++Sus7ETAExppAQ==} + hasBin: true dependencies: address: 1.2.2 debug: 4.3.4 @@ -8444,6 +8463,7 @@ packages: /ejs@3.1.9: resolution: {integrity: sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==} engines: {node: '>=0.10.0'} + hasBin: true dependencies: jake: 10.8.5 dev: true @@ -8510,6 +8530,7 @@ packages: /envinfo@7.8.1: resolution: {integrity: sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==} engines: {node: '>=4'} + hasBin: true dev: true /err-code@2.0.3: @@ -8650,6 +8671,7 @@ packages: /esbuild@0.18.12: resolution: {integrity: sha512-XuOVLDdtsDslXStStduT41op21Ytmf4/BDS46aa3xPJ7X5h2eMWBF1oAe3QjUH3bDksocNXgzGUZ7XHIBya6Tg==} engines: {node: '>=12'} + hasBin: true requiresBuild: true optionalDependencies: '@esbuild/android-arm': 0.18.12 @@ -8712,6 +8734,7 @@ packages: /escodegen@2.1.0: resolution: {integrity: sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==} engines: {node: '>=6.0'} + hasBin: true dependencies: esprima: 4.0.1 estraverse: 5.3.0 @@ -8722,6 +8745,7 @@ packages: /eslint-config-prettier@9.0.0(eslint@8.53.0): resolution: {integrity: sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw==} + hasBin: true peerDependencies: eslint: '>=7.0.0' dependencies: @@ -8936,6 +8960,7 @@ packages: /eslint@8.53.0: resolution: {integrity: sha512-N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + hasBin: true dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.53.0) '@eslint-community/regexpp': 4.8.2 @@ -9188,6 +9213,7 @@ packages: /extract-zip@1.7.0: resolution: {integrity: sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==} + hasBin: true dependencies: concat-stream: 1.6.2 debug: 2.6.9 @@ -9654,6 +9680,7 @@ packages: /get-pkg-repo@4.2.1: resolution: {integrity: sha512-2+QbHjFRfGB74v/pYWjd5OhU3TDIC2Gv/YKUTk/tCvAz0pkn/Mz6P3uByuBimLOcPvN2jYdScl3xGFSrx0jEcA==} engines: {node: '>=6.9.0'} + hasBin: true dependencies: '@hutson/parse-repository-url': 3.0.2 hosted-git-info: 4.1.0 @@ -9696,6 +9723,7 @@ packages: /giget@1.1.2: resolution: {integrity: sha512-HsLoS07HiQ5oqvObOI+Qb2tyZH4Gj5nYGfF9qQcZNrPw+uEFhdXtgJr01aO2pWadGHucajYDLxxbtQkm97ON2A==} + hasBin: true dependencies: colorette: 2.0.20 defu: 6.1.2 @@ -9711,6 +9739,7 @@ packages: /git-raw-commits@3.0.0: resolution: {integrity: sha512-b5OHmZ3vAgGrDn/X0kS+9qCfNKWe4K/jFnhwzVWWg0/k5eLa3060tZShrRg8Dja5kPc+YjS0Gc6y7cRr44Lpjw==} engines: {node: '>=14'} + hasBin: true dependencies: dargs: 7.0.0 meow: 8.1.2 @@ -9728,6 +9757,7 @@ packages: /git-semver-tags@5.0.1: resolution: {integrity: sha512-hIvOeZwRbQ+7YEUmCkHqo8FOLQZCEn18yevLHADlFPZY02KJGsu5FZt9YW/lybfK2uhWFI7Qg/07LekJiTv7iA==} engines: {node: '>=14'} + hasBin: true dependencies: meow: 8.1.2 semver: 7.5.4 @@ -9787,6 +9817,7 @@ packages: /glob@10.3.10: resolution: {integrity: sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==} engines: {node: '>=16 || 14 >=14.17'} + hasBin: true dependencies: foreground-child: 3.1.1 jackspeak: 2.3.5 @@ -9978,6 +10009,7 @@ packages: /gunzip-maybe@1.4.2: resolution: {integrity: sha512-4haO1M4mLO91PW57BMsDFf75UmwoRX0GkdD+Faw+Lr+r/OZrOCS0pIBwOL1xCKQqnQzbNFGgK2V2CpBUPeFNTw==} + hasBin: true dependencies: browserify-zlib: 0.1.4 is-deflate: 1.0.0 @@ -10134,6 +10166,7 @@ packages: /html-validate@8.7.1: resolution: {integrity: sha512-8zfWtAfyIWxqoHG1M8+8zCdKLCBFn/48Zdf2mRL6OuDvRTCSkSIDOYChLr22KiN3UJii8cTbMtH5PrQFw0ZWWg==} engines: {node: '>= 16.0'} + hasBin: true peerDependencies: jest: ^27.1 || ^28.1.3 || ^29.0.3 jest-diff: ^27.1 || ^28.1.3 || ^29.0.3 @@ -11053,6 +11086,7 @@ packages: /jake@10.8.5: resolution: {integrity: sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==} engines: {node: '>=10'} + hasBin: true dependencies: async: 3.2.4 chalk: 4.1.2 @@ -11101,6 +11135,7 @@ packages: /jest-cli@29.7.0(@types/node@20.9.1): resolution: {integrity: sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} + hasBin: true peerDependencies: node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 peerDependenciesMeta: @@ -11482,6 +11517,7 @@ packages: /jest@29.7.0(@types/node@20.9.1): resolution: {integrity: sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} + hasBin: true peerDependencies: node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 peerDependenciesMeta: @@ -11518,6 +11554,7 @@ packages: /js-yaml@3.14.1: resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==} + hasBin: true dependencies: argparse: 1.0.10 esprima: 4.0.1 @@ -11525,12 +11562,14 @@ packages: /js-yaml@4.1.0: resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==} + hasBin: true dependencies: argparse: 2.0.1 dev: true /jscodeshift@0.14.0(@babel/preset-env@7.23.3): resolution: {integrity: sha512-7eCC1knD7bLUPuSCwXsMZUH51O8jIcoVyKtI6P0XM0IVzlGjckPy3FIwQlorzbN0Sg79oK+RlohN32Mqf/lrYA==} + hasBin: true peerDependencies: '@babel/preset-env': ^7.1.6 dependencies: @@ -11601,6 +11640,7 @@ packages: /jsesc@0.5.0: resolution: {integrity: sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==} + hasBin: true dev: true /jsesc@2.5.2: @@ -11653,6 +11693,7 @@ packages: /json5@1.0.2: resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==} + hasBin: true dependencies: minimist: 1.2.8 dev: true @@ -11660,6 +11701,7 @@ packages: /json5@2.2.3: resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==} engines: {node: '>=6'} + hasBin: true dev: true /jsonc-parser@3.2.0: @@ -11817,6 +11859,7 @@ packages: /lint-staged@15.1.0: resolution: {integrity: sha512-ZPKXWHVlL7uwVpy8OZ7YQjYDAuO5X4kMh0XgZvPNxLcCCngd0PO5jKQyy3+s4TL2EnHoIXIzP1422f/l3nZKMw==} engines: {node: '>=18.12.0'} + hasBin: true dependencies: chalk: 5.3.0 commander: 11.1.0 @@ -12861,6 +12904,7 @@ packages: /mime@2.6.0: resolution: {integrity: sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==} engines: {node: '>=4.0.0'} + hasBin: true dev: true /mimic-fn@2.1.0: @@ -13113,6 +13157,7 @@ packages: /next@14.0.3(@babel/core@7.23.3)(react-dom@18.2.0)(react@18.2.0)(sass@1.69.5): resolution: {integrity: sha512-AbYdRNfImBr3XGtvnwOxq8ekVCwbFTv/UJoLwmaX89nk9i051AEY4/HAWzU0YpaTDw8IofUpmuIlvzWF13jxIw==} engines: {node: '>=18.17.0'} + hasBin: true peerDependencies: '@opentelemetry/api': ^1.1.0 react: ^18.2.0 @@ -13200,6 +13245,7 @@ packages: /node-gyp@10.0.1: resolution: {integrity: sha512-gg3/bHehQfZivQVfqIyy8wTdSymF9yTyP4CJifK73imyNMU8AIGQE2pUa7dNWfmMeG9cDVF2eehiRMv0LC1iAg==} engines: {node: ^16.14.0 || >=18.0.0} + hasBin: true dependencies: env-paths: 2.2.1 exponential-backoff: 3.1.1 @@ -13290,6 +13336,7 @@ packages: /nopt@7.2.0: resolution: {integrity: sha512-CVDtwCdhYIvnAzFoJ6NJ6dX3oga9/HyciQDnG1vQDjSLMeKLJ4A93ZqYKDrgYSr1FBY5/hMYC+2VCi24pgpkGA==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} + hasBin: true dependencies: abbrev: 2.0.0 dev: true @@ -13426,6 +13473,7 @@ packages: /npm-package-json-lint@7.1.0(typescript@5.2.2): resolution: {integrity: sha512-ypcMpag32TCP89zzLSS+7vjeR2QY613WzmO2upcJgKNWlcswDz8cdb80urbBNHkhSPI40ex3nsKrRDH/WhMYOg==} engines: {node: '>=16.0.0', npm: '>=8.0.0'} + hasBin: true dependencies: ajv: 6.12.6 ajv-errors: 1.0.1(ajv@6.12.6) @@ -13962,6 +14010,7 @@ packages: /pacote@17.0.4: resolution: {integrity: sha512-eGdLHrV/g5b5MtD5cTPyss+JxOlaOloSMG3UwPMAvL8ywaLJ6beONPF40K4KKl/UI6q5hTKCJq5rCu8tkF+7Dg==} engines: {node: ^16.14.0 || >=18.0.0} + hasBin: true dependencies: '@npmcli/git': 5.0.3 '@npmcli/installed-package-contents': 2.0.2 @@ -14235,6 +14284,7 @@ packages: /pidtree@0.6.0: resolution: {integrity: sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==} engines: {node: '>=0.10'} + hasBin: true dev: true /pify@2.3.0: @@ -14384,11 +14434,13 @@ packages: /prettier@2.8.8: resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==} engines: {node: '>=10.13.0'} + hasBin: true dev: true /prettier@3.1.0: resolution: {integrity: sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==} engines: {node: '>=14'} + hasBin: true dev: true /pretty-format@27.5.1: @@ -15211,18 +15263,21 @@ packages: /rimraf@2.6.3: resolution: {integrity: sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==} + hasBin: true dependencies: glob: 7.2.3 dev: true /rimraf@2.7.1: resolution: {integrity: sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==} + hasBin: true dependencies: glob: 7.2.3 dev: true /rimraf@3.0.2: resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==} + hasBin: true dependencies: glob: 7.2.3 dev: true @@ -15313,6 +15368,7 @@ packages: /rollup@3.29.4: resolution: {integrity: sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==} engines: {node: '>=14.18.0', npm: '>=8.0.0'} + hasBin: true optionalDependencies: fsevents: 2.3.3 dev: true @@ -15320,6 +15376,7 @@ packages: /rollup@4.4.1: resolution: {integrity: sha512-idZzrUpWSblPJX66i+GzrpjKE3vbYrlWirUHteoAbjKReZwa0cohAErOYA5efoMmNCdvG9yrJS+w9Kl6csaH4w==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} + hasBin: true optionalDependencies: '@rollup/rollup-android-arm-eabi': 4.4.1 '@rollup/rollup-android-arm64': 4.4.1 @@ -15406,6 +15463,7 @@ packages: /sass@1.69.5: resolution: {integrity: sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ==} engines: {node: '>=14.0.0'} + hasBin: true dependencies: chokidar: 3.5.3 immutable: 4.3.0 @@ -15440,15 +15498,18 @@ packages: /semver@5.7.1: resolution: {integrity: sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==} + hasBin: true dev: true /semver@6.3.1: resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==} + hasBin: true dev: true /semver@7.5.4: resolution: {integrity: sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==} engines: {node: '>=10'} + hasBin: true dependencies: lru-cache: 6.0.0 dev: true @@ -15818,6 +15879,7 @@ packages: /storybook@7.5.3: resolution: {integrity: sha512-lkn9hcedNmSNCzbDIrky2LpZJqlpS7Fy1KpGBZmLY34g5Mb0+KnXaUqzY0dxsd7aFm8Oa7Du/emceMYNNL4DMA==} + hasBin: true dependencies: '@storybook/cli': 7.5.3 transitivePeerDependencies: @@ -16025,6 +16087,7 @@ packages: /strong-log-transformer@2.1.0: resolution: {integrity: sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA==} engines: {node: '>=4'} + hasBin: true dependencies: duplexer: 0.1.2 minimist: 1.2.8 @@ -16034,6 +16097,7 @@ packages: /style-dictionary@3.9.0: resolution: {integrity: sha512-mnq8QfPJoj3ellKHRKZwmCgYUGgwYtoagW5edyKpR09O1W4/XqBdeKXoY/LbeIKqHrqVR7sGgk6E/dNYkPS4aA==} engines: {node: '>=12.0.0'} + hasBin: true dependencies: chalk: 4.1.2 change-case: 4.1.2 @@ -16144,6 +16208,7 @@ packages: /stylelint@15.11.0(typescript@5.2.2): resolution: {integrity: sha512-78O4c6IswZ9TzpcIiQJIN49K3qNoXTM8zEJzhaTE/xRTCZswaovSEVIa/uwbOltZrk16X4jAxjaOhzz/hTm1Kw==} engines: {node: ^14.13.1 || >=16.0.0} + hasBin: true dependencies: '@csstools/css-parser-algorithms': 2.3.2(@csstools/css-tokenizer@2.2.1) '@csstools/css-tokenizer': 2.2.1 @@ -16239,6 +16304,7 @@ packages: /svgo@3.0.3: resolution: {integrity: sha512-X4UZvLhOglD5Xrp834HzGHf8RKUW0Ahigg/08yRO1no9t2NxffOkMiQ0WmaMIbaGlVTlSst2zWANsdhz5ybXgA==} engines: {node: '>=14.0.0'} + hasBin: true dependencies: '@trysound/sax': 0.2.0 commander: 7.2.0 @@ -16925,6 +16991,7 @@ packages: /update-browserslist-db@1.0.13(browserslist@4.22.1): resolution: {integrity: sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==} + hasBin: true peerDependencies: browserslist: '>= 4.21.0' dependencies: @@ -17044,6 +17111,7 @@ packages: /uuid@9.0.1: resolution: {integrity: sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==} + hasBin: true dev: true /uvu@0.5.6: @@ -17132,6 +17200,7 @@ packages: /vite@4.5.0(@types/node@20.9.1)(sass@1.69.5): resolution: {integrity: sha512-ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw==} engines: {node: ^14.18.0 || >=16.0.0} + hasBin: true peerDependencies: '@types/node': '>= 14' less: '*' @@ -17201,6 +17270,7 @@ packages: /wait-on@7.2.0: resolution: {integrity: sha512-wCQcHkRazgjG5XoAq9jbTMLpNIjoSlZslrJ2+N9MxDsGEv1HnFoVjOCexL0ESva7Y9cu350j+DWADdk54s4AFQ==} engines: {node: '>=12.0.0'} + hasBin: true dependencies: axios: 1.6.1 joi: 17.11.0 @@ -17338,6 +17408,7 @@ packages: /which@1.3.1: resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==} + hasBin: true dependencies: isexe: 2.0.0 dev: true @@ -17345,6 +17416,7 @@ packages: /which@2.0.2: resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==} engines: {node: '>= 8'} + hasBin: true dependencies: isexe: 2.0.0 dev: true @@ -17352,6 +17424,7 @@ packages: /which@3.0.1: resolution: {integrity: sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} + hasBin: true dependencies: isexe: 2.0.0 dev: true @@ -17359,6 +17432,7 @@ packages: /which@4.0.0: resolution: {integrity: sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==} engines: {node: ^16.13.0 || >=18.0.0} + hasBin: true dependencies: isexe: 3.1.1 dev: true From dd8162411f5a13c8e8b575520652138c84c445cb Mon Sep 17 00:00:00 2001 From: Niels Roozemond Date: Wed, 22 Nov 2023 15:40:22 +0100 Subject: [PATCH 33/33] Class renames and css cleanup --- packages/css/src/logo/logo.scss | 9 ++------- packages/react/src/Logo/brand/LogoAmsterdam.tsx | 2 +- packages/react/src/Logo/brand/LogoGgdAmsterdam.tsx | 4 ++-- packages/react/src/Logo/brand/LogoStadsarchief.tsx | 4 ++-- packages/react/src/Logo/brand/LogoStadsbankVanLening.tsx | 4 ++-- packages/react/src/Logo/brand/LogoVgaVerzekeringen.tsx | 4 ++-- proprietary/assets/logo/amsterdam.svg | 2 +- proprietary/assets/logo/ggd-amsterdam.svg | 4 ++-- proprietary/assets/logo/stadsarchief.svg | 4 ++-- proprietary/assets/logo/stadsbank-van-lening.svg | 4 ++-- proprietary/assets/logo/vga-verzekeringen.svg | 4 ++-- 11 files changed, 20 insertions(+), 25 deletions(-) diff --git a/packages/css/src/logo/logo.scss b/packages/css/src/logo/logo.scss index 9f708b3c64..c08b1c12e3 100644 --- a/packages/css/src/logo/logo.scss +++ b/packages/css/src/logo/logo.scss @@ -4,22 +4,17 @@ */ .amsterdam-logo { - // display: inline-block; height: var(--amsterdam-logo-height); } -// .amsterdam-logo__image { -// vertical-align: middle; -// } - .amsterdam-logo__emblem { fill: var(--amsterdam-logo-emblem-color); } -.amsterdam-logo__title { +.amsterdam-logo__text-primary { fill: var(--amsterdam-logo-title-color); } -.amsterdam-logo__subsite { +.amsterdam-logo__text-secondary { fill: var(--amsterdam-logo-subsite-color); } diff --git a/packages/react/src/Logo/brand/LogoAmsterdam.tsx b/packages/react/src/Logo/brand/LogoAmsterdam.tsx index 1ea8537c34..ff77c4d1da 100644 --- a/packages/react/src/Logo/brand/LogoAmsterdam.tsx +++ b/packages/react/src/Logo/brand/LogoAmsterdam.tsx @@ -11,7 +11,7 @@ const LogoAmsterdam = forwardRef((props: SVGProps, ref: Forwarded {...props} > diff --git a/packages/react/src/Logo/brand/LogoGgdAmsterdam.tsx b/packages/react/src/Logo/brand/LogoGgdAmsterdam.tsx index a4f0be1e8e..4ea716c79f 100644 --- a/packages/react/src/Logo/brand/LogoGgdAmsterdam.tsx +++ b/packages/react/src/Logo/brand/LogoGgdAmsterdam.tsx @@ -16,12 +16,12 @@ const LogoGgdAmsterdam = forwardRef((props: SVGProps, ref: Forwar d="m0 37.648 3.527-3.527L0 30.593l2.352-2.351 3.527 3.527 3.528-3.527 2.351 2.351-3.527 3.528 3.527 3.527L9.407 40l-3.528-3.527L2.352 40 0 37.648ZM0 23.54l3.527-3.528L0 16.485l2.352-2.352 3.527 3.528 3.528-3.528 2.351 2.352-3.527 3.527 3.527 3.528-2.351 2.351-3.528-3.527-3.527 3.527L0 23.54ZM0 9.407l3.527-3.528L0 2.352 2.352 0l3.527 3.527L9.407 0l2.351 2.352-3.527 3.527 3.527 3.528-2.351 2.351-3.528-3.527-3.526 3.527L0 9.407Z" /> diff --git a/packages/react/src/Logo/brand/LogoStadsarchief.tsx b/packages/react/src/Logo/brand/LogoStadsarchief.tsx index efb5ded004..627d76b19c 100644 --- a/packages/react/src/Logo/brand/LogoStadsarchief.tsx +++ b/packages/react/src/Logo/brand/LogoStadsarchief.tsx @@ -16,12 +16,12 @@ const LogoStadsarchief = forwardRef((props: SVGProps, ref: Forwar d="m0 37.648 3.527-3.527L0 30.593l2.352-2.351 3.527 3.527 3.528-3.527 2.351 2.351-3.527 3.528 3.527 3.527L9.407 40l-3.528-3.527L2.352 40 0 37.648ZM0 9.407l3.527-3.528L0 2.352 2.352 0l3.527 3.527L9.407 0l2.351 2.352-3.527 3.527 3.527 3.528-2.351 2.351-3.528-3.527-3.526 3.527L0 9.407ZM0 23.54l3.527-3.528L0 16.485l2.352-2.352 3.527 3.528 3.528-3.528 2.351 2.352-3.527 3.527 3.527 3.528-2.351 2.351-3.528-3.527-3.527 3.527L0 23.54Z" /> diff --git a/packages/react/src/Logo/brand/LogoStadsbankVanLening.tsx b/packages/react/src/Logo/brand/LogoStadsbankVanLening.tsx index ad316059c3..95881f6b13 100644 --- a/packages/react/src/Logo/brand/LogoStadsbankVanLening.tsx +++ b/packages/react/src/Logo/brand/LogoStadsbankVanLening.tsx @@ -16,12 +16,12 @@ const LogoStadsbankVanLening = forwardRef((props: SVGProps, ref: d="m0 37.65 3.53-3.53L0 30.59l2.35-2.35 3.53 3.53 3.53-3.53 2.35 2.35-3.53 3.53 3.53 3.53L9.41 40l-3.53-3.53L2.35 40 0 37.65ZM0 9.41l3.53-3.53L0 2.35 2.35 0l3.53 3.53L9.41 0l2.35 2.35-3.53 3.53 3.53 3.53-2.35 2.35-3.53-3.53-3.53 3.53L0 9.41ZM0 23.54l3.53-3.53L0 16.48l2.35-2.35 3.53 3.53 3.53-3.53 2.35 2.35-3.53 3.53 3.53 3.53-2.35 2.35-3.53-3.53-3.53 3.53L0 23.54Z" /> diff --git a/packages/react/src/Logo/brand/LogoVgaVerzekeringen.tsx b/packages/react/src/Logo/brand/LogoVgaVerzekeringen.tsx index 80446aaf2e..16c43aff02 100644 --- a/packages/react/src/Logo/brand/LogoVgaVerzekeringen.tsx +++ b/packages/react/src/Logo/brand/LogoVgaVerzekeringen.tsx @@ -16,12 +16,12 @@ const LogoVgaVerzekeringen = forwardRef((props: SVGProps, ref: Fo d="m0 38.2 3.53-3.53L0 31.14l2.35-2.35 3.53 3.53 3.53-3.53 2.35 2.35-3.53 3.53 3.53 3.53-2.35 2.35-3.53-3.53-3.53 3.53L0 38.2ZM0 9.96l3.53-3.53L0 2.9 2.35.55l3.53 3.53L9.41.55l2.35 2.35-3.53 3.53 3.53 3.53-2.35 2.35-3.53-3.53-3.53 3.53L0 9.96ZM0 24.09l3.53-3.53L0 17.03l2.35-2.35 3.53 3.53 3.53-3.53 2.35 2.35-3.53 3.53 3.53 3.53-2.35 2.35-3.53-3.53-3.53 3.53L0 24.09Z" /> diff --git a/proprietary/assets/logo/amsterdam.svg b/proprietary/assets/logo/amsterdam.svg index e73c01ae32..6502f58399 100644 --- a/proprietary/assets/logo/amsterdam.svg +++ b/proprietary/assets/logo/amsterdam.svg @@ -1,5 +1,5 @@ - + diff --git a/proprietary/assets/logo/ggd-amsterdam.svg b/proprietary/assets/logo/ggd-amsterdam.svg index b21837fd6d..b9051bd1a3 100644 --- a/proprietary/assets/logo/ggd-amsterdam.svg +++ b/proprietary/assets/logo/ggd-amsterdam.svg @@ -2,10 +2,10 @@ - + - + diff --git a/proprietary/assets/logo/stadsarchief.svg b/proprietary/assets/logo/stadsarchief.svg index 15b4e4e7be..2f1e4c1bd3 100644 --- a/proprietary/assets/logo/stadsarchief.svg +++ b/proprietary/assets/logo/stadsarchief.svg @@ -2,10 +2,10 @@ - + - + diff --git a/proprietary/assets/logo/stadsbank-van-lening.svg b/proprietary/assets/logo/stadsbank-van-lening.svg index 73786f2d95..57b8404e9d 100644 --- a/proprietary/assets/logo/stadsbank-van-lening.svg +++ b/proprietary/assets/logo/stadsbank-van-lening.svg @@ -2,10 +2,10 @@ - + - + diff --git a/proprietary/assets/logo/vga-verzekeringen.svg b/proprietary/assets/logo/vga-verzekeringen.svg index de459c2f14..b08e08cc68 100644 --- a/proprietary/assets/logo/vga-verzekeringen.svg +++ b/proprietary/assets/logo/vga-verzekeringen.svg @@ -2,10 +2,10 @@ - + - +