From afebdebc6904eee80b53e971f25a8df7654aa884 Mon Sep 17 00:00:00 2001 From: Michael Marszalek Date: Thu, 6 Jun 2024 08:36:47 +0200 Subject: [PATCH 01/24] test storefront next --- .github/workflows/storefront-deploy.yml | 31 ++++++++++++++++++++----- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/.github/workflows/storefront-deploy.yml b/.github/workflows/storefront-deploy.yml index 83a7d73e50..3d6bf723c2 100644 --- a/.github/workflows/storefront-deploy.yml +++ b/.github/workflows/storefront-deploy.yml @@ -1,11 +1,19 @@ -name: Deploy Storefront Production +name: Deploy Storefront env: VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }} VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID_STOREFRONT }} on: + workflow_dispatch: + inputs: + environment: + type: choice + description: Deploy to environment + options: + - production + - next push: branches: - - main + - next paths: - 'apps/storefront/**' jobs: @@ -29,11 +37,22 @@ jobs: - name: Install Vercel CLI run: yarn add vercel@latest + - name: Set default environment value if push event is triggered + id: defaultenvironment + run: | + ENVIRONMENT=${{ github.event.inputs.environment }} + echo "value=${ENVIRONMENT:-"next"}" >> "$GITHUB_OUTPUT" + - name: Pull Vercel Environment Information - run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }} + run: vercel pull --yes --environment=${{(steps.defaultenvironment.outputs.value == 'next' && 'preview') || 'production'}} --token=${{ secrets.VERCEL_TOKEN }} - name: Build Project Artifacts - run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }} + run: vercel build ${{(steps.defaultenvironment.outputs.value == 'production' && '--prod') || ''}} --token=${{ secrets.VERCEL_TOKEN }} + + - id: deploy + name: Deploy Project Artifacts to Vercel + run: echo "url=$(vercel deploy --prebuilt ${{(steps.defaultenvironment.outputs.value == 'production' && '--prod') || ''}} --token=${{ secrets.VERCEL_TOKEN }})" >> $GITHUB_OUTPUT - - name: Deploy Project Artifacts to Vercel - run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }} + - name: Set Vercel alias + run: vercel alias --token=${{ secrets.VERCEL_TOKEN }} --scope=${{ secrets.VERCEL_TEAM }} set ${{ steps.deploy.outputs.url }} next.designsystemet.no + if: steps.defaultenvironment.outputs.value == 'next' From 0854a52006638b3458de1ff4b14e610c94d67a22 Mon Sep 17 00:00:00 2001 From: Michael Marszalek Date: Thu, 6 Jun 2024 08:39:07 +0200 Subject: [PATCH 02/24] set default input for environment --- .github/workflows/storefront-deploy.yml | 1 + .github/workflows/storybook-deploy-vercel.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/storefront-deploy.yml b/.github/workflows/storefront-deploy.yml index 3d6bf723c2..876bb5e843 100644 --- a/.github/workflows/storefront-deploy.yml +++ b/.github/workflows/storefront-deploy.yml @@ -7,6 +7,7 @@ on: inputs: environment: type: choice + default: next description: Deploy to environment options: - production diff --git a/.github/workflows/storybook-deploy-vercel.yml b/.github/workflows/storybook-deploy-vercel.yml index 1e8d77043d..e4af7eaac7 100644 --- a/.github/workflows/storybook-deploy-vercel.yml +++ b/.github/workflows/storybook-deploy-vercel.yml @@ -8,6 +8,7 @@ on: inputs: environment: type: choice + default: next description: Deploy to environment options: - production From c1063b04ff2e1ab6125fc66ce9cc28e190be4a79 Mon Sep 17 00:00:00 2001 From: Barsnes Date: Thu, 6 Jun 2024 09:19:46 +0200 Subject: [PATCH 03/24] css fixes --- packages/css/accordion.css | 6 +++++- packages/css/checkbox.css | 2 +- packages/css/radio.css | 2 +- packages/css/table.css | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/css/accordion.css b/packages/css/accordion.css index 1edf3b58c4..2e56bfa99e 100644 --- a/packages/css/accordion.css +++ b/packages/css/accordion.css @@ -2,6 +2,7 @@ .fds-accordion { --dsc-accordion-border-radius: var(--ds-border-radius-md); --dsc-accordion-border-color: var(--ds-color-neutral-border-subtle); + --dsc-accordion-border-divider-color: var(--ds-color-neutral-border-subtle); border-bottom: 1px solid var(--ds-color-neutral-border-subtle); box-sizing: border-box; @@ -71,6 +72,7 @@ .fds-accordion--brand1, .fds-accordion--brand1 .fds-accordion__button { --dsc-accordion-border-color: var(--ds-color-brand1-border-subtle); + --dsc-accordion-border-divider-color: var(--ds-color-brand1-border-subtle); background: var(--ds-color-brand1-surface-default); } @@ -78,6 +80,7 @@ .fds-accordion--brand2, .fds-accordion--brand2 .fds-accordion__button { --dsc-accordion-border-color: var(--ds-color-brand2-border-subtle); + --dsc-accordion-border-divider-color: var(--ds-color-brand2-border-subtle); background: var(--ds-color-brand2-surface-default); } @@ -85,6 +88,7 @@ .fds-accordion--brand3, .fds-accordion--brand3 .fds-accordion__button { --dsc-accordion-border-color: var(--ds-color-brand3-border-subtle); + --dsc-accordion-border-divider-color: var(--ds-color-brand3-border-subtle); background: var(--ds-color-brand3-surface-default); } @@ -107,7 +111,7 @@ .fds-accordion--brand1 .fds-accordion__item:not(:first-child) .fds-accordion__button, .fds-accordion--brand2 .fds-accordion__item:not(:first-child) .fds-accordion__button, .fds-accordion--brand3 .fds-accordion__item:not(:first-child) .fds-accordion__button { - border-top: 1px solid var(--ds-color-neutral-background-default); + border-top: 1px solid var(--dsc-accordion-border-divider-color); } .fds-accordion--border .fds-accordion__item:first-of-type .fds-accordion__button:first-of-type { diff --git a/packages/css/checkbox.css b/packages/css/checkbox.css index 8c509e5233..08787f476a 100644 --- a/packages/css/checkbox.css +++ b/packages/css/checkbox.css @@ -3,7 +3,7 @@ --dsc-checkbox-size: 1.75rem; --dsc-checkbox-focus-border-width: 3px; --dsc-checkbox-background: var(--ds-color-neutral-background-default); - --dsc-checkbox-border-color: var(--ds-color-neutral-border-strong); + --dsc-checkbox-border-color: var(--ds-color-neutral-border-default); --dsc-checkbox-border__hover--size: calc(var(--ds-spacing-3) / 2); --dsc-checkbox-border__hover: 0 0 0 var(--dsc-checkbox-border__hover--size) var(--ds-color-accent-surface-hover); --dsc-checkbox-check_color: transparent; diff --git a/packages/css/radio.css b/packages/css/radio.css index 29c8d608da..96ed639679 100644 --- a/packages/css/radio.css +++ b/packages/css/radio.css @@ -3,7 +3,7 @@ --dsc-radio-size: var(--ds-spacing-5); --dsc-radio-focus-border-width: 3px; --dsc-radio-background: var(--ds-color-neutral-background-default); - --dsc-radio-border-color: var(--ds-color-neutral-border-strong); + --dsc-radio-border-color: var(--ds-color-neutral-border-default); --dsc-radio-border__hover--size: calc(var(--ds-spacing-3) / 2); --dsc-radio-border__hover: 0 0 0 var(--dsc-radio-border__hover--size) var(--ds-color-accent-surface-hover); diff --git a/packages/css/table.css b/packages/css/table.css index 5c8fff7981..da36251ada 100644 --- a/packages/css/table.css +++ b/packages/css/table.css @@ -105,7 +105,7 @@ .fds-table--border { border-radius: var(--dsc-table-border-radius); - border: 1px solid var(--ds-color-neutral-border-default); + border: 1px solid var(--ds-color-neutral-border-subtle); } .fds-table--border .fds-table__head .fds-table__header__cell:first-of-type { From 14ce2286ae054c34e360bf76be9e23128926f1ab Mon Sep 17 00:00:00 2001 From: Lasse Febakke Straum <33222679+Febakke@users.noreply.github.com> Date: Thu, 6 Jun 2024 09:33:04 +0200 Subject: [PATCH 04/24] Added secondary typography set --- design-tokens/$metadata.json | 1 + design-tokens/$themes.json | 21 +- .../primitives/colors/dark/global.json | 360 +++++++++--------- .../primitives/colors/dark/theme2.json | 300 +++++++-------- .../primitives/colors/dark/theme3.json | 300 +++++++-------- .../primitives/colors/dark/theme4.json | 300 +++++++-------- .../primitives/colors/light/global.json | 360 +++++++++--------- .../primitives/colors/light/theme2.json | 300 +++++++-------- .../primitives/colors/light/theme3.json | 300 +++++++-------- .../primitives/colors/light/theme4.json | 300 +++++++-------- .../primitives/typography/secondary.json | 86 +++++ design-tokens/semantic/style.json | 8 +- 12 files changed, 1365 insertions(+), 1271 deletions(-) create mode 100644 design-tokens/primitives/typography/secondary.json diff --git a/design-tokens/$metadata.json b/design-tokens/$metadata.json index 9b05b8a0cf..3f1ab155a7 100644 --- a/design-tokens/$metadata.json +++ b/design-tokens/$metadata.json @@ -2,6 +2,7 @@ "tokenSetOrder": [ "primitives/globals", "primitives/typography/default", + "primitives/typography/secondary", "primitives/colors/dark/global", "primitives/colors/dark/theme", "primitives/colors/dark/theme2", diff --git a/design-tokens/$themes.json b/design-tokens/$themes.json index 8a82101744..b92d318888 100644 --- a/design-tokens/$themes.json +++ b/design-tokens/$themes.json @@ -8,7 +8,8 @@ "primitives/colors/light/theme4": "enabled", "primitives/colors/light/theme3": "enabled", "primitives/colors/light/theme2": "enabled", - "primitives/colors/light/theme": "enabled" + "primitives/colors/light/theme": "enabled", + "primitives/typography/secondary": "disabled" }, "$figmaCollectionId": "VariableCollectionId:34811:5472", "$figmaModeId": "34811:0", @@ -415,7 +416,8 @@ "primitives/colors/dark/theme4": "enabled", "primitives/colors/dark/theme3": "enabled", "primitives/colors/dark/theme2": "enabled", - "primitives/colors/dark/theme": "enabled" + "primitives/colors/dark/theme": "enabled", + "primitives/typography/secondary": "disabled" }, "$figmaCollectionId": "VariableCollectionId:34811:5472", "$figmaModeId": "34811:1", @@ -818,7 +820,8 @@ "name": "digdir", "$figmaStyleReferences": {}, "selectedTokenSets": { - "themes/theme": "enabled" + "themes/theme": "enabled", + "primitives/typography/secondary": "disabled" }, "$figmaCollectionId": "VariableCollectionId:34811:5713", "$figmaModeId": "34811:2", @@ -906,7 +909,8 @@ "name": "altinn", "$figmaStyleReferences": {}, "selectedTokenSets": { - "themes/theme2": "enabled" + "themes/theme2": "enabled", + "primitives/typography/secondary": "disabled" }, "$figmaCollectionId": "VariableCollectionId:34811:5713", "$figmaModeId": "34811:3", @@ -997,7 +1001,8 @@ "semantic/style": "enabled", "semantic/color": "enabled", "primitives/globals": "source", - "primitives/typography/default": "source" + "primitives/typography/default": "source", + "primitives/typography/secondary": "disabled" }, "$figmaCollectionId": "VariableCollectionId:34811:5976", "$figmaModeId": "34811:5", @@ -1195,7 +1200,8 @@ "name": "uutilsynet", "$figmaStyleReferences": {}, "selectedTokenSets": { - "themes/theme3": "enabled" + "themes/theme3": "enabled", + "primitives/typography/secondary": "disabled" }, "group": "Theme", "$figmaCollectionId": "VariableCollectionId:34811:5713", @@ -1283,7 +1289,8 @@ "name": "portal", "$figmaStyleReferences": {}, "selectedTokenSets": { - "themes/theme4": "enabled" + "themes/theme4": "enabled", + "primitives/typography/secondary": "disabled" }, "group": "Theme", "$figmaCollectionId": "VariableCollectionId:34811:5713", diff --git a/design-tokens/primitives/colors/dark/global.json b/design-tokens/primitives/colors/dark/global.json index aa4fb5c045..734966d44a 100644 --- a/design-tokens/primitives/colors/dark/global.json +++ b/design-tokens/primitives/colors/dark/global.json @@ -2,374 +2,374 @@ "global": { "blue": { "1": { - "value": "#031d30", - "type": "color" + "type": "color", + "value": "#031d30" }, "2": { - "value": "#032540", - "type": "color" + "type": "color", + "value": "#032540" }, "3": { - "value": "#043256", - "type": "color" + "type": "color", + "value": "#043256" }, "4": { - "value": "#063f6c", - "type": "color" + "type": "color", + "value": "#063f6c" }, "5": { - "value": "#074d84", - "type": "color" + "type": "color", + "value": "#074d84" }, "6": { - "value": "#075490", - "type": "color" + "type": "color", + "value": "#075490" }, "7": { - "value": "#0c72c1", - "type": "color" + "type": "color", + "value": "#0c72c1" }, "8": { - "value": "#98c3e5", - "type": "color" + "type": "color", + "value": "#98c3e5" }, "9": { - "value": "#0c72c1", - "type": "color" + "type": "color", + "value": "#0c72c1" }, "10": { - "value": "#085ea0", - "type": "color" + "type": "color", + "value": "#085ea0" }, "11": { - "value": "#074b80", - "type": "color" + "type": "color", + "value": "#074b80" }, "12": { - "value": "#62a4d7", - "type": "color" + "type": "color", + "value": "#62a4d7" }, "13": { - "value": "#cde2f2", - "type": "color" + "type": "color", + "value": "#cde2f2" }, "contrast-1": { - "value": "#fefeff", - "type": "color" + "type": "color", + "value": "#fefeff" }, "contrast-2": { - "value": "#f3f8fc", - "type": "color" + "type": "color", + "value": "#f3f8fc" } }, "green": { "1": { - "value": "#022106", - "type": "color" + "type": "color", + "value": "#022106" }, "2": { - "value": "#022b08", - "type": "color" + "type": "color", + "value": "#022b08" }, "3": { - "value": "#03380a", - "type": "color" + "type": "color", + "value": "#03380a" }, "4": { - "value": "#04480d", - "type": "color" + "type": "color", + "value": "#04480d" }, "5": { - "value": "#045810", - "type": "color" + "type": "color", + "value": "#045810" }, "6": { - "value": "#056011", - "type": "color" + "type": "color", + "value": "#056011" }, "7": { - "value": "#068117", - "type": "color" + "type": "color", + "value": "#068117" }, "8": { - "value": "#90cc98", - "type": "color" + "type": "color", + "value": "#90cc98" }, "9": { - "value": "#078d19", - "type": "color" + "type": "color", + "value": "#078d19" }, "10": { - "value": "#067615", - "type": "color" + "type": "color", + "value": "#067615" }, "11": { - "value": "#056011", - "type": "color" + "type": "color", + "value": "#056011" }, "12": { - "value": "#54b061", - "type": "color" + "type": "color", + "value": "#54b061" }, "13": { - "value": "#cbe7cf", - "type": "color" + "type": "color", + "value": "#cbe7cf" }, "contrast-1": { - "value": "#000000", - "type": "color" + "type": "color", + "value": "#000000" }, "contrast-2": { - "value": "#000401", - "type": "color" + "type": "color", + "value": "#000401" } }, "orange": { "1": { - "value": "#2e1508", - "type": "color" + "type": "color", + "value": "#2e1508" }, "2": { - "value": "#3a1b0a", - "type": "color" + "type": "color", + "value": "#3a1b0a" }, "3": { - "value": "#50240d", - "type": "color" + "type": "color", + "value": "#50240d" }, "4": { - "value": "#652e10", - "type": "color" + "type": "color", + "value": "#652e10" }, "5": { - "value": "#7a3814", - "type": "color" + "type": "color", + "value": "#7a3814" }, "6": { - "value": "#863d16", - "type": "color" + "type": "color", + "value": "#863d16" }, "7": { - "value": "#b5531e", - "type": "color" + "type": "color", + "value": "#b5531e" }, "8": { - "value": "#e6b398", - "type": "color" + "type": "color", + "value": "#e6b398" }, "9": { - "value": "#c95c21", - "type": "color" + "type": "color", + "value": "#c95c21" }, "10": { - "value": "#a94d1c", - "type": "color" + "type": "color", + "value": "#a94d1c" }, "11": { - "value": "#8a3f17", - "type": "color" + "type": "color", + "value": "#8a3f17" }, "12": { - "value": "#d98a5f", - "type": "color" + "type": "color", + "value": "#d98a5f" }, "13": { - "value": "#f3dbcd", - "type": "color" + "type": "color", + "value": "#f3dbcd" }, "contrast-1": { - "value": "#000000", - "type": "color" + "type": "color", + "value": "#000000" }, "contrast-2": { - "value": "#0d0602", - "type": "color" + "type": "color", + "value": "#0d0602" } }, "purple": { "1": { - "value": "#251238", - "type": "color" + "type": "color", + "value": "#251238" }, "2": { - "value": "#301748", - "type": "color" + "type": "color", + "value": "#301748" }, "3": { - "value": "#402060", - "type": "color" + "type": "color", + "value": "#402060" }, "4": { - "value": "#52287a", - "type": "color" + "type": "color", + "value": "#52287a" }, "5": { - "value": "#643196", - "type": "color" + "type": "color", + "value": "#643196" }, "6": { - "value": "#6b399d", - "type": "color" + "type": "color", + "value": "#6b399d" }, "7": { - "value": "#865daf", - "type": "color" + "type": "color", + "value": "#865daf" }, "8": { - "value": "#c9b7db", - "type": "color" + "type": "color", + "value": "#c9b7db" }, "9": { - "value": "#663399", - "type": "color" + "type": "color", + "value": "#663399" }, "10": { - "value": "#4f2777", - "type": "color" + "type": "color", + "value": "#4f2777" }, "11": { - "value": "#381b54", - "type": "color" + "type": "color", + "value": "#381b54" }, "12": { - "value": "#ae93c9", - "type": "color" + "type": "color", + "value": "#ae93c9" }, "13": { - "value": "#e4dbed", - "type": "color" + "type": "color", + "value": "#e4dbed" }, "contrast-1": { - "value": "#fefefe", - "type": "color" + "type": "color", + "value": "#fefefe" }, "contrast-2": { - "value": "#eee8f3", - "type": "color" + "type": "color", + "value": "#eee8f3" } }, "red": { "1": { - "value": "#3b0808", - "type": "color" + "type": "color", + "value": "#3b0808" }, "2": { - "value": "#4b0a0a", - "type": "color" + "type": "color", + "value": "#4b0a0a" }, "3": { - "value": "#620e0e", - "type": "color" + "type": "color", + "value": "#620e0e" }, "4": { - "value": "#7c1212", - "type": "color" + "type": "color", + "value": "#7c1212" }, "5": { - "value": "#961515", - "type": "color" + "type": "color", + "value": "#961515" }, "6": { - "value": "#a31717", - "type": "color" + "type": "color", + "value": "#a31717" }, "7": { - "value": "#c93c3c", - "type": "color" + "type": "color", + "value": "#c93c3c" }, "8": { - "value": "#e9b0b0", - "type": "color" + "type": "color", + "value": "#e9b0b0" }, "9": { - "value": "#bf1b1b", - "type": "color" + "type": "color", + "value": "#bf1b1b" }, "10": { - "value": "#9a1616", - "type": "color" + "type": "color", + "value": "#9a1616" }, "11": { - "value": "#771111", - "type": "color" + "type": "color", + "value": "#771111" }, "12": { - "value": "#dd8585", - "type": "color" + "type": "color", + "value": "#dd8585" }, "13": { - "value": "#f5d9d9", - "type": "color" + "type": "color", + "value": "#f5d9d9" }, "contrast-1": { - "value": "#fffefe", - "type": "color" + "type": "color", + "value": "#fffefe" }, "contrast-2": { - "value": "#f6dfdf", - "type": "color" + "type": "color", + "value": "#f6dfdf" } }, "yellow": { "1": { - "value": "#221b06", - "type": "color" + "type": "color", + "value": "#221b06" }, "2": { - "value": "#2b2307", - "type": "color" + "type": "color", + "value": "#2b2307" }, "3": { - "value": "#3a300a", - "type": "color" + "type": "color", + "value": "#3a300a" }, "4": { - "value": "#4a3d0d", - "type": "color" + "type": "color", + "value": "#4a3d0d" }, "5": { - "value": "#5a4a0f", - "type": "color" + "type": "color", + "value": "#5a4a0f" }, "6": { - "value": "#635011", - "type": "color" + "type": "color", + "value": "#635011" }, "7": { - "value": "#856d17", - "type": "color" + "type": "color", + "value": "#856d17" }, "8": { - "value": "#e4ba27", - "type": "color" + "type": "color", + "value": "#e4ba27" }, "9": { - "value": "#eabf28", - "type": "color" + "type": "color", + "value": "#eabf28" }, "10": { - "value": "#d0aa24", - "type": "color" + "type": "color", + "value": "#d0aa24" }, "11": { - "value": "#b7951f", - "type": "color" + "type": "color", + "value": "#b7951f" }, "12": { - "value": "#bd9a20", - "type": "color" + "type": "color", + "value": "#bd9a20" }, "13": { - "value": "#f4de8f", - "type": "color" + "type": "color", + "value": "#f4de8f" }, "contrast-1": { - "value": "#000000", - "type": "color" + "type": "color", + "value": "#000000" }, "contrast-2": { - "value": "#382d0a", - "type": "color" + "type": "color", + "value": "#382d0a" } } } diff --git a/design-tokens/primitives/colors/dark/theme2.json b/design-tokens/primitives/colors/dark/theme2.json index dd1324bbd2..4a0342d730 100644 --- a/design-tokens/primitives/colors/dark/theme2.json +++ b/design-tokens/primitives/colors/dark/theme2.json @@ -2,312 +2,312 @@ "theme2": { "accent": { "1": { - "value": "#001c36", - "type": "color" + "type": "color", + "value": "#001c36" }, "2": { - "value": "#002445", - "type": "color" + "type": "color", + "value": "#002445" }, "3": { - "value": "#00315c", - "type": "color" + "type": "color", + "value": "#00315c" }, "4": { - "value": "#003d75", - "type": "color" + "type": "color", + "value": "#003d75" }, "5": { - "value": "#004b8f", - "type": "color" + "type": "color", + "value": "#004b8f" }, "6": { - "value": "#00529d", - "type": "color" + "type": "color", + "value": "#00529d" }, "7": { - "value": "#1972c1", - "type": "color" + "type": "color", + "value": "#1972c1" }, "8": { - "value": "#9cc2e4", - "type": "color" + "type": "color", + "value": "#9cc2e4" }, "9": { - "value": "#0163ba", - "type": "color" + "type": "color", + "value": "#0163ba" }, "10": { - "value": "#005099", - "type": "color" + "type": "color", + "value": "#005099" }, "11": { - "value": "#003d75", - "type": "color" + "type": "color", + "value": "#003d75" }, "12": { - "value": "#69a2d6", - "type": "color" + "type": "color", + "value": "#69a2d6" }, "13": { - "value": "#cee1f2", - "type": "color" + "type": "color", + "value": "#cee1f2" }, "contrast-1": { - "value": "#fefeff", - "type": "color" + "type": "color", + "value": "#fefeff" }, "contrast-2": { - "value": "#dbe9f5", - "type": "color" + "type": "color", + "value": "#dbe9f5" } }, "neutral": { "1": { - "value": "#131c27", - "type": "color" + "type": "color", + "value": "#131c27" }, "2": { - "value": "#192433", - "type": "color" + "type": "color", + "value": "#192433" }, "3": { - "value": "#243142", - "type": "color" + "type": "color", + "value": "#243142" }, "4": { - "value": "#333e4e", - "type": "color" + "type": "color", + "value": "#333e4e" }, "5": { - "value": "#424d5b", - "type": "color" + "type": "color", + "value": "#424d5b" }, "6": { - "value": "#495361", - "type": "color" + "type": "color", + "value": "#495361" }, "7": { - "value": "#67707c", - "type": "color" + "type": "color", + "value": "#67707c" }, "8": { - "value": "#bbbfc4", - "type": "color" + "type": "color", + "value": "#bbbfc4" }, "9": { - "value": "#1e2b3c", - "type": "color" + "type": "color", + "value": "#1e2b3c" }, "10": { - "value": "#303c4b", - "type": "color" + "type": "color", + "value": "#303c4b" }, "11": { - "value": "#444e5d", - "type": "color" + "type": "color", + "value": "#444e5d" }, "12": { - "value": "#989ea5", - "type": "color" + "type": "color", + "value": "#989ea5" }, "13": { - "value": "#dddfe1", - "type": "color" + "type": "color", + "value": "#dddfe1" }, "contrast-1": { - "value": "#fefefe", - "type": "color" + "type": "color", + "value": "#fefefe" }, "contrast-2": { - "value": "#bbbfc4", - "type": "color" + "type": "color", + "value": "#bbbfc4" } }, "brand1": { "1": { - "value": "#001c36", - "type": "color" + "type": "color", + "value": "#001c36" }, "2": { - "value": "#002445", - "type": "color" + "type": "color", + "value": "#002445" }, "3": { - "value": "#00315c", - "type": "color" + "type": "color", + "value": "#00315c" }, "4": { - "value": "#003d75", - "type": "color" + "type": "color", + "value": "#003d75" }, "5": { - "value": "#004b8f", - "type": "color" + "type": "color", + "value": "#004b8f" }, "6": { - "value": "#00529d", - "type": "color" + "type": "color", + "value": "#00529d" }, "7": { - "value": "#1972c1", - "type": "color" + "type": "color", + "value": "#1972c1" }, "8": { - "value": "#9cc2e4", - "type": "color" + "type": "color", + "value": "#9cc2e4" }, "9": { - "value": "#0163ba", - "type": "color" + "type": "color", + "value": "#0163ba" }, "10": { - "value": "#005099", - "type": "color" + "type": "color", + "value": "#005099" }, "11": { - "value": "#003d75", - "type": "color" + "type": "color", + "value": "#003d75" }, "12": { - "value": "#69a2d6", - "type": "color" + "type": "color", + "value": "#69a2d6" }, "13": { - "value": "#cee1f2", - "type": "color" + "type": "color", + "value": "#cee1f2" }, "contrast-1": { - "value": "#fefeff", - "type": "color" + "type": "color", + "value": "#fefeff" }, "contrast-2": { - "value": "#dbe9f5", - "type": "color" + "type": "color", + "value": "#dbe9f5" } }, "brand2": { "1": { - "value": "#1e182f", - "type": "color" + "type": "color", + "value": "#1e182f" }, "2": { - "value": "#271f3c", - "type": "color" + "type": "color", + "value": "#271f3c" }, "3": { - "value": "#352952", - "type": "color" + "type": "color", + "value": "#352952" }, "4": { - "value": "#433665", - "type": "color" + "type": "color", + "value": "#433665" }, "5": { - "value": "#514570", - "type": "color" + "type": "color", + "value": "#514570" }, "6": { - "value": "#584b75", - "type": "color" + "type": "color", + "value": "#584b75" }, "7": { - "value": "#746a8d", - "type": "color" + "type": "color", + "value": "#746a8d" }, "8": { - "value": "#c0bccb", - "type": "color" + "type": "color", + "value": "#c0bccb" }, "9": { - "value": "#3f3161", - "type": "color" + "type": "color", + "value": "#3f3161" }, "10": { - "value": "#514570", - "type": "color" + "type": "color", + "value": "#514570" }, "11": { - "value": "#64587f", - "type": "color" + "type": "color", + "value": "#64587f" }, "12": { - "value": "#a19ab1", - "type": "color" + "type": "color", + "value": "#a19ab1" }, "13": { - "value": "#e0dee6", - "type": "color" + "type": "color", + "value": "#e0dee6" }, "contrast-1": { - "value": "#fefefe", - "type": "color" + "type": "color", + "value": "#fefefe" }, "contrast-2": { - "value": "#d3d0db", - "type": "color" + "type": "color", + "value": "#d3d0db" } }, "brand3": { "1": { - "value": "#370b12", - "type": "color" + "type": "color", + "value": "#370b12" }, "2": { - "value": "#470e17", - "type": "color" + "type": "color", + "value": "#470e17" }, "3": { - "value": "#5f131f", - "type": "color" + "type": "color", + "value": "#5f131f" }, "4": { - "value": "#771927", - "type": "color" + "type": "color", + "value": "#771927" }, "5": { - "value": "#901d2f", - "type": "color" + "type": "color", + "value": "#901d2f" }, "6": { - "value": "#9e2033", - "type": "color" + "type": "color", + "value": "#9e2033" }, "7": { - "value": "#d32b45", - "type": "color" + "type": "color", + "value": "#d32b45" }, "8": { - "value": "#f3abb6", - "type": "color" + "type": "color", + "value": "#f3abb6" }, "9": { - "value": "#e02f4a", - "type": "color" + "type": "color", + "value": "#e02f4a" }, "10": { - "value": "#bc273d", - "type": "color" + "type": "color", + "value": "#bc273d" }, "11": { - "value": "#992032", - "type": "color" + "type": "color", + "value": "#992032" }, "12": { - "value": "#eb7b8c", - "type": "color" + "type": "color", + "value": "#eb7b8c" }, "13": { - "value": "#f9d7dc", - "type": "color" + "type": "color", + "value": "#f9d7dc" }, "contrast-1": { - "value": "#000000", - "type": "color" + "type": "color", + "value": "#000000" }, "contrast-2": { - "value": "#000000", - "type": "color" + "type": "color", + "value": "#000000" } } } diff --git a/design-tokens/primitives/colors/dark/theme3.json b/design-tokens/primitives/colors/dark/theme3.json index 0d0bdaae1f..5e6b6fe810 100644 --- a/design-tokens/primitives/colors/dark/theme3.json +++ b/design-tokens/primitives/colors/dark/theme3.json @@ -2,312 +2,312 @@ "theme3": { "accent": { "1": { - "value": "#001c36", - "type": "color" + "type": "color", + "value": "#001c36" }, "2": { - "value": "#002445", - "type": "color" + "type": "color", + "value": "#002445" }, "3": { - "value": "#00315c", - "type": "color" + "type": "color", + "value": "#00315c" }, "4": { - "value": "#003d75", - "type": "color" + "type": "color", + "value": "#003d75" }, "5": { - "value": "#004b8f", - "type": "color" + "type": "color", + "value": "#004b8f" }, "6": { - "value": "#00529d", - "type": "color" + "type": "color", + "value": "#00529d" }, "7": { - "value": "#1972c1", - "type": "color" + "type": "color", + "value": "#1972c1" }, "8": { - "value": "#9cc2e4", - "type": "color" + "type": "color", + "value": "#9cc2e4" }, "9": { - "value": "#0163ba", - "type": "color" + "type": "color", + "value": "#0163ba" }, "10": { - "value": "#005099", - "type": "color" + "type": "color", + "value": "#005099" }, "11": { - "value": "#003d75", - "type": "color" + "type": "color", + "value": "#003d75" }, "12": { - "value": "#69a2d6", - "type": "color" + "type": "color", + "value": "#69a2d6" }, "13": { - "value": "#cee1f2", - "type": "color" + "type": "color", + "value": "#cee1f2" }, "contrast-1": { - "value": "#fefeff", - "type": "color" + "type": "color", + "value": "#fefeff" }, "contrast-2": { - "value": "#dbe9f5", - "type": "color" + "type": "color", + "value": "#dbe9f5" } }, "neutral": { "1": { - "value": "#131c27", - "type": "color" + "type": "color", + "value": "#131c27" }, "2": { - "value": "#192433", - "type": "color" + "type": "color", + "value": "#192433" }, "3": { - "value": "#243142", - "type": "color" + "type": "color", + "value": "#243142" }, "4": { - "value": "#333e4e", - "type": "color" + "type": "color", + "value": "#333e4e" }, "5": { - "value": "#424d5b", - "type": "color" + "type": "color", + "value": "#424d5b" }, "6": { - "value": "#495361", - "type": "color" + "type": "color", + "value": "#495361" }, "7": { - "value": "#67707c", - "type": "color" + "type": "color", + "value": "#67707c" }, "8": { - "value": "#bbbfc4", - "type": "color" + "type": "color", + "value": "#bbbfc4" }, "9": { - "value": "#1e2b3c", - "type": "color" + "type": "color", + "value": "#1e2b3c" }, "10": { - "value": "#303c4b", - "type": "color" + "type": "color", + "value": "#303c4b" }, "11": { - "value": "#444e5d", - "type": "color" + "type": "color", + "value": "#444e5d" }, "12": { - "value": "#989ea5", - "type": "color" + "type": "color", + "value": "#989ea5" }, "13": { - "value": "#dddfe1", - "type": "color" + "type": "color", + "value": "#dddfe1" }, "contrast-1": { - "value": "#fefefe", - "type": "color" + "type": "color", + "value": "#fefefe" }, "contrast-2": { - "value": "#bbbfc4", - "type": "color" + "type": "color", + "value": "#bbbfc4" } }, "brand1": { "1": { - "value": "#171835", - "type": "color" + "type": "color", + "value": "#171835" }, "2": { - "value": "#1e1f44", - "type": "color" + "type": "color", + "value": "#1e1f44" }, "3": { - "value": "#292b5e", - "type": "color" + "type": "color", + "value": "#292b5e" }, "4": { - "value": "#343676", - "type": "color" + "type": "color", + "value": "#343676" }, "5": { - "value": "#3f4390", - "type": "color" + "type": "color", + "value": "#3f4390" }, "6": { - "value": "#45499e", - "type": "color" + "type": "color", + "value": "#45499e" }, "7": { - "value": "#5e63d3", - "type": "color" + "type": "color", + "value": "#5e63d3" }, "8": { - "value": "#b8baeb", - "type": "color" + "type": "color", + "value": "#b8baeb" }, "9": { - "value": "#5b60d1", - "type": "color" + "type": "color", + "value": "#5b60d1" }, "10": { - "value": "#4b4fab", - "type": "color" + "type": "color", + "value": "#4b4fab" }, "11": { - "value": "#3b3f87", - "type": "color" + "type": "color", + "value": "#3b3f87" }, "12": { - "value": "#9497e1", - "type": "color" + "type": "color", + "value": "#9497e1" }, "13": { - "value": "#dddef5", - "type": "color" + "type": "color", + "value": "#dddef5" }, "contrast-1": { - "value": "#fefeff", - "type": "color" + "type": "color", + "value": "#fefeff" }, "contrast-2": { - "value": "#f3f4fc", - "type": "color" + "type": "color", + "value": "#f3f4fc" } }, "brand2": { "1": { - "value": "#25190f", - "type": "color" + "type": "color", + "value": "#25190f" }, "2": { - "value": "#312014", - "type": "color" + "type": "color", + "value": "#312014" }, "3": { - "value": "#412b1b", - "type": "color" + "type": "color", + "value": "#412b1b" }, "4": { - "value": "#543723", - "type": "color" + "type": "color", + "value": "#543723" }, "5": { - "value": "#66442a", - "type": "color" + "type": "color", + "value": "#66442a" }, "6": { - "value": "#704a2e", - "type": "color" + "type": "color", + "value": "#704a2e" }, "7": { - "value": "#98643e", - "type": "color" + "type": "color", + "value": "#98643e" }, "8": { - "value": "#ffab6e", - "type": "color" + "type": "color", + "value": "#ffab6e" }, "9": { - "value": "#fea769", - "type": "color" + "type": "color", + "value": "#fea769" }, "10": { - "value": "#e1945d", - "type": "color" + "type": "color", + "value": "#e1945d" }, "11": { - "value": "#c38150", - "type": "color" + "type": "color", + "value": "#c38150" }, "12": { - "value": "#d58d58", - "type": "color" + "type": "color", + "value": "#d58d58" }, "13": { - "value": "#ffd9bd", - "type": "color" + "type": "color", + "value": "#ffd9bd" }, "contrast-1": { - "value": "#000000", - "type": "color" + "type": "color", + "value": "#000000" }, "contrast-2": { - "value": "#362316", - "type": "color" + "type": "color", + "value": "#362316" } }, "brand3": { "1": { - "value": "#111e1b", - "type": "color" + "type": "color", + "value": "#111e1b" }, "2": { - "value": "#162723", - "type": "color" + "type": "color", + "value": "#162723" }, "3": { - "value": "#1e342e", - "type": "color" + "type": "color", + "value": "#1e342e" }, "4": { - "value": "#26433c", - "type": "color" + "type": "color", + "value": "#26433c" }, "5": { - "value": "#2e5248", - "type": "color" + "type": "color", + "value": "#2e5248" }, "6": { - "value": "#33594f", - "type": "color" + "type": "color", + "value": "#33594f" }, "7": { - "value": "#44786a", - "type": "color" + "type": "color", + "value": "#44786a" }, "8": { - "value": "#9cc6bb", - "type": "color" + "type": "color", + "value": "#9cc6bb" }, "9": { - "value": "#5da290", - "type": "color" + "type": "color", + "value": "#5da290" }, "10": { - "value": "#4f8c7b", - "type": "color" + "type": "color", + "value": "#4f8c7b" }, "11": { - "value": "#437669", - "type": "color" + "type": "color", + "value": "#437669" }, "12": { - "value": "#69a998", - "type": "color" + "type": "color", + "value": "#69a998" }, "13": { - "value": "#cee3dd", - "type": "color" + "type": "color", + "value": "#cee3dd" }, "contrast-1": { - "value": "#000000", - "type": "color" + "type": "color", + "value": "#000000" }, "contrast-2": { - "value": "#050808", - "type": "color" + "type": "color", + "value": "#050808" } } } diff --git a/design-tokens/primitives/colors/dark/theme4.json b/design-tokens/primitives/colors/dark/theme4.json index a35300e002..5b65cf8d81 100644 --- a/design-tokens/primitives/colors/dark/theme4.json +++ b/design-tokens/primitives/colors/dark/theme4.json @@ -2,312 +2,312 @@ "theme4": { "accent": { "1": { - "value": "#32110f", - "type": "color" + "type": "color", + "value": "#32110f" }, "2": { - "value": "#401613", - "type": "color" + "type": "color", + "value": "#401613" }, "3": { - "value": "#561e19", - "type": "color" + "type": "color", + "value": "#561e19" }, "4": { - "value": "#6c2620", - "type": "color" + "type": "color", + "value": "#6c2620" }, "5": { - "value": "#852e27", - "type": "color" + "type": "color", + "value": "#852e27" }, "6": { - "value": "#8e352d", - "type": "color" + "type": "color", + "value": "#8e352d" }, "7": { - "value": "#a35b55", - "type": "color" + "type": "color", + "value": "#a35b55" }, "8": { - "value": "#d6b6b3", - "type": "color" + "type": "color", + "value": "#d6b6b3" }, "9": { - "value": "#8c322a", - "type": "color" + "type": "color", + "value": "#8c322a" }, "10": { - "value": "#6c2620", - "type": "color" + "type": "color", + "value": "#6c2620" }, "11": { - "value": "#4e1b17", - "type": "color" + "type": "color", + "value": "#4e1b17" }, "12": { - "value": "#c2928e", - "type": "color" + "type": "color", + "value": "#c2928e" }, "13": { - "value": "#ebdcdb", - "type": "color" + "type": "color", + "value": "#ebdcdb" }, "contrast-1": { - "value": "#fefefe", - "type": "color" + "type": "color", + "value": "#fefefe" }, "contrast-2": { - "value": "#f4ebeb", - "type": "color" + "type": "color", + "value": "#f4ebeb" } }, "neutral": { "1": { - "value": "#131c27", - "type": "color" + "type": "color", + "value": "#131c27" }, "2": { - "value": "#192433", - "type": "color" + "type": "color", + "value": "#192433" }, "3": { - "value": "#243142", - "type": "color" + "type": "color", + "value": "#243142" }, "4": { - "value": "#333e4e", - "type": "color" + "type": "color", + "value": "#333e4e" }, "5": { - "value": "#424d5b", - "type": "color" + "type": "color", + "value": "#424d5b" }, "6": { - "value": "#495361", - "type": "color" + "type": "color", + "value": "#495361" }, "7": { - "value": "#67707c", - "type": "color" + "type": "color", + "value": "#67707c" }, "8": { - "value": "#bbbfc4", - "type": "color" + "type": "color", + "value": "#bbbfc4" }, "9": { - "value": "#1e2b3c", - "type": "color" + "type": "color", + "value": "#1e2b3c" }, "10": { - "value": "#303c4b", - "type": "color" + "type": "color", + "value": "#303c4b" }, "11": { - "value": "#444e5d", - "type": "color" + "type": "color", + "value": "#444e5d" }, "12": { - "value": "#989ea5", - "type": "color" + "type": "color", + "value": "#989ea5" }, "13": { - "value": "#dddfe1", - "type": "color" + "type": "color", + "value": "#dddfe1" }, "contrast-1": { - "value": "#fefefe", - "type": "color" + "type": "color", + "value": "#fefefe" }, "contrast-2": { - "value": "#bbbfc4", - "type": "color" + "type": "color", + "value": "#bbbfc4" } }, "brand1": { "1": { - "value": "#32110f", - "type": "color" + "type": "color", + "value": "#32110f" }, "2": { - "value": "#401613", - "type": "color" + "type": "color", + "value": "#401613" }, "3": { - "value": "#561e19", - "type": "color" + "type": "color", + "value": "#561e19" }, "4": { - "value": "#6c2620", - "type": "color" + "type": "color", + "value": "#6c2620" }, "5": { - "value": "#852e27", - "type": "color" + "type": "color", + "value": "#852e27" }, "6": { - "value": "#8e352d", - "type": "color" + "type": "color", + "value": "#8e352d" }, "7": { - "value": "#a35b55", - "type": "color" + "type": "color", + "value": "#a35b55" }, "8": { - "value": "#d6b6b3", - "type": "color" + "type": "color", + "value": "#d6b6b3" }, "9": { - "value": "#8c322a", - "type": "color" + "type": "color", + "value": "#8c322a" }, "10": { - "value": "#6c2620", - "type": "color" + "type": "color", + "value": "#6c2620" }, "11": { - "value": "#4e1b17", - "type": "color" + "type": "color", + "value": "#4e1b17" }, "12": { - "value": "#c2928e", - "type": "color" + "type": "color", + "value": "#c2928e" }, "13": { - "value": "#ebdcdb", - "type": "color" + "type": "color", + "value": "#ebdcdb" }, "contrast-1": { - "value": "#fefefe", - "type": "color" + "type": "color", + "value": "#fefefe" }, "contrast-2": { - "value": "#f4ebeb", - "type": "color" + "type": "color", + "value": "#f4ebeb" } }, "brand2": { "1": { - "value": "#32110f", - "type": "color" + "type": "color", + "value": "#32110f" }, "2": { - "value": "#401613", - "type": "color" + "type": "color", + "value": "#401613" }, "3": { - "value": "#561e19", - "type": "color" + "type": "color", + "value": "#561e19" }, "4": { - "value": "#6c2620", - "type": "color" + "type": "color", + "value": "#6c2620" }, "5": { - "value": "#852e27", - "type": "color" + "type": "color", + "value": "#852e27" }, "6": { - "value": "#8e352d", - "type": "color" + "type": "color", + "value": "#8e352d" }, "7": { - "value": "#a35b55", - "type": "color" + "type": "color", + "value": "#a35b55" }, "8": { - "value": "#d6b6b3", - "type": "color" + "type": "color", + "value": "#d6b6b3" }, "9": { - "value": "#8c322a", - "type": "color" + "type": "color", + "value": "#8c322a" }, "10": { - "value": "#6c2620", - "type": "color" + "type": "color", + "value": "#6c2620" }, "11": { - "value": "#4e1b17", - "type": "color" + "type": "color", + "value": "#4e1b17" }, "12": { - "value": "#c2928e", - "type": "color" + "type": "color", + "value": "#c2928e" }, "13": { - "value": "#ebdcdb", - "type": "color" + "type": "color", + "value": "#ebdcdb" }, "contrast-1": { - "value": "#fefefe", - "type": "color" + "type": "color", + "value": "#fefefe" }, "contrast-2": { - "value": "#f4ebeb", - "type": "color" + "type": "color", + "value": "#f4ebeb" } }, "brand3": { "1": { - "value": "#32110f", - "type": "color" + "type": "color", + "value": "#32110f" }, "2": { - "value": "#401613", - "type": "color" + "type": "color", + "value": "#401613" }, "3": { - "value": "#561e19", - "type": "color" + "type": "color", + "value": "#561e19" }, "4": { - "value": "#6c2620", - "type": "color" + "type": "color", + "value": "#6c2620" }, "5": { - "value": "#852e27", - "type": "color" + "type": "color", + "value": "#852e27" }, "6": { - "value": "#8e352d", - "type": "color" + "type": "color", + "value": "#8e352d" }, "7": { - "value": "#a35b55", - "type": "color" + "type": "color", + "value": "#a35b55" }, "8": { - "value": "#d6b6b3", - "type": "color" + "type": "color", + "value": "#d6b6b3" }, "9": { - "value": "#8c322a", - "type": "color" + "type": "color", + "value": "#8c322a" }, "10": { - "value": "#6c2620", - "type": "color" + "type": "color", + "value": "#6c2620" }, "11": { - "value": "#4e1b17", - "type": "color" + "type": "color", + "value": "#4e1b17" }, "12": { - "value": "#c2928e", - "type": "color" + "type": "color", + "value": "#c2928e" }, "13": { - "value": "#ebdcdb", - "type": "color" + "type": "color", + "value": "#ebdcdb" }, "contrast-1": { - "value": "#fefefe", - "type": "color" + "type": "color", + "value": "#fefefe" }, "contrast-2": { - "value": "#f4ebeb", - "type": "color" + "type": "color", + "value": "#f4ebeb" } } } diff --git a/design-tokens/primitives/colors/light/global.json b/design-tokens/primitives/colors/light/global.json index 2ca5619b38..7d77321b0c 100644 --- a/design-tokens/primitives/colors/light/global.json +++ b/design-tokens/primitives/colors/light/global.json @@ -2,374 +2,374 @@ "global": { "blue": { "1": { - "value": "#fefeff", - "type": "color" + "type": "color", + "value": "#fefeff" }, "2": { - "value": "#edf5fa", - "type": "color" + "type": "color", + "value": "#edf5fa" }, "3": { - "value": "#d3e5f4", - "type": "color" + "type": "color", + "value": "#d3e5f4" }, "4": { - "value": "#b7d5ed", - "type": "color" + "type": "color", + "value": "#b7d5ed" }, "5": { - "value": "#9bc5e5", - "type": "color" + "type": "color", + "value": "#9bc5e5" }, "6": { - "value": "#94c1e3", - "type": "color" + "type": "color", + "value": "#94c1e3" }, "7": { - "value": "#2f86c9", - "type": "color" + "type": "color", + "value": "#2f86c9" }, "8": { - "value": "#075089", - "type": "color" + "type": "color", + "value": "#075089" }, "9": { - "value": "#0c72c1", - "type": "color" + "type": "color", + "value": "#0c72c1" }, "10": { - "value": "#085ea0", - "type": "color" + "type": "color", + "value": "#085ea0" }, "11": { - "value": "#074b80", - "type": "color" + "type": "color", + "value": "#074b80" }, "12": { - "value": "#0966ac", - "type": "color" + "type": "color", + "value": "#0966ac" }, "13": { - "value": "#043256", - "type": "color" + "type": "color", + "value": "#043256" }, "contrast-1": { - "value": "#fefeff", - "type": "color" + "type": "color", + "value": "#fefeff" }, "contrast-2": { - "value": "#f3f8fc", - "type": "color" + "type": "color", + "value": "#f3f8fc" } }, "green": { "1": { - "value": "#fcfefc", - "type": "color" + "type": "color", + "value": "#fcfefc" }, "2": { - "value": "#ecf6ed", - "type": "color" + "type": "color", + "value": "#ecf6ed" }, "3": { - "value": "#cfe9d3", - "type": "color" + "type": "color", + "value": "#cfe9d3" }, "4": { - "value": "#b3dcb8", - "type": "color" + "type": "color", + "value": "#b3dcb8" }, "5": { - "value": "#95ce9d", - "type": "color" + "type": "color", + "value": "#95ce9d" }, "6": { - "value": "#8bca94", - "type": "color" + "type": "color", + "value": "#8bca94" }, "7": { - "value": "#189528", - "type": "color" + "type": "color", + "value": "#189528" }, "8": { - "value": "#045a10", - "type": "color" + "type": "color", + "value": "#045a10" }, "9": { - "value": "#078d19", - "type": "color" + "type": "color", + "value": "#078d19" }, "10": { - "value": "#067615", - "type": "color" + "type": "color", + "value": "#067615" }, "11": { - "value": "#056011", - "type": "color" + "type": "color", + "value": "#056011" }, "12": { - "value": "#067314", - "type": "color" + "type": "color", + "value": "#067314" }, "13": { - "value": "#03380a", - "type": "color" + "type": "color", + "value": "#03380a" }, "contrast-1": { - "value": "#000000", - "type": "color" + "type": "color", + "value": "#000000" }, "contrast-2": { - "value": "#000401", - "type": "color" + "type": "color", + "value": "#000401" } }, "orange": { "1": { - "value": "#fffefd", - "type": "color" + "type": "color", + "value": "#fffefd" }, "2": { - "value": "#fbf1ec", - "type": "color" + "type": "color", + "value": "#fbf1ec" }, "3": { - "value": "#f4ddd0", - "type": "color" + "type": "color", + "value": "#f4ddd0" }, "4": { - "value": "#eecab7", - "type": "color" + "type": "color", + "value": "#eecab7" }, "5": { - "value": "#e7b69c", - "type": "color" + "type": "color", + "value": "#e7b69c" }, "6": { - "value": "#e5b094", - "type": "color" + "type": "color", + "value": "#e5b094" }, "7": { - "value": "#cc632b", - "type": "color" + "type": "color", + "value": "#cc632b" }, "8": { - "value": "#7e3a15", - "type": "color" + "type": "color", + "value": "#7e3a15" }, "9": { - "value": "#c95c21", - "type": "color" + "type": "color", + "value": "#c95c21" }, "10": { - "value": "#a94d1c", - "type": "color" + "type": "color", + "value": "#a94d1c" }, "11": { - "value": "#8a3f17", - "type": "color" + "type": "color", + "value": "#8a3f17" }, "12": { - "value": "#a1491a", - "type": "color" + "type": "color", + "value": "#a1491a" }, "13": { - "value": "#50240d", - "type": "color" + "type": "color", + "value": "#50240d" }, "contrast-1": { - "value": "#000000", - "type": "color" + "type": "color", + "value": "#000000" }, "contrast-2": { - "value": "#0d0602", - "type": "color" + "type": "color", + "value": "#0d0602" } }, "purple": { "1": { - "value": "#fefefe", - "type": "color" + "type": "color", + "value": "#fefefe" }, "2": { - "value": "#f5f2f9", - "type": "color" + "type": "color", + "value": "#f5f2f9" }, "3": { - "value": "#e7dfef", - "type": "color" + "type": "color", + "value": "#e7dfef" }, "4": { - "value": "#d9cce6", - "type": "color" + "type": "color", + "value": "#d9cce6" }, "5": { - "value": "#ccbadd", - "type": "color" + "type": "color", + "value": "#ccbadd" }, "6": { - "value": "#c7b4da", - "type": "color" + "type": "color", + "value": "#c7b4da" }, "7": { - "value": "#9572b9", - "type": "color" + "type": "color", + "value": "#9572b9" }, "8": { - "value": "#663399", - "type": "color" + "type": "color", + "value": "#663399" }, "9": { - "value": "#663399", - "type": "color" + "type": "color", + "value": "#663399" }, "10": { - "value": "#4f2777", - "type": "color" + "type": "color", + "value": "#4f2777" }, "11": { - "value": "#381b54", - "type": "color" + "type": "color", + "value": "#381b54" }, "12": { - "value": "#7b4ea7", - "type": "color" + "type": "color", + "value": "#7b4ea7" }, "13": { - "value": "#402060", - "type": "color" + "type": "color", + "value": "#402060" }, "contrast-1": { - "value": "#fefefe", - "type": "color" + "type": "color", + "value": "#fefefe" }, "contrast-2": { - "value": "#eee8f3", - "type": "color" + "type": "color", + "value": "#eee8f3" } }, "red": { "1": { - "value": "#fffefe", - "type": "color" + "type": "color", + "value": "#fffefe" }, "2": { - "value": "#fbf1f1", - "type": "color" + "type": "color", + "value": "#fbf1f1" }, "3": { - "value": "#f5dcdc", - "type": "color" + "type": "color", + "value": "#f5dcdc" }, "4": { - "value": "#f0c7c7", - "type": "color" + "type": "color", + "value": "#f0c7c7" }, "5": { - "value": "#eab3b3", - "type": "color" + "type": "color", + "value": "#eab3b3" }, "6": { - "value": "#e8acac", - "type": "color" + "type": "color", + "value": "#e8acac" }, "7": { - "value": "#d25b5b", - "type": "color" + "type": "color", + "value": "#d25b5b" }, "8": { - "value": "#9a1616", - "type": "color" + "type": "color", + "value": "#9a1616" }, "9": { - "value": "#bf1b1b", - "type": "color" + "type": "color", + "value": "#bf1b1b" }, "10": { - "value": "#9a1616", - "type": "color" + "type": "color", + "value": "#9a1616" }, "11": { - "value": "#771111", - "type": "color" + "type": "color", + "value": "#771111" }, "12": { - "value": "#c22020", - "type": "color" + "type": "color", + "value": "#c22020" }, "13": { - "value": "#620e0e", - "type": "color" + "type": "color", + "value": "#620e0e" }, "contrast-1": { - "value": "#fffefe", - "type": "color" + "type": "color", + "value": "#fffefe" }, "contrast-2": { - "value": "#f6dfdf", - "type": "color" + "type": "color", + "value": "#f6dfdf" } }, "yellow": { "1": { - "value": "#fffefc", - "type": "color" + "type": "color", + "value": "#fffefc" }, "2": { - "value": "#fbf2d3", - "type": "color" + "type": "color", + "value": "#fbf2d3" }, "3": { - "value": "#f5e19b", - "type": "color" + "type": "color", + "value": "#f5e19b" }, "4": { - "value": "#efcf5d", - "type": "color" + "type": "color", + "value": "#efcf5d" }, "5": { - "value": "#e6bc27", - "type": "color" + "type": "color", + "value": "#e6bc27" }, "6": { - "value": "#e0b726", - "type": "color" + "type": "color", + "value": "#e0b726" }, "7": { - "value": "#9a7e1a", - "type": "color" + "type": "color", + "value": "#9a7e1a" }, "8": { - "value": "#5d4c10", - "type": "color" + "type": "color", + "value": "#5d4c10" }, "9": { - "value": "#eabf28", - "type": "color" + "type": "color", + "value": "#eabf28" }, "10": { - "value": "#d0aa24", - "type": "color" + "type": "color", + "value": "#d0aa24" }, "11": { - "value": "#b7951f", - "type": "color" + "type": "color", + "value": "#b7951f" }, "12": { - "value": "#776114", - "type": "color" + "type": "color", + "value": "#776114" }, "13": { - "value": "#3a300a", - "type": "color" + "type": "color", + "value": "#3a300a" }, "contrast-1": { - "value": "#000000", - "type": "color" + "type": "color", + "value": "#000000" }, "contrast-2": { - "value": "#382d0a", - "type": "color" + "type": "color", + "value": "#382d0a" } } } diff --git a/design-tokens/primitives/colors/light/theme2.json b/design-tokens/primitives/colors/light/theme2.json index f7779982bd..c4267b3918 100644 --- a/design-tokens/primitives/colors/light/theme2.json +++ b/design-tokens/primitives/colors/light/theme2.json @@ -2,312 +2,312 @@ "theme2": { "accent": { "1": { - "value": "#fefeff", - "type": "color" + "type": "color", + "value": "#fefeff" }, "2": { - "value": "#eef4fa", - "type": "color" + "type": "color", + "value": "#eef4fa" }, "3": { - "value": "#d4e5f3", - "type": "color" + "type": "color", + "value": "#d4e5f3" }, "4": { - "value": "#bad5ec", - "type": "color" + "type": "color", + "value": "#bad5ec" }, "5": { - "value": "#a1c5e5", - "type": "color" + "type": "color", + "value": "#a1c5e5" }, "6": { - "value": "#97bfe3", - "type": "color" + "type": "color", + "value": "#97bfe3" }, "7": { - "value": "#3a85ca", - "type": "color" + "type": "color", + "value": "#3a85ca" }, "8": { - "value": "#004d93", - "type": "color" + "type": "color", + "value": "#004d93" }, "9": { - "value": "#0163ba", - "type": "color" + "type": "color", + "value": "#0163ba" }, "10": { - "value": "#005099", - "type": "color" + "type": "color", + "value": "#005099" }, "11": { - "value": "#003d75", - "type": "color" + "type": "color", + "value": "#003d75" }, "12": { - "value": "#0163ba", - "type": "color" + "type": "color", + "value": "#0163ba" }, "13": { - "value": "#00315c", - "type": "color" + "type": "color", + "value": "#00315c" }, "contrast-1": { - "value": "#fefeff", - "type": "color" + "type": "color", + "value": "#fefeff" }, "contrast-2": { - "value": "#dbe9f5", - "type": "color" + "type": "color", + "value": "#dbe9f5" } }, "neutral": { "1": { - "value": "#fefefe", - "type": "color" + "type": "color", + "value": "#fefefe" }, "2": { - "value": "#f3f4f5", - "type": "color" + "type": "color", + "value": "#f3f4f5" }, "3": { - "value": "#e1e3e5", - "type": "color" + "type": "color", + "value": "#e1e3e5" }, "4": { - "value": "#ced1d4", - "type": "color" + "type": "color", + "value": "#ced1d4" }, "5": { - "value": "#bdc1c6", - "type": "color" + "type": "color", + "value": "#bdc1c6" }, "6": { - "value": "#b8bcc1", - "type": "color" + "type": "color", + "value": "#b8bcc1" }, "7": { - "value": "#7a818c", - "type": "color" + "type": "color", + "value": "#7a818c" }, "8": { - "value": "#444e5d", - "type": "color" + "type": "color", + "value": "#444e5d" }, "9": { - "value": "#1e2b3c", - "type": "color" + "type": "color", + "value": "#1e2b3c" }, "10": { - "value": "#303c4b", - "type": "color" + "type": "color", + "value": "#303c4b" }, "11": { - "value": "#444e5d", - "type": "color" + "type": "color", + "value": "#444e5d" }, "12": { - "value": "#5b6471", - "type": "color" + "type": "color", + "value": "#5b6471" }, "13": { - "value": "#243142", - "type": "color" + "type": "color", + "value": "#243142" }, "contrast-1": { - "value": "#fefefe", - "type": "color" + "type": "color", + "value": "#fefefe" }, "contrast-2": { - "value": "#bbbfc4", - "type": "color" + "type": "color", + "value": "#bbbfc4" } }, "brand1": { "1": { - "value": "#fefeff", - "type": "color" + "type": "color", + "value": "#fefeff" }, "2": { - "value": "#eef4fa", - "type": "color" + "type": "color", + "value": "#eef4fa" }, "3": { - "value": "#d4e5f3", - "type": "color" + "type": "color", + "value": "#d4e5f3" }, "4": { - "value": "#bad5ec", - "type": "color" + "type": "color", + "value": "#bad5ec" }, "5": { - "value": "#a1c5e5", - "type": "color" + "type": "color", + "value": "#a1c5e5" }, "6": { - "value": "#97bfe3", - "type": "color" + "type": "color", + "value": "#97bfe3" }, "7": { - "value": "#3a85ca", - "type": "color" + "type": "color", + "value": "#3a85ca" }, "8": { - "value": "#004d93", - "type": "color" + "type": "color", + "value": "#004d93" }, "9": { - "value": "#0163ba", - "type": "color" + "type": "color", + "value": "#0163ba" }, "10": { - "value": "#005099", - "type": "color" + "type": "color", + "value": "#005099" }, "11": { - "value": "#003d75", - "type": "color" + "type": "color", + "value": "#003d75" }, "12": { - "value": "#0163ba", - "type": "color" + "type": "color", + "value": "#0163ba" }, "13": { - "value": "#00315c", - "type": "color" + "type": "color", + "value": "#00315c" }, "contrast-1": { - "value": "#fefeff", - "type": "color" + "type": "color", + "value": "#fefeff" }, "contrast-2": { - "value": "#dbe9f5", - "type": "color" + "type": "color", + "value": "#dbe9f5" } }, "brand2": { "1": { - "value": "#fefefe", - "type": "color" + "type": "color", + "value": "#fefefe" }, "2": { - "value": "#f4f3f6", - "type": "color" + "type": "color", + "value": "#f4f3f6" }, "3": { - "value": "#e3e1e8", - "type": "color" + "type": "color", + "value": "#e3e1e8" }, "4": { - "value": "#d3d0db", - "type": "color" + "type": "color", + "value": "#d3d0db" }, "5": { - "value": "#c3bfce", - "type": "color" + "type": "color", + "value": "#c3bfce" }, "6": { - "value": "#beb9c9", - "type": "color" + "type": "color", + "value": "#beb9c9" }, "7": { - "value": "#857d9b", - "type": "color" + "type": "color", + "value": "#857d9b" }, "8": { - "value": "#534671", - "type": "color" + "type": "color", + "value": "#534671" }, "9": { - "value": "#3f3161", - "type": "color" + "type": "color", + "value": "#3f3161" }, "10": { - "value": "#514570", - "type": "color" + "type": "color", + "value": "#514570" }, "11": { - "value": "#64587f", - "type": "color" + "type": "color", + "value": "#64587f" }, "12": { - "value": "#685d83", - "type": "color" + "type": "color", + "value": "#685d83" }, "13": { - "value": "#352952", - "type": "color" + "type": "color", + "value": "#352952" }, "contrast-1": { - "value": "#fefefe", - "type": "color" + "type": "color", + "value": "#fefefe" }, "contrast-2": { - "value": "#d3d0db", - "type": "color" + "type": "color", + "value": "#d3d0db" } }, "brand3": { "1": { - "value": "#fffefe", - "type": "color" + "type": "color", + "value": "#fffefe" }, "2": { - "value": "#fdf1f3", - "type": "color" + "type": "color", + "value": "#fdf1f3" }, "3": { - "value": "#f9dadf", - "type": "color" + "type": "color", + "value": "#f9dadf" }, "4": { - "value": "#f6c4cc", - "type": "color" + "type": "color", + "value": "#f6c4cc" }, "5": { - "value": "#f3afb9", - "type": "color" + "type": "color", + "value": "#f3afb9" }, "6": { - "value": "#f2a7b2", - "type": "color" + "type": "color", + "value": "#f2a7b2" }, "7": { - "value": "#e4485f", - "type": "color" + "type": "color", + "value": "#e4485f" }, "8": { - "value": "#941e30", - "type": "color" + "type": "color", + "value": "#941e30" }, "9": { - "value": "#e02f4a", - "type": "color" + "type": "color", + "value": "#e02f4a" }, "10": { - "value": "#bc273d", - "type": "color" + "type": "color", + "value": "#bc273d" }, "11": { - "value": "#992032", - "type": "color" + "type": "color", + "value": "#992032" }, "12": { - "value": "#bc273d", - "type": "color" + "type": "color", + "value": "#bc273d" }, "13": { - "value": "#5f131f", - "type": "color" + "type": "color", + "value": "#5f131f" }, "contrast-1": { - "value": "#000000", - "type": "color" + "type": "color", + "value": "#000000" }, "contrast-2": { - "value": "#000000", - "type": "color" + "type": "color", + "value": "#000000" } } } diff --git a/design-tokens/primitives/colors/light/theme3.json b/design-tokens/primitives/colors/light/theme3.json index d32c88a738..0ffdf84c6d 100644 --- a/design-tokens/primitives/colors/light/theme3.json +++ b/design-tokens/primitives/colors/light/theme3.json @@ -2,312 +2,312 @@ "theme3": { "accent": { "1": { - "value": "#fefeff", - "type": "color" + "type": "color", + "value": "#fefeff" }, "2": { - "value": "#eef4fa", - "type": "color" + "type": "color", + "value": "#eef4fa" }, "3": { - "value": "#d4e5f3", - "type": "color" + "type": "color", + "value": "#d4e5f3" }, "4": { - "value": "#bad5ec", - "type": "color" + "type": "color", + "value": "#bad5ec" }, "5": { - "value": "#a1c5e5", - "type": "color" + "type": "color", + "value": "#a1c5e5" }, "6": { - "value": "#97bfe3", - "type": "color" + "type": "color", + "value": "#97bfe3" }, "7": { - "value": "#3a85ca", - "type": "color" + "type": "color", + "value": "#3a85ca" }, "8": { - "value": "#004d93", - "type": "color" + "type": "color", + "value": "#004d93" }, "9": { - "value": "#0163ba", - "type": "color" + "type": "color", + "value": "#0163ba" }, "10": { - "value": "#005099", - "type": "color" + "type": "color", + "value": "#005099" }, "11": { - "value": "#003d75", - "type": "color" + "type": "color", + "value": "#003d75" }, "12": { - "value": "#0163ba", - "type": "color" + "type": "color", + "value": "#0163ba" }, "13": { - "value": "#00315c", - "type": "color" + "type": "color", + "value": "#00315c" }, "contrast-1": { - "value": "#fefeff", - "type": "color" + "type": "color", + "value": "#fefeff" }, "contrast-2": { - "value": "#dbe9f5", - "type": "color" + "type": "color", + "value": "#dbe9f5" } }, "neutral": { "1": { - "value": "#fefefe", - "type": "color" + "type": "color", + "value": "#fefefe" }, "2": { - "value": "#f3f4f5", - "type": "color" + "type": "color", + "value": "#f3f4f5" }, "3": { - "value": "#e1e3e5", - "type": "color" + "type": "color", + "value": "#e1e3e5" }, "4": { - "value": "#ced1d4", - "type": "color" + "type": "color", + "value": "#ced1d4" }, "5": { - "value": "#bdc1c6", - "type": "color" + "type": "color", + "value": "#bdc1c6" }, "6": { - "value": "#b8bcc1", - "type": "color" + "type": "color", + "value": "#b8bcc1" }, "7": { - "value": "#7a818c", - "type": "color" + "type": "color", + "value": "#7a818c" }, "8": { - "value": "#444e5d", - "type": "color" + "type": "color", + "value": "#444e5d" }, "9": { - "value": "#1e2b3c", - "type": "color" + "type": "color", + "value": "#1e2b3c" }, "10": { - "value": "#303c4b", - "type": "color" + "type": "color", + "value": "#303c4b" }, "11": { - "value": "#444e5d", - "type": "color" + "type": "color", + "value": "#444e5d" }, "12": { - "value": "#5b6471", - "type": "color" + "type": "color", + "value": "#5b6471" }, "13": { - "value": "#243142", - "type": "color" + "type": "color", + "value": "#243142" }, "contrast-1": { - "value": "#fefefe", - "type": "color" + "type": "color", + "value": "#fefefe" }, "contrast-2": { - "value": "#bbbfc4", - "type": "color" + "type": "color", + "value": "#bbbfc4" } }, "brand1": { "1": { - "value": "#fefeff", - "type": "color" + "type": "color", + "value": "#fefeff" }, "2": { - "value": "#f3f4fc", - "type": "color" + "type": "color", + "value": "#f3f4fc" }, "3": { - "value": "#dfe0f6", - "type": "color" + "type": "color", + "value": "#dfe0f6" }, "4": { - "value": "#cecff1", - "type": "color" + "type": "color", + "value": "#cecff1" }, "5": { - "value": "#bbbdec", - "type": "color" + "type": "color", + "value": "#bbbdec" }, "6": { - "value": "#b5b7eb", - "type": "color" + "type": "color", + "value": "#b5b7eb" }, "7": { - "value": "#7378d8", - "type": "color" + "type": "color", + "value": "#7378d8" }, "8": { - "value": "#414595", - "type": "color" + "type": "color", + "value": "#414595" }, "9": { - "value": "#5b60d1", - "type": "color" + "type": "color", + "value": "#5b60d1" }, "10": { - "value": "#4b4fab", - "type": "color" + "type": "color", + "value": "#4b4fab" }, "11": { - "value": "#3b3f87", - "type": "color" + "type": "color", + "value": "#3b3f87" }, "12": { - "value": "#5358be", - "type": "color" + "type": "color", + "value": "#5358be" }, "13": { - "value": "#292b5e", - "type": "color" + "type": "color", + "value": "#292b5e" }, "contrast-1": { - "value": "#fefeff", - "type": "color" + "type": "color", + "value": "#fefeff" }, "contrast-2": { - "value": "#f3f4fc", - "type": "color" + "type": "color", + "value": "#f3f4fc" } }, "brand2": { "1": { - "value": "#fffdfb", - "type": "color" + "type": "color", + "value": "#fffdfb" }, "2": { - "value": "#fff1e7", - "type": "color" + "type": "color", + "value": "#fff1e7" }, "3": { - "value": "#ffdcc3", - "type": "color" + "type": "color", + "value": "#ffdcc3" }, "4": { - "value": "#ffc59b", - "type": "color" + "type": "color", + "value": "#ffc59b" }, "5": { - "value": "#ffaf74", - "type": "color" + "type": "color", + "value": "#ffaf74" }, "6": { - "value": "#fea769", - "type": "color" + "type": "color", + "value": "#fea769" }, "7": { - "value": "#af7348", - "type": "color" + "type": "color", + "value": "#af7348" }, "8": { - "value": "#69452b", - "type": "color" + "type": "color", + "value": "#69452b" }, "9": { - "value": "#fea769", - "type": "color" + "type": "color", + "value": "#fea769" }, "10": { - "value": "#e1945d", - "type": "color" + "type": "color", + "value": "#e1945d" }, "11": { - "value": "#c38150", - "type": "color" + "type": "color", + "value": "#c38150" }, "12": { - "value": "#865837", - "type": "color" + "type": "color", + "value": "#865837" }, "13": { - "value": "#412b1b", - "type": "color" + "type": "color", + "value": "#412b1b" }, "contrast-1": { - "value": "#000000", - "type": "color" + "type": "color", + "value": "#000000" }, "contrast-2": { - "value": "#362316", - "type": "color" + "type": "color", + "value": "#362316" } }, "brand3": { "1": { - "value": "#fcfefd", - "type": "color" + "type": "color", + "value": "#fcfefd" }, "2": { - "value": "#edf5f3", - "type": "color" + "type": "color", + "value": "#edf5f3" }, "3": { - "value": "#d3e6e1", - "type": "color" + "type": "color", + "value": "#d3e6e1" }, "4": { - "value": "#b9d7cf", - "type": "color" + "type": "color", + "value": "#b9d7cf" }, "5": { - "value": "#a1c9be", - "type": "color" + "type": "color", + "value": "#a1c9be" }, "6": { - "value": "#98c4b8", - "type": "color" + "type": "color", + "value": "#98c4b8" }, "7": { - "value": "#4f8c7b", - "type": "color" + "type": "color", + "value": "#4f8c7b" }, "8": { - "value": "#30544b", - "type": "color" + "type": "color", + "value": "#30544b" }, "9": { - "value": "#5da290", - "type": "color" + "type": "color", + "value": "#5da290" }, "10": { - "value": "#4f8c7b", - "type": "color" + "type": "color", + "value": "#4f8c7b" }, "11": { - "value": "#437669", - "type": "color" + "type": "color", + "value": "#437669" }, "12": { - "value": "#3d6b5f", - "type": "color" + "type": "color", + "value": "#3d6b5f" }, "13": { - "value": "#1e342e", - "type": "color" + "type": "color", + "value": "#1e342e" }, "contrast-1": { - "value": "#000000", - "type": "color" + "type": "color", + "value": "#000000" }, "contrast-2": { - "value": "#050808", - "type": "color" + "type": "color", + "value": "#050808" } } } diff --git a/design-tokens/primitives/colors/light/theme4.json b/design-tokens/primitives/colors/light/theme4.json index 553a89707a..eac1ebfe2b 100644 --- a/design-tokens/primitives/colors/light/theme4.json +++ b/design-tokens/primitives/colors/light/theme4.json @@ -2,312 +2,312 @@ "theme4": { "accent": { "1": { - "value": "#fefefe", - "type": "color" + "type": "color", + "value": "#fefefe" }, "2": { - "value": "#f8f2f1", - "type": "color" + "type": "color", + "value": "#f8f2f1" }, "3": { - "value": "#eddedd", - "type": "color" + "type": "color", + "value": "#eddedd" }, "4": { - "value": "#e3cdcb", - "type": "color" + "type": "color", + "value": "#e3cdcb" }, "5": { - "value": "#d8bab7", - "type": "color" + "type": "color", + "value": "#d8bab7" }, "6": { - "value": "#d5b4b2", - "type": "color" + "type": "color", + "value": "#d5b4b2" }, "7": { - "value": "#af706b", - "type": "color" + "type": "color", + "value": "#af706b" }, "8": { - "value": "#893028", - "type": "color" + "type": "color", + "value": "#893028" }, "9": { - "value": "#8c322a", - "type": "color" + "type": "color", + "value": "#8c322a" }, "10": { - "value": "#6c2620", - "type": "color" + "type": "color", + "value": "#6c2620" }, "11": { - "value": "#4e1b17", - "type": "color" + "type": "color", + "value": "#4e1b17" }, "12": { - "value": "#9b4b45", - "type": "color" + "type": "color", + "value": "#9b4b45" }, "13": { - "value": "#561e19", - "type": "color" + "type": "color", + "value": "#561e19" }, "contrast-1": { - "value": "#fefefe", - "type": "color" + "type": "color", + "value": "#fefefe" }, "contrast-2": { - "value": "#f4ebeb", - "type": "color" + "type": "color", + "value": "#f4ebeb" } }, "neutral": { "1": { - "value": "#fefefe", - "type": "color" + "type": "color", + "value": "#fefefe" }, "2": { - "value": "#f3f4f5", - "type": "color" + "type": "color", + "value": "#f3f4f5" }, "3": { - "value": "#e1e3e5", - "type": "color" + "type": "color", + "value": "#e1e3e5" }, "4": { - "value": "#ced1d4", - "type": "color" + "type": "color", + "value": "#ced1d4" }, "5": { - "value": "#bdc1c6", - "type": "color" + "type": "color", + "value": "#bdc1c6" }, "6": { - "value": "#b8bcc1", - "type": "color" + "type": "color", + "value": "#b8bcc1" }, "7": { - "value": "#7a818c", - "type": "color" + "type": "color", + "value": "#7a818c" }, "8": { - "value": "#444e5d", - "type": "color" + "type": "color", + "value": "#444e5d" }, "9": { - "value": "#1e2b3c", - "type": "color" + "type": "color", + "value": "#1e2b3c" }, "10": { - "value": "#303c4b", - "type": "color" + "type": "color", + "value": "#303c4b" }, "11": { - "value": "#444e5d", - "type": "color" + "type": "color", + "value": "#444e5d" }, "12": { - "value": "#5b6471", - "type": "color" + "type": "color", + "value": "#5b6471" }, "13": { - "value": "#243142", - "type": "color" + "type": "color", + "value": "#243142" }, "contrast-1": { - "value": "#fefefe", - "type": "color" + "type": "color", + "value": "#fefefe" }, "contrast-2": { - "value": "#bbbfc4", - "type": "color" + "type": "color", + "value": "#bbbfc4" } }, "brand1": { "1": { - "value": "#fefefe", - "type": "color" + "type": "color", + "value": "#fefefe" }, "2": { - "value": "#f8f2f1", - "type": "color" + "type": "color", + "value": "#f8f2f1" }, "3": { - "value": "#eddedd", - "type": "color" + "type": "color", + "value": "#eddedd" }, "4": { - "value": "#e3cdcb", - "type": "color" + "type": "color", + "value": "#e3cdcb" }, "5": { - "value": "#d8bab7", - "type": "color" + "type": "color", + "value": "#d8bab7" }, "6": { - "value": "#d5b4b2", - "type": "color" + "type": "color", + "value": "#d5b4b2" }, "7": { - "value": "#af706b", - "type": "color" + "type": "color", + "value": "#af706b" }, "8": { - "value": "#893028", - "type": "color" + "type": "color", + "value": "#893028" }, "9": { - "value": "#8c322a", - "type": "color" + "type": "color", + "value": "#8c322a" }, "10": { - "value": "#6c2620", - "type": "color" + "type": "color", + "value": "#6c2620" }, "11": { - "value": "#4e1b17", - "type": "color" + "type": "color", + "value": "#4e1b17" }, "12": { - "value": "#9b4b45", - "type": "color" + "type": "color", + "value": "#9b4b45" }, "13": { - "value": "#561e19", - "type": "color" + "type": "color", + "value": "#561e19" }, "contrast-1": { - "value": "#fefefe", - "type": "color" + "type": "color", + "value": "#fefefe" }, "contrast-2": { - "value": "#f4ebeb", - "type": "color" + "type": "color", + "value": "#f4ebeb" } }, "brand2": { "1": { - "value": "#fefefe", - "type": "color" + "type": "color", + "value": "#fefefe" }, "2": { - "value": "#f8f2f1", - "type": "color" + "type": "color", + "value": "#f8f2f1" }, "3": { - "value": "#eddedd", - "type": "color" + "type": "color", + "value": "#eddedd" }, "4": { - "value": "#e3cdcb", - "type": "color" + "type": "color", + "value": "#e3cdcb" }, "5": { - "value": "#d8bab7", - "type": "color" + "type": "color", + "value": "#d8bab7" }, "6": { - "value": "#d5b4b2", - "type": "color" + "type": "color", + "value": "#d5b4b2" }, "7": { - "value": "#af706b", - "type": "color" + "type": "color", + "value": "#af706b" }, "8": { - "value": "#893028", - "type": "color" + "type": "color", + "value": "#893028" }, "9": { - "value": "#8c322a", - "type": "color" + "type": "color", + "value": "#8c322a" }, "10": { - "value": "#6c2620", - "type": "color" + "type": "color", + "value": "#6c2620" }, "11": { - "value": "#4e1b17", - "type": "color" + "type": "color", + "value": "#4e1b17" }, "12": { - "value": "#9b4b45", - "type": "color" + "type": "color", + "value": "#9b4b45" }, "13": { - "value": "#561e19", - "type": "color" + "type": "color", + "value": "#561e19" }, "contrast-1": { - "value": "#fefefe", - "type": "color" + "type": "color", + "value": "#fefefe" }, "contrast-2": { - "value": "#f4ebeb", - "type": "color" + "type": "color", + "value": "#f4ebeb" } }, "brand3": { "1": { - "value": "#fefefe", - "type": "color" + "type": "color", + "value": "#fefefe" }, "2": { - "value": "#f8f2f1", - "type": "color" + "type": "color", + "value": "#f8f2f1" }, "3": { - "value": "#eddedd", - "type": "color" + "type": "color", + "value": "#eddedd" }, "4": { - "value": "#e3cdcb", - "type": "color" + "type": "color", + "value": "#e3cdcb" }, "5": { - "value": "#d8bab7", - "type": "color" + "type": "color", + "value": "#d8bab7" }, "6": { - "value": "#d5b4b2", - "type": "color" + "type": "color", + "value": "#d5b4b2" }, "7": { - "value": "#af706b", - "type": "color" + "type": "color", + "value": "#af706b" }, "8": { - "value": "#893028", - "type": "color" + "type": "color", + "value": "#893028" }, "9": { - "value": "#8c322a", - "type": "color" + "type": "color", + "value": "#8c322a" }, "10": { - "value": "#6c2620", - "type": "color" + "type": "color", + "value": "#6c2620" }, "11": { - "value": "#4e1b17", - "type": "color" + "type": "color", + "value": "#4e1b17" }, "12": { - "value": "#9b4b45", - "type": "color" + "type": "color", + "value": "#9b4b45" }, "13": { - "value": "#561e19", - "type": "color" + "type": "color", + "value": "#561e19" }, "contrast-1": { - "value": "#fefefe", - "type": "color" + "type": "color", + "value": "#fefefe" }, "contrast-2": { - "value": "#f4ebeb", - "type": "color" + "type": "color", + "value": "#f4ebeb" } } } diff --git a/design-tokens/primitives/typography/secondary.json b/design-tokens/primitives/typography/secondary.json new file mode 100644 index 0000000000..d645a2c997 --- /dev/null +++ b/design-tokens/primitives/typography/secondary.json @@ -0,0 +1,86 @@ +{ + "font-family": { + "main": { + "type": "fontFamilies", + "value": "Inter" + } + }, + "line-height": { + "300": { + "type": "lineHeights", + "value": "130%" + }, + "500": { + "type": "lineHeights", + "value": "150%" + }, + "600": { + "type": "lineHeights", + "value": "160%" + }, + "700": { + "type": "lineHeights", + "value": "170%" + } + }, + "font-weight": { + "medium": { + "type": "fontWeights", + "value": "500" + }, + "semibold": { + "type": "fontWeights", + "value": "600" + }, + "regular": { + "type": "fontWeights", + "value": "400" + } + }, + "font-size": { + "f-3": { + "type": "fontSizes", + "value": "12" + }, + "f-2": { + "type": "fontSizes", + "value": "13" + }, + "f-1": { + "type": "fontSizes", + "value": "14" + }, + "f0": { + "type": "fontSizes", + "value": "16" + }, + "f1": { + "type": "fontSizes", + "value": "18" + }, + "f2": { + "type": "fontSizes", + "value": "21" + }, + "f3": { + "type": "fontSizes", + "value": "24" + }, + "f4": { + "type": "fontSizes", + "value": "30" + }, + "f5": { + "type": "fontSizes", + "value": "36" + }, + "f6": { + "type": "fontSizes", + "value": "48" + }, + "f7": { + "type": "fontSizes", + "value": "60" + } + } +} \ No newline at end of file diff --git a/design-tokens/semantic/style.json b/design-tokens/semantic/style.json index c118f79f7d..d59fefdf90 100644 --- a/design-tokens/semantic/style.json +++ b/design-tokens/semantic/style.json @@ -538,12 +538,12 @@ }, "focus": { "outer": { - "value": "{color.neutral.text-default}", - "type": "color" + "type": "color", + "value": "{color.neutral.text-default}" }, "inner": { - "value": "{color.neutral.background-default}", - "type": "color" + "type": "color", + "value": "{color.neutral.background-default}" } } } \ No newline at end of file From e15a5b15273bc3f4e8582a5270b696d90cde3990 Mon Sep 17 00:00:00 2001 From: Michael Marszalek Date: Thu, 6 Jun 2024 09:44:28 +0200 Subject: [PATCH 05/24] updated next.theme deploy --- .github/workflows/theme-deploy.yml | 34 +++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/.github/workflows/theme-deploy.yml b/.github/workflows/theme-deploy.yml index 19c407cd2a..bdbb8e00ac 100644 --- a/.github/workflows/theme-deploy.yml +++ b/.github/workflows/theme-deploy.yml @@ -1,13 +1,26 @@ -name: Deploy Theme Production +name: Deploy Theme env: VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }} VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID_THEME }} on: workflow_dispatch: + inputs: + environment: + type: choice + default: next + description: Deploy to environment + options: + - production + - next pull_request: types: [opened, synchronize] paths: - 'apps/theme/**' + push: + branches: + - next + paths: + - 'apps/theme/**' jobs: Deploy-Production: runs-on: ubuntu-latest @@ -29,11 +42,22 @@ jobs: - name: Install Vercel CLI run: yarn add vercel@latest + - name: Set default environment value if push event is triggered + id: defaultenvironment + run: | + ENVIRONMENT=${{ github.event.inputs.environment }} + echo "value=${ENVIRONMENT:-"next"}" >> "$GITHUB_OUTPUT" + - name: Pull Vercel Environment Information - run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }} + run: vercel pull --yes --environment=${{(steps.defaultenvironment.outputs.value == 'next' && 'preview') || 'production'}} --token=${{ secrets.VERCEL_TOKEN }} - name: Build Project Artifacts - run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }} + run: vercel build ${{(steps.defaultenvironment.outputs.value == 'production' && '--prod') || ''}} --token=${{ secrets.VERCEL_TOKEN }} + + - id: deploy + name: Deploy Project Artifacts to Vercel + run: echo "url=$(vercel deploy --prebuilt ${{(steps.defaultenvironment.outputs.value == 'production' && '--prod') || ''}} --token=${{ secrets.VERCEL_TOKEN }})" >> $GITHUB_OUTPUT - - name: Deploy Project Artifacts to Vercel - run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }} + - name: Set Vercel alias + run: vercel alias --token=${{ secrets.VERCEL_TOKEN }} --scope=${{ secrets.VERCEL_TEAM }} set ${{ steps.deploy.outputs.url }} next.theme.designsystemet.no + if: steps.defaultenvironment.outputs.value == 'next' From f58ef41ba1c28d56d300b453cd1f074f1a9263ce Mon Sep 17 00:00:00 2001 From: Michael Marszalek Date: Thu, 6 Jun 2024 09:44:51 +0200 Subject: [PATCH 06/24] rename workflow --- .../{storybook-deploy-vercel.yml => storybook-deploy.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{storybook-deploy-vercel.yml => storybook-deploy.yml} (100%) diff --git a/.github/workflows/storybook-deploy-vercel.yml b/.github/workflows/storybook-deploy.yml similarity index 100% rename from .github/workflows/storybook-deploy-vercel.yml rename to .github/workflows/storybook-deploy.yml From d9653407ef1be1d15fe7c9b8fa93b2039fa0f680 Mon Sep 17 00:00:00 2001 From: Barsnes Date: Thu, 6 Jun 2024 09:49:47 +0200 Subject: [PATCH 07/24] highlight slack button --- apps/storefront/components/ImageBanner/ImageBanner.tsx | 6 +++++- apps/storefront/pages/index.mdx | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/storefront/components/ImageBanner/ImageBanner.tsx b/apps/storefront/components/ImageBanner/ImageBanner.tsx index 9957838b4a..fb66ef7b92 100644 --- a/apps/storefront/components/ImageBanner/ImageBanner.tsx +++ b/apps/storefront/components/ImageBanner/ImageBanner.tsx @@ -1,5 +1,6 @@ /* eslint-disable @next/next/no-img-element */ import type React from 'react'; +import type { ButtonProps } from '@digdir/designsystemet-react'; import { useEffect, useState, createElement } from 'react'; import cn from 'clsx'; import { Link, Button } from '@digdir/designsystemet-react'; @@ -33,6 +34,8 @@ type ImageSectionButtonProps = { text: string; prefix?: React.ReactNode; href: string; + variant?: ButtonProps['variant']; + color?: ButtonProps['color']; }; const ImageBanner = ({ @@ -126,7 +129,8 @@ const ImageBanner = ({