diff --git a/.storybook/preview.tsx b/.storybook/preview.tsx index 96d3126093..4175ced45e 100644 --- a/.storybook/preview.tsx +++ b/.storybook/preview.tsx @@ -1,8 +1,8 @@ import * as React from 'react'; import type { Preview } from '@storybook/react'; -import '@digdir/designsystemet-theme'; -import '@digdir/designsystemet-css'; +import '../packages/theme/brand/digdir/tokens.css'; +import '../packages/css/index.css'; import { Paragraph, diff --git a/apps/storefront/components/ClipboardBtn/ClipboardBtn.tsx b/apps/storefront/components/ClipboardBtn/ClipboardBtn.tsx index 6b5e6692c7..1fa9cfe80c 100644 --- a/apps/storefront/components/ClipboardBtn/ClipboardBtn.tsx +++ b/apps/storefront/components/ClipboardBtn/ClipboardBtn.tsx @@ -1,6 +1,6 @@ import { useState } from 'react'; import { ClipboardIcon } from '@navikt/aksel-icons'; -import { Tooltip } from '@digdir/designsystemet-react'; +import { Tooltip, Button } from '@digdir/designsystemet-react'; import classes from './ClipboardBtn.module.css'; @@ -23,18 +23,17 @@ const ClipboardBtn = ({ title, value, text = '' }: ClipboardBtnProps) => { return ( <> - + ); diff --git a/apps/storefront/components/Tokens/TokenList/TokenList.tsx b/apps/storefront/components/Tokens/TokenList/TokenList.tsx index da9cce5603..1ab642cf87 100644 --- a/apps/storefront/components/Tokens/TokenList/TokenList.tsx +++ b/apps/storefront/components/Tokens/TokenList/TokenList.tsx @@ -2,7 +2,12 @@ import type { HTMLAttributes } from 'react'; import { useEffect, useState } from 'react'; import cl from 'clsx'; import type { TransformedToken as Token } from 'style-dictionary'; -import { DropdownMenu, Link, Paragraph } from '@digdir/designsystemet-react'; +import { + DropdownMenu, + Link, + Paragraph, + Table, +} from '@digdir/designsystemet-react'; import { capitalizeString } from '../../../utils/StringHelpers'; import { ClipboardBtn } from '../../ClipboardBtn/ClipboardBtn'; @@ -24,6 +29,82 @@ type TokenListProps = { type CardColumnType = 2 | 3; type BrandType = 'digdir' | 'altinn' | 'tilsynet' | 'brreg'; +type TokenTableProps = { + tokens: [string, Token[]][]; +} & HTMLAttributes; + +const TokensTable = ({ tokens }: TokenTableProps) => { + return ( + + + + Navn + Rem + Px (16px) + Visualisering + + + + {tokens.map(([, tokens]) => { + return tokens.map((token) => { + const pxSize = `${parseFloat(token.value as string) * 16}px`; + + return ( + + + + + {token.value} + {pxSize} + + + + + ); + }); + })} + +
+ ); +}; + +type TokenCardsProps = { + tokens: [string, Token[]][]; + cols?: number; + hideValue: TokenListProps['hideValue']; + type: TokenListProps['type']; +}; + +const TokenCards = ({ tokens, cols, hideValue, type }: TokenCardsProps) => { + return tokens.map(([group, tokens]) => { + return ( +
+

{capitalizeString(group)}

+
+
+ {tokens.map((token) => ( + + ))} +
+
+
+ ); + }); +}; + type TokenCardProps = { token: Token; hideValue: TokenListProps['hideValue']; @@ -36,7 +117,6 @@ const TokenCard = ({ token, type, hideValue, ...rest }: TokenCardProps) => { .slice(token.path.length - 1, token.path.length) .toString(); - const isSlim = type === 'sizing' || type === 'spacing'; return (
{ {type === 'color' && } {type === 'typography' && } {type === 'boxShadow' && } - {isSlim && }

{capitalizeString(title)}   - {isSlim && typeof token.description === 'string' && ( - {`(${token.description})`} - )} )} <> - {sectionedTokens.map(([section, tokens]) => ( -
-

{capitalizeString(section as string)}

- {(tokens as [string, Token[]][]).map(([group, tokens]) => { - const isSlim = type === 'sizing' || type === 'spacing'; - - return ( -
- {!isSlim &&

{capitalizeString(group)}

} -
-
- {tokens.map((token) => ( - - ))} -
-
-
- ); - })} -
- ))} + {sectionedTokens.map(([section, tokens]) => { + const tokens_ = tokens as [string, Token[]][]; + const List = () => { + if (['spacing', 'sizing'].includes(type)) { + return ; + } + + return ( + + ); + }; + return ( +
+

{capitalizeString(section as string)}

+ +
+ ); + })}

); diff --git a/apps/storefront/pages/grunnleggende/designelementer/storrelser-og-avstander.mdx b/apps/storefront/pages/grunnleggende/designelementer/storrelser-og-avstander.mdx index a5725cfe3b..b75a943f7c 100644 --- a/apps/storefront/pages/grunnleggende/designelementer/storrelser-og-avstander.mdx +++ b/apps/storefront/pages/grunnleggende/designelementer/storrelser-og-avstander.mdx @@ -1,7 +1,7 @@ import { RulerIcon } from '@navikt/aksel-icons'; import { MenuPageLayout } from '@layouts'; -import { Meta, TokenList, CodeSnippet } from '@components'; +import { Meta, TokenList } from '@components'; - -## Fluid sizing - -Størrelsene er satt opp til å passe sammen med [fluid typography](/grunnleggende/designelementer/typografi#fluid-typography). De varier derfor noe etter hvilken viewport du har. `Sizing.10` vil dermed være 40px på viewport 320, og 45px på viewport 1360. - - - {`"sizing": { - "1": { - "value": "{base_sizing}/16*{font-size.f0}", - "type": "sizing", - "description": "4px - 4.5px" - }, - "2": { - "value": "{base_sizing}*2/16*{font-size.f0}", - "type": "sizing", - "description": "8px - 9px" - }, - "(...)" - "10": { - "value": "{base_sizing}*10/16*{font-size.f0}", - "type": "sizing", - "description": "40px - 45px" - }, - "12": { - "value": "({base_sizing}*12/16)*{font-size.f0}", - "type": "sizing", - "description": "48px - 54px" - }, - }`} - - -## Fluid spacing - -Avstandene er satt opp til å passe sammen med [fluid typography](/grunnleggende/designelementer/typografi#fluid-typography). De varier derfor noe etter hvilken viewport du har. `Spacing.10` vil dermed være 40px på viewport 320, og 45px på viewport 1360. - - - {`"spacing": { - "1": { - "value": "{base_spacing}/16*{font-size.f0}", - "type": "spacing", - "description": "4px - 4.5px" - }, - "2": { - "value": "{base_spacing}*2/16*{font-size.f0}", - "type": "spacing", - "description": "8px - 9px" - }, - "(...)" - "10": { - "value": "({base_spacing}*10/16)*{font-size.f0}", - "type": "spacing", - "description": "40px - 45px" - }, - "12": { - "value": "({base_spacing}*12/16)*{font-size.f0}", - "type": "spacing", - "description": "48px - 54px" - }, - }`} - diff --git a/apps/storefront/tokens/altinn.ts b/apps/storefront/tokens/altinn.ts index a9a5ead36d..8b32f1fe96 100644 --- a/apps/storefront/tokens/altinn.ts +++ b/apps/storefront/tokens/altinn.ts @@ -2388,7 +2388,7 @@ export const color = [ export const typography = [ { - value: "500 clamp(1.94rem, calc(1.88vw + 1.56rem), 3.16rem)/1.3 'Inter'", + value: "500 3.75rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2401,30 +2401,12 @@ export const typography = [ }, type: 'typography', }, - name: '--fds-typography-heading-3xlarge', - attributes: {}, - path: ['typography', 'heading', '3xlarge'], - }, - { - value: "500 clamp(1.78rem, calc(1.44vw + 1.49rem), 2.72rem)/1.3 'Inter'", - type: 'typography', - filePath: '../../design-tokens/Base/Semantic.json', - isSource: false, - original: { - value: { - fontFamily: '{fontFamilies.inter}', - fontWeight: '{fontWeights.medium}', - lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f6}', - }, - type: 'typography', - }, name: '--fds-typography-heading-2xlarge', attributes: {}, path: ['typography', 'heading', '2xlarge'], }, { - value: "500 clamp(1.59rem, calc(1.15vw + 1.36rem), 2.34rem)/1.3 'Inter'", + value: "500 3rem/1.3 'Inter'", type: 'typography', description: 'H1', filePath: '../../design-tokens/Base/Semantic.json', @@ -2434,7 +2416,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f5}', + fontSize: '{font-size.f6}', }, type: 'typography', description: 'H1', @@ -2444,7 +2426,7 @@ export const typography = [ path: ['typography', 'heading', 'xlarge'], }, { - value: "500 clamp(1.47rem, calc(0.86vw + 1.30rem), 2.03rem)/1.3 'Inter'", + value: "500 2.25rem/1.3 'Inter'", type: 'typography', description: 'H2', filePath: '../../design-tokens/Base/Semantic.json', @@ -2454,7 +2436,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f4}', + fontSize: '{font-size.f5}', }, type: 'typography', description: 'H2', @@ -2464,7 +2446,7 @@ export const typography = [ path: ['typography', 'heading', 'large'], }, { - value: "500 clamp(1.34rem, calc(0.63vw + 1.22rem), 1.75rem)/1.3 'Inter'", + value: "500 1.875rem/1.3 'Inter'", type: 'typography', description: 'H3', filePath: '../../design-tokens/Base/Semantic.json', @@ -2474,7 +2456,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f3}', + fontSize: '{font-size.f4}', }, type: 'typography', description: 'H3', @@ -2484,7 +2466,7 @@ export const typography = [ path: ['typography', 'heading', 'medium'], }, { - value: "500 clamp(1.22rem, calc(0.43vw + 1.13rem), 1.50rem)/1.3 'Inter'", + value: "500 1.5rem/1.3 'Inter'", type: 'typography', description: 'H4', filePath: '../../design-tokens/Base/Semantic.json', @@ -2494,7 +2476,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f2}', + fontSize: '{font-size.f3}', }, type: 'typography', description: 'H4', @@ -2504,7 +2486,7 @@ export const typography = [ path: ['typography', 'heading', 'small'], }, { - value: "500 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.3 'Inter'", + value: "500 1.3125rem/1.3 'Inter'", type: 'typography', description: 'H5', filePath: '../../design-tokens/Base/Semantic.json', @@ -2514,7 +2496,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f1}', + fontSize: '{font-size.f2}', }, type: 'typography', description: 'H5', @@ -2524,7 +2506,7 @@ export const typography = [ path: ['typography', 'heading', 'xsmall'], }, { - value: "500 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.3 'Inter'", + value: "500 1.125rem/1.3 'Inter'", type: 'typography', description: 'H6', filePath: '../../design-tokens/Base/Semantic.json', @@ -2534,7 +2516,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f0}', + fontSize: '{font-size.f1}', }, type: 'typography', description: 'H6', @@ -2544,7 +2526,7 @@ export const typography = [ path: ['typography', 'heading', 'xxsmall'], }, { - value: "400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.6 'Inter'", + value: "400 1.875rem/1.6 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2553,7 +2535,25 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.600}', - fontSize: '{font-size.f1}', + fontSize: '{font-size.f4}', + }, + type: 'typography', + }, + name: '--fds-typography-ingress-large', + attributes: {}, + path: ['typography', 'ingress', 'large'], + }, + { + value: "400 1.5rem/1.6 'Inter'", + type: 'typography', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: { + fontFamily: '{fontFamilies.inter}', + fontWeight: '{fontWeights.regular}', + lineHeight: '{lineHeights.600}', + fontSize: '{font-size.f3}', }, type: 'typography', }, @@ -2562,7 +2562,7 @@ export const typography = [ path: ['typography', 'ingress', 'medium'], }, { - value: "400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.5 'Inter'", + value: "400 1.3125rem/1.6 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2570,17 +2570,53 @@ export const typography = [ value: { fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', - lineHeight: '{lineHeights.500}', + lineHeight: '{lineHeights.600}', + fontSize: '{font-size.f2}', + }, + type: 'typography', + }, + name: '--fds-typography-ingress-small', + attributes: {}, + path: ['typography', 'ingress', 'small'], + }, + { + value: "400 1.125rem/1.6 'Inter'", + type: 'typography', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: { + fontFamily: '{fontFamilies.inter}', + fontWeight: '{fontWeights.regular}', + lineHeight: '{lineHeights.600}', fontSize: '{font-size.f1}', }, type: 'typography', }, + name: '--fds-typography-ingress-xsmall', + attributes: {}, + path: ['typography', 'ingress', 'xsmall'], + }, + { + value: "400 1.3125rem/1.5 'Inter'", + type: 'typography', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: { + fontFamily: '{fontFamilies.inter}', + fontWeight: '{fontWeights.regular}', + lineHeight: '{lineHeights.500}', + fontSize: '{font-size.f2}', + }, + type: 'typography', + }, name: '--fds-typography-paragraph-large', attributes: {}, path: ['typography', 'paragraph', 'large'], }, { - value: "400 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.5 'Inter'", + value: "400 1.125rem/1.5 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2589,7 +2625,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.500}', - fontSize: '{font-size.f0}', + fontSize: '{font-size.f1}', }, type: 'typography', }, @@ -2598,7 +2634,7 @@ export const typography = [ path: ['typography', 'paragraph', 'medium'], }, { - value: "400 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.5 'Inter'", + value: "400 1rem/1.5 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2607,7 +2643,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.500}', - fontSize: '{font-size.f-1}', + fontSize: '{font-size.f0}', }, type: 'typography', }, @@ -2616,7 +2652,7 @@ export const typography = [ path: ['typography', 'paragraph', 'small'], }, { - value: "400 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.5 'Inter'", + value: "400 0.875rem/1.5 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2625,7 +2661,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.500}', - fontSize: '{font-size.f-2}', + fontSize: '{font-size.f-1}', }, type: 'typography', }, @@ -2634,7 +2670,7 @@ export const typography = [ path: ['typography', 'paragraph', 'xsmall'], }, { - value: "400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.3 'Inter'", + value: "400 1.3125rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2643,7 +2679,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f1}', + fontSize: '{font-size.f2}', }, type: 'typography', }, @@ -2652,7 +2688,7 @@ export const typography = [ path: ['typography', 'paragraph', 'short', 'large'], }, { - value: "400 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.3 'Inter'", + value: "400 1.125rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2661,7 +2697,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f0}', + fontSize: '{font-size.f1}', }, type: 'typography', }, @@ -2670,7 +2706,7 @@ export const typography = [ path: ['typography', 'paragraph', 'short', 'medium'], }, { - value: "400 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.3 'Inter'", + value: "400 1rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2679,7 +2715,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f-1}', + fontSize: '{font-size.f0}', }, type: 'typography', }, @@ -2688,7 +2724,7 @@ export const typography = [ path: ['typography', 'paragraph', 'short', 'small'], }, { - value: "400 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.3 'Inter'", + value: "400 0.875rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2697,7 +2733,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f-2}', + fontSize: '{font-size.f-1}', }, type: 'typography', }, @@ -2706,7 +2742,7 @@ export const typography = [ path: ['typography', 'paragraph', 'short', 'xsmall'], }, { - value: "400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.7 'Inter'", + value: "400 1.125rem/1.7 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2724,7 +2760,7 @@ export const typography = [ path: ['typography', 'paragraph', 'long', 'large'], }, { - value: "400 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.7 'Inter'", + value: "400 1rem/1.7 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2742,7 +2778,7 @@ export const typography = [ path: ['typography', 'paragraph', 'long', 'medium'], }, { - value: "400 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.7 'Inter'", + value: "400 0.875rem/1.7 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2760,7 +2796,7 @@ export const typography = [ path: ['typography', 'paragraph', 'long', 'small'], }, { - value: "400 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.7 'Inter'", + value: "400 0.8125rem/1.7 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2778,7 +2814,7 @@ export const typography = [ path: ['typography', 'paragraph', 'long', 'xsmall'], }, { - value: "500 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.3 'Inter'", + value: "500 1.3125rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2787,7 +2823,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f1}', + fontSize: '{font-size.f2}', }, type: 'typography', }, @@ -2796,7 +2832,7 @@ export const typography = [ path: ['typography', 'label', 'large'], }, { - value: "500 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.3 'Inter'", + value: "500 1.125rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2805,7 +2841,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f0}', + fontSize: '{font-size.f1}', }, type: 'typography', }, @@ -2814,7 +2850,7 @@ export const typography = [ path: ['typography', 'label', 'medium'], }, { - value: "500 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.3 'Inter'", + value: "500 1rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2823,7 +2859,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f-1}', + fontSize: '{font-size.f0}', }, type: 'typography', }, @@ -2832,7 +2868,7 @@ export const typography = [ path: ['typography', 'label', 'small'], }, { - value: "500 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.3 'Inter'", + value: "500 0.875rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2841,7 +2877,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f-2}', + fontSize: '{font-size.f-1}', }, type: 'typography', }, @@ -2850,7 +2886,7 @@ export const typography = [ path: ['typography', 'label', 'xsmall'], }, { - value: "400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.3 'Inter'", + value: "400 1.3125rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2859,7 +2895,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f1}', + fontSize: '{font-size.f2}', }, type: 'typography', }, @@ -2868,7 +2904,7 @@ export const typography = [ path: ['typography', 'error_message', 'large'], }, { - value: "400 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.3 'Inter'", + value: "400 1.125rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2877,7 +2913,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f0}', + fontSize: '{font-size.f1}', }, type: 'typography', }, @@ -2886,7 +2922,7 @@ export const typography = [ path: ['typography', 'error_message', 'medium'], }, { - value: "400 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.3 'Inter'", + value: "400 1rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2895,7 +2931,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f-1}', + fontSize: '{font-size.f0}', }, type: 'typography', }, @@ -2904,7 +2940,7 @@ export const typography = [ path: ['typography', 'error_message', 'small'], }, { - value: "400 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.3 'Inter'", + value: "400 0.875rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2913,7 +2949,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f-2}', + fontSize: '{font-size.f-1}', }, type: 'typography', }, @@ -3115,240 +3151,260 @@ export const borderRadius = [ export const spacing = [ { - value: 'calc(0)', + value: '0rem', type: 'spacing', - description: '0', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '0', + value: '{base_sizing}*0', type: 'spacing', - description: '0', }, name: '--fds-spacing-0', attributes: {}, path: ['spacing', '0'], }, { - value: 'calc(4/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '0.25rem', type: 'spacing', - description: '4px - 4.5px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_spacing}/16*{font-size.f0}', + value: '{base_sizing}*1', type: 'spacing', - description: '4px - 4.5px', }, name: '--fds-spacing-1', attributes: {}, path: ['spacing', '1'], }, { - value: 'calc(4*2/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '0.5rem', type: 'spacing', - description: '8px - 9px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_spacing}*2/16*{font-size.f0}', + value: '{base_sizing}*2', type: 'spacing', - description: '8px - 9px', }, name: '--fds-spacing-2', attributes: {}, path: ['spacing', '2'], }, { - value: 'calc(4*3/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '0.75rem', type: 'spacing', - description: '12px - 13.5px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_spacing}*3/16*{font-size.f0}', + value: '{base_sizing}*3', type: 'spacing', - description: '12px - 13.5px', }, name: '--fds-spacing-3', attributes: {}, path: ['spacing', '3'], }, { - value: 'calc(4*4/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '1rem', type: 'spacing', - description: '16px - 18px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_spacing}*4/16*{font-size.f0}', + value: '{base_sizing}*4', type: 'spacing', - description: '16px - 18px', }, name: '--fds-spacing-4', attributes: {}, path: ['spacing', '4'], }, { - value: 'calc(4*5/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '1.25rem', type: 'spacing', - description: '20px - 22.5px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_spacing}*5/16*{font-size.f0}', + value: '{base_sizing}*5', type: 'spacing', - description: '20px - 22.5px', }, name: '--fds-spacing-5', attributes: {}, path: ['spacing', '5'], }, { - value: 'calc(4*6/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '1.5rem', type: 'spacing', - description: '24px - 27px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_spacing}*6/16*{font-size.f0}', + value: '{base_sizing}*6', type: 'spacing', - description: '24px - 27px', }, name: '--fds-spacing-6', attributes: {}, path: ['spacing', '6'], }, { - value: 'calc(4*7/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '1.75rem', type: 'spacing', - description: '28px - 31.5px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_spacing}*7/16*{font-size.f0}', + value: '{base_sizing}*7', type: 'spacing', - description: '28px - 31.5px', }, name: '--fds-spacing-7', attributes: {}, path: ['spacing', '7'], }, { - value: 'calc((4*8/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '2rem', type: 'spacing', - description: '32px - 36px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_spacing}*8/16)*{font-size.f0}', + value: '{base_sizing}*8', type: 'spacing', - description: '32px - 36px', }, name: '--fds-spacing-8', attributes: {}, path: ['spacing', '8'], }, { - value: 'calc((4*10/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '2.25rem', + type: 'spacing', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: '{base_sizing}*9', + type: 'spacing', + }, + name: '--fds-spacing-9', + attributes: {}, + path: ['spacing', '9'], + }, + { + value: '2.5rem', type: 'spacing', - description: '40px - 45px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_spacing}*10/16)*{font-size.f0}', + value: '{base_sizing}*10', type: 'spacing', - description: '40px - 45px', }, name: '--fds-spacing-10', attributes: {}, path: ['spacing', '10'], }, { - value: 'calc((4*12/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '2.75rem', + type: 'spacing', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: '{base_sizing}*11', + type: 'spacing', + }, + name: '--fds-spacing-11', + attributes: {}, + path: ['spacing', '11'], + }, + { + value: '3rem', type: 'spacing', - description: '48px - 54px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_spacing}*12/16)*{font-size.f0}', + value: '{base_sizing}*12', type: 'spacing', - description: '48px - 54px', }, name: '--fds-spacing-12', attributes: {}, path: ['spacing', '12'], }, { - value: 'calc((4*14/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '3.25rem', + type: 'spacing', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: '{base_sizing}*13', + type: 'spacing', + }, + name: '--fds-spacing-13', + attributes: {}, + path: ['spacing', '13'], + }, + { + value: '3.5rem', type: 'spacing', - description: '56px - 63px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_spacing}*14/16)*{font-size.f0}', + value: '{base_sizing}*14', type: 'spacing', - description: '56px - 63px', }, name: '--fds-spacing-14', attributes: {}, path: ['spacing', '14'], }, { - value: 'calc((4*18/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '3.75rem', type: 'spacing', - description: '72px - 81px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_spacing}*18/16)*{font-size.f0}', + value: '{base_sizing}*15', + type: 'spacing', + }, + name: '--fds-spacing-15', + attributes: {}, + path: ['spacing', '15'], + }, + { + value: '4.5rem', + type: 'spacing', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: '{base_sizing}*18', type: 'spacing', - description: '72px - 81px', }, name: '--fds-spacing-18', attributes: {}, path: ['spacing', '18'], }, { - value: 'calc((4*22/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '5.5rem', type: 'spacing', - description: '88px - 99px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_spacing}*22/16)*{font-size.f0}', + value: '{base_sizing}*22', type: 'spacing', - description: '88px - 99px', }, name: '--fds-spacing-22', attributes: {}, path: ['spacing', '22'], }, { - value: 'calc((4*26/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '6.5rem', type: 'spacing', - description: '104px - 117px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_spacing}*26/16)*{font-size.f0}', + value: '{base_sizing}*26', type: 'spacing', - description: '104px - 117px', }, name: '--fds-spacing-26', attributes: {}, path: ['spacing', '26'], }, { - value: 'calc((4*30/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '7.5rem', type: 'spacing', - description: '120px - 135px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_spacing}*30/16)*{font-size.f0}', + value: '{base_sizing}*30', type: 'spacing', - description: '120px - 135px', }, name: '--fds-spacing-30', attributes: {}, @@ -3358,225 +3414,260 @@ export const spacing = [ export const sizing = [ { - value: 'calc(4/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '0rem', + type: 'sizing', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: '{base_sizing}*0', + type: 'sizing', + }, + name: '--fds-sizing-0', + attributes: {}, + path: ['sizing', '0'], + }, + { + value: '0.25rem', type: 'sizing', - description: '4px - 4.5px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_sizing}/16*{font-size.f0}', + value: '{base_sizing}*1', type: 'sizing', - description: '4px - 4.5px', }, name: '--fds-sizing-1', attributes: {}, path: ['sizing', '1'], }, { - value: 'calc(4*2/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '0.5rem', type: 'sizing', - description: '8px - 9px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_sizing}*2/16*{font-size.f0}', + value: '{base_sizing}*2', type: 'sizing', - description: '8px - 9px', }, name: '--fds-sizing-2', attributes: {}, path: ['sizing', '2'], }, { - value: 'calc(4*3/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '0.75rem', type: 'sizing', - description: '12px - 13.5px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_sizing}*3/16*{font-size.f0}', + value: '{base_sizing}*3', type: 'sizing', - description: '12px - 13.5px', }, name: '--fds-sizing-3', attributes: {}, path: ['sizing', '3'], }, { - value: 'calc(4*4/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '1rem', type: 'sizing', - description: '16px - 18px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_sizing}*4/16*{font-size.f0}', + value: '{base_sizing}*4', type: 'sizing', - description: '16px - 18px', }, name: '--fds-sizing-4', attributes: {}, path: ['sizing', '4'], }, { - value: 'calc(4*5/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '1.25rem', type: 'sizing', - description: '20px - 22.5', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_sizing}*5/16*{font-size.f0}', + value: '{base_sizing}*5', type: 'sizing', - description: '20px - 22.5', }, name: '--fds-sizing-5', attributes: {}, path: ['sizing', '5'], }, { - value: 'calc(4*6/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '1.5rem', type: 'sizing', - description: '24px - 27px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_sizing}*6/16*{font-size.f0}', + value: '{base_sizing}*6', type: 'sizing', - description: '24px - 27px', }, name: '--fds-sizing-6', attributes: {}, path: ['sizing', '6'], }, { - value: 'calc(4*7/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '1.75rem', type: 'sizing', - description: '28px - 31.5px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_sizing}*7/16*{font-size.f0}', + value: '{base_sizing}*7', type: 'sizing', - description: '28px - 31.5px', }, name: '--fds-sizing-7', attributes: {}, path: ['sizing', '7'], }, { - value: 'calc(4*8/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '2rem', type: 'sizing', - description: '32px - 36px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_sizing}*8/16*{font-size.f0}', + value: '{base_sizing}*8', type: 'sizing', - description: '32px - 36px', }, name: '--fds-sizing-8', attributes: {}, path: ['sizing', '8'], }, { - value: 'calc(4*10/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '2.25rem', + type: 'sizing', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: '{base_sizing}*9', + type: 'sizing', + }, + name: '--fds-sizing-9', + attributes: {}, + path: ['sizing', '9'], + }, + { + value: '2.5rem', type: 'sizing', - description: '40px - 45px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_sizing}*10/16*{font-size.f0}', + value: '{base_sizing}*10', type: 'sizing', - description: '40px - 45px', }, name: '--fds-sizing-10', attributes: {}, path: ['sizing', '10'], }, { - value: 'calc((4*12/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '2.75rem', type: 'sizing', - description: '48px - 54px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_sizing}*12/16)*{font-size.f0}', + value: '{base_sizing}*11', + type: 'sizing', + }, + name: '--fds-sizing-11', + attributes: {}, + path: ['sizing', '11'], + }, + { + value: '3rem', + type: 'sizing', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: '{base_sizing}*12', type: 'sizing', - description: '48px - 54px', }, name: '--fds-sizing-12', attributes: {}, path: ['sizing', '12'], }, { - value: 'calc((4*14/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '3.25rem', type: 'sizing', - description: '56px - 63px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_sizing}*14/16)*{font-size.f0}', + value: '{base_sizing}*13', + type: 'sizing', + }, + name: '--fds-sizing-13', + attributes: {}, + path: ['sizing', '13'], + }, + { + value: '3.5rem', + type: 'sizing', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: '{base_sizing}*14', type: 'sizing', - description: '56px - 63px', }, name: '--fds-sizing-14', attributes: {}, path: ['sizing', '14'], }, { - value: 'calc((4*18/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '3.75rem', + type: 'sizing', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: '{base_sizing}*15', + type: 'sizing', + }, + name: '--fds-sizing-15', + attributes: {}, + path: ['sizing', '15'], + }, + { + value: '4.5rem', type: 'sizing', - description: '72px - 81px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_sizing}*18/16)*{font-size.f0}', + value: '{base_sizing}*18', type: 'sizing', - description: '72px - 81px', }, name: '--fds-sizing-18', attributes: {}, path: ['sizing', '18'], }, { - value: 'calc((4*22/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '5.5rem', type: 'sizing', - description: '88px - 99px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_sizing}*22/16)*{font-size.f0}', + value: '{base_sizing}*22', type: 'sizing', - description: '88px - 99px', }, name: '--fds-sizing-22', attributes: {}, path: ['sizing', '22'], }, { - value: 'calc((4*26/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '6.5rem', type: 'sizing', - description: '104px - 117px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_sizing}*26/16)*{font-size.f0}', + value: '{base_sizing}*26', type: 'sizing', - description: '104px - 117px', }, name: '--fds-sizing-26', attributes: {}, path: ['sizing', '26'], }, { - value: 'calc((4*30/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '7.5rem', type: 'sizing', - description: '120px - 135px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_sizing}*30/16)*{font-size.f0}', + value: '{base_sizing}*30', type: 'sizing', - description: '120px - 135px', }, name: '--fds-sizing-30', attributes: {}, diff --git a/apps/storefront/tokens/brreg.ts b/apps/storefront/tokens/brreg.ts index 40badd71b3..3b6c0e9313 100644 --- a/apps/storefront/tokens/brreg.ts +++ b/apps/storefront/tokens/brreg.ts @@ -2406,7 +2406,7 @@ export const color = [ export const typography = [ { - value: "500 clamp(1.94rem, calc(1.88vw + 1.56rem), 3.16rem)/1.3 'Inter'", + value: "500 3.75rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2419,30 +2419,12 @@ export const typography = [ }, type: 'typography', }, - name: '--fds-typography-heading-3xlarge', - attributes: {}, - path: ['typography', 'heading', '3xlarge'], - }, - { - value: "500 clamp(1.78rem, calc(1.44vw + 1.49rem), 2.72rem)/1.3 'Inter'", - type: 'typography', - filePath: '../../design-tokens/Base/Semantic.json', - isSource: false, - original: { - value: { - fontFamily: '{fontFamilies.inter}', - fontWeight: '{fontWeights.medium}', - lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f6}', - }, - type: 'typography', - }, name: '--fds-typography-heading-2xlarge', attributes: {}, path: ['typography', 'heading', '2xlarge'], }, { - value: "500 clamp(1.59rem, calc(1.15vw + 1.36rem), 2.34rem)/1.3 'Inter'", + value: "500 3rem/1.3 'Inter'", type: 'typography', description: 'H1', filePath: '../../design-tokens/Base/Semantic.json', @@ -2452,7 +2434,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f5}', + fontSize: '{font-size.f6}', }, type: 'typography', description: 'H1', @@ -2462,7 +2444,7 @@ export const typography = [ path: ['typography', 'heading', 'xlarge'], }, { - value: "500 clamp(1.47rem, calc(0.86vw + 1.30rem), 2.03rem)/1.3 'Inter'", + value: "500 2.25rem/1.3 'Inter'", type: 'typography', description: 'H2', filePath: '../../design-tokens/Base/Semantic.json', @@ -2472,7 +2454,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f4}', + fontSize: '{font-size.f5}', }, type: 'typography', description: 'H2', @@ -2482,7 +2464,7 @@ export const typography = [ path: ['typography', 'heading', 'large'], }, { - value: "500 clamp(1.34rem, calc(0.63vw + 1.22rem), 1.75rem)/1.3 'Inter'", + value: "500 1.875rem/1.3 'Inter'", type: 'typography', description: 'H3', filePath: '../../design-tokens/Base/Semantic.json', @@ -2492,7 +2474,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f3}', + fontSize: '{font-size.f4}', }, type: 'typography', description: 'H3', @@ -2502,7 +2484,7 @@ export const typography = [ path: ['typography', 'heading', 'medium'], }, { - value: "500 clamp(1.22rem, calc(0.43vw + 1.13rem), 1.50rem)/1.3 'Inter'", + value: "500 1.5rem/1.3 'Inter'", type: 'typography', description: 'H4', filePath: '../../design-tokens/Base/Semantic.json', @@ -2512,7 +2494,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f2}', + fontSize: '{font-size.f3}', }, type: 'typography', description: 'H4', @@ -2522,7 +2504,7 @@ export const typography = [ path: ['typography', 'heading', 'small'], }, { - value: "500 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.3 'Inter'", + value: "500 1.3125rem/1.3 'Inter'", type: 'typography', description: 'H5', filePath: '../../design-tokens/Base/Semantic.json', @@ -2532,7 +2514,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f1}', + fontSize: '{font-size.f2}', }, type: 'typography', description: 'H5', @@ -2542,7 +2524,7 @@ export const typography = [ path: ['typography', 'heading', 'xsmall'], }, { - value: "500 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.3 'Inter'", + value: "500 1.125rem/1.3 'Inter'", type: 'typography', description: 'H6', filePath: '../../design-tokens/Base/Semantic.json', @@ -2552,7 +2534,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f0}', + fontSize: '{font-size.f1}', }, type: 'typography', description: 'H6', @@ -2562,7 +2544,7 @@ export const typography = [ path: ['typography', 'heading', 'xxsmall'], }, { - value: "400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.6 'Inter'", + value: "400 1.875rem/1.6 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2571,7 +2553,25 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.600}', - fontSize: '{font-size.f1}', + fontSize: '{font-size.f4}', + }, + type: 'typography', + }, + name: '--fds-typography-ingress-large', + attributes: {}, + path: ['typography', 'ingress', 'large'], + }, + { + value: "400 1.5rem/1.6 'Inter'", + type: 'typography', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: { + fontFamily: '{fontFamilies.inter}', + fontWeight: '{fontWeights.regular}', + lineHeight: '{lineHeights.600}', + fontSize: '{font-size.f3}', }, type: 'typography', }, @@ -2580,7 +2580,7 @@ export const typography = [ path: ['typography', 'ingress', 'medium'], }, { - value: "400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.5 'Inter'", + value: "400 1.3125rem/1.6 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2588,17 +2588,53 @@ export const typography = [ value: { fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', - lineHeight: '{lineHeights.500}', + lineHeight: '{lineHeights.600}', + fontSize: '{font-size.f2}', + }, + type: 'typography', + }, + name: '--fds-typography-ingress-small', + attributes: {}, + path: ['typography', 'ingress', 'small'], + }, + { + value: "400 1.125rem/1.6 'Inter'", + type: 'typography', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: { + fontFamily: '{fontFamilies.inter}', + fontWeight: '{fontWeights.regular}', + lineHeight: '{lineHeights.600}', fontSize: '{font-size.f1}', }, type: 'typography', }, + name: '--fds-typography-ingress-xsmall', + attributes: {}, + path: ['typography', 'ingress', 'xsmall'], + }, + { + value: "400 1.3125rem/1.5 'Inter'", + type: 'typography', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: { + fontFamily: '{fontFamilies.inter}', + fontWeight: '{fontWeights.regular}', + lineHeight: '{lineHeights.500}', + fontSize: '{font-size.f2}', + }, + type: 'typography', + }, name: '--fds-typography-paragraph-large', attributes: {}, path: ['typography', 'paragraph', 'large'], }, { - value: "400 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.5 'Inter'", + value: "400 1.125rem/1.5 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2607,7 +2643,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.500}', - fontSize: '{font-size.f0}', + fontSize: '{font-size.f1}', }, type: 'typography', }, @@ -2616,7 +2652,7 @@ export const typography = [ path: ['typography', 'paragraph', 'medium'], }, { - value: "400 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.5 'Inter'", + value: "400 1rem/1.5 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2625,7 +2661,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.500}', - fontSize: '{font-size.f-1}', + fontSize: '{font-size.f0}', }, type: 'typography', }, @@ -2634,7 +2670,7 @@ export const typography = [ path: ['typography', 'paragraph', 'small'], }, { - value: "400 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.5 'Inter'", + value: "400 0.875rem/1.5 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2643,7 +2679,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.500}', - fontSize: '{font-size.f-2}', + fontSize: '{font-size.f-1}', }, type: 'typography', }, @@ -2652,7 +2688,7 @@ export const typography = [ path: ['typography', 'paragraph', 'xsmall'], }, { - value: "400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.3 'Inter'", + value: "400 1.3125rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2661,7 +2697,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f1}', + fontSize: '{font-size.f2}', }, type: 'typography', }, @@ -2670,7 +2706,7 @@ export const typography = [ path: ['typography', 'paragraph', 'short', 'large'], }, { - value: "400 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.3 'Inter'", + value: "400 1.125rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2679,7 +2715,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f0}', + fontSize: '{font-size.f1}', }, type: 'typography', }, @@ -2688,7 +2724,7 @@ export const typography = [ path: ['typography', 'paragraph', 'short', 'medium'], }, { - value: "400 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.3 'Inter'", + value: "400 1rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2697,7 +2733,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f-1}', + fontSize: '{font-size.f0}', }, type: 'typography', }, @@ -2706,7 +2742,7 @@ export const typography = [ path: ['typography', 'paragraph', 'short', 'small'], }, { - value: "400 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.3 'Inter'", + value: "400 0.875rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2715,7 +2751,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f-2}', + fontSize: '{font-size.f-1}', }, type: 'typography', }, @@ -2724,7 +2760,7 @@ export const typography = [ path: ['typography', 'paragraph', 'short', 'xsmall'], }, { - value: "400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.7 'Inter'", + value: "400 1.125rem/1.7 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2742,7 +2778,7 @@ export const typography = [ path: ['typography', 'paragraph', 'long', 'large'], }, { - value: "400 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.7 'Inter'", + value: "400 1rem/1.7 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2760,7 +2796,7 @@ export const typography = [ path: ['typography', 'paragraph', 'long', 'medium'], }, { - value: "400 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.7 'Inter'", + value: "400 0.875rem/1.7 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2778,7 +2814,7 @@ export const typography = [ path: ['typography', 'paragraph', 'long', 'small'], }, { - value: "400 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.7 'Inter'", + value: "400 0.8125rem/1.7 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2796,7 +2832,7 @@ export const typography = [ path: ['typography', 'paragraph', 'long', 'xsmall'], }, { - value: "500 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.3 'Inter'", + value: "500 1.3125rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2805,7 +2841,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f1}', + fontSize: '{font-size.f2}', }, type: 'typography', }, @@ -2814,7 +2850,7 @@ export const typography = [ path: ['typography', 'label', 'large'], }, { - value: "500 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.3 'Inter'", + value: "500 1.125rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2823,7 +2859,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f0}', + fontSize: '{font-size.f1}', }, type: 'typography', }, @@ -2832,7 +2868,7 @@ export const typography = [ path: ['typography', 'label', 'medium'], }, { - value: "500 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.3 'Inter'", + value: "500 1rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2841,7 +2877,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f-1}', + fontSize: '{font-size.f0}', }, type: 'typography', }, @@ -2850,7 +2886,7 @@ export const typography = [ path: ['typography', 'label', 'small'], }, { - value: "500 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.3 'Inter'", + value: "500 0.875rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2859,7 +2895,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f-2}', + fontSize: '{font-size.f-1}', }, type: 'typography', }, @@ -2868,7 +2904,7 @@ export const typography = [ path: ['typography', 'label', 'xsmall'], }, { - value: "400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.3 'Inter'", + value: "400 1.3125rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2877,7 +2913,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f1}', + fontSize: '{font-size.f2}', }, type: 'typography', }, @@ -2886,7 +2922,7 @@ export const typography = [ path: ['typography', 'error_message', 'large'], }, { - value: "400 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.3 'Inter'", + value: "400 1.125rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2895,7 +2931,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f0}', + fontSize: '{font-size.f1}', }, type: 'typography', }, @@ -2904,7 +2940,7 @@ export const typography = [ path: ['typography', 'error_message', 'medium'], }, { - value: "400 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.3 'Inter'", + value: "400 1rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2913,7 +2949,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f-1}', + fontSize: '{font-size.f0}', }, type: 'typography', }, @@ -2922,7 +2958,7 @@ export const typography = [ path: ['typography', 'error_message', 'small'], }, { - value: "400 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.3 'Inter'", + value: "400 0.875rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2931,7 +2967,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f-2}', + fontSize: '{font-size.f-1}', }, type: 'typography', }, @@ -3133,240 +3169,260 @@ export const borderRadius = [ export const spacing = [ { - value: 'calc(0)', + value: '0rem', type: 'spacing', - description: '0', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '0', + value: '{base_sizing}*0', type: 'spacing', - description: '0', }, name: '--fds-spacing-0', attributes: {}, path: ['spacing', '0'], }, { - value: 'calc(4/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '0.25rem', type: 'spacing', - description: '4px - 4.5px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_spacing}/16*{font-size.f0}', + value: '{base_sizing}*1', type: 'spacing', - description: '4px - 4.5px', }, name: '--fds-spacing-1', attributes: {}, path: ['spacing', '1'], }, { - value: 'calc(4*2/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '0.5rem', type: 'spacing', - description: '8px - 9px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_spacing}*2/16*{font-size.f0}', + value: '{base_sizing}*2', type: 'spacing', - description: '8px - 9px', }, name: '--fds-spacing-2', attributes: {}, path: ['spacing', '2'], }, { - value: 'calc(4*3/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '0.75rem', type: 'spacing', - description: '12px - 13.5px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_spacing}*3/16*{font-size.f0}', + value: '{base_sizing}*3', type: 'spacing', - description: '12px - 13.5px', }, name: '--fds-spacing-3', attributes: {}, path: ['spacing', '3'], }, { - value: 'calc(4*4/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '1rem', type: 'spacing', - description: '16px - 18px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_spacing}*4/16*{font-size.f0}', + value: '{base_sizing}*4', type: 'spacing', - description: '16px - 18px', }, name: '--fds-spacing-4', attributes: {}, path: ['spacing', '4'], }, { - value: 'calc(4*5/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '1.25rem', type: 'spacing', - description: '20px - 22.5px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_spacing}*5/16*{font-size.f0}', + value: '{base_sizing}*5', type: 'spacing', - description: '20px - 22.5px', }, name: '--fds-spacing-5', attributes: {}, path: ['spacing', '5'], }, { - value: 'calc(4*6/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '1.5rem', type: 'spacing', - description: '24px - 27px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_spacing}*6/16*{font-size.f0}', + value: '{base_sizing}*6', type: 'spacing', - description: '24px - 27px', }, name: '--fds-spacing-6', attributes: {}, path: ['spacing', '6'], }, { - value: 'calc(4*7/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '1.75rem', type: 'spacing', - description: '28px - 31.5px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_spacing}*7/16*{font-size.f0}', + value: '{base_sizing}*7', type: 'spacing', - description: '28px - 31.5px', }, name: '--fds-spacing-7', attributes: {}, path: ['spacing', '7'], }, { - value: 'calc((4*8/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '2rem', type: 'spacing', - description: '32px - 36px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_spacing}*8/16)*{font-size.f0}', + value: '{base_sizing}*8', type: 'spacing', - description: '32px - 36px', }, name: '--fds-spacing-8', attributes: {}, path: ['spacing', '8'], }, { - value: 'calc((4*10/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '2.25rem', + type: 'spacing', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: '{base_sizing}*9', + type: 'spacing', + }, + name: '--fds-spacing-9', + attributes: {}, + path: ['spacing', '9'], + }, + { + value: '2.5rem', type: 'spacing', - description: '40px - 45px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_spacing}*10/16)*{font-size.f0}', + value: '{base_sizing}*10', type: 'spacing', - description: '40px - 45px', }, name: '--fds-spacing-10', attributes: {}, path: ['spacing', '10'], }, { - value: 'calc((4*12/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '2.75rem', + type: 'spacing', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: '{base_sizing}*11', + type: 'spacing', + }, + name: '--fds-spacing-11', + attributes: {}, + path: ['spacing', '11'], + }, + { + value: '3rem', type: 'spacing', - description: '48px - 54px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_spacing}*12/16)*{font-size.f0}', + value: '{base_sizing}*12', type: 'spacing', - description: '48px - 54px', }, name: '--fds-spacing-12', attributes: {}, path: ['spacing', '12'], }, { - value: 'calc((4*14/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '3.25rem', + type: 'spacing', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: '{base_sizing}*13', + type: 'spacing', + }, + name: '--fds-spacing-13', + attributes: {}, + path: ['spacing', '13'], + }, + { + value: '3.5rem', type: 'spacing', - description: '56px - 63px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_spacing}*14/16)*{font-size.f0}', + value: '{base_sizing}*14', type: 'spacing', - description: '56px - 63px', }, name: '--fds-spacing-14', attributes: {}, path: ['spacing', '14'], }, { - value: 'calc((4*18/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '3.75rem', type: 'spacing', - description: '72px - 81px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_spacing}*18/16)*{font-size.f0}', + value: '{base_sizing}*15', + type: 'spacing', + }, + name: '--fds-spacing-15', + attributes: {}, + path: ['spacing', '15'], + }, + { + value: '4.5rem', + type: 'spacing', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: '{base_sizing}*18', type: 'spacing', - description: '72px - 81px', }, name: '--fds-spacing-18', attributes: {}, path: ['spacing', '18'], }, { - value: 'calc((4*22/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '5.5rem', type: 'spacing', - description: '88px - 99px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_spacing}*22/16)*{font-size.f0}', + value: '{base_sizing}*22', type: 'spacing', - description: '88px - 99px', }, name: '--fds-spacing-22', attributes: {}, path: ['spacing', '22'], }, { - value: 'calc((4*26/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '6.5rem', type: 'spacing', - description: '104px - 117px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_spacing}*26/16)*{font-size.f0}', + value: '{base_sizing}*26', type: 'spacing', - description: '104px - 117px', }, name: '--fds-spacing-26', attributes: {}, path: ['spacing', '26'], }, { - value: 'calc((4*30/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '7.5rem', type: 'spacing', - description: '120px - 135px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_spacing}*30/16)*{font-size.f0}', + value: '{base_sizing}*30', type: 'spacing', - description: '120px - 135px', }, name: '--fds-spacing-30', attributes: {}, @@ -3376,225 +3432,260 @@ export const spacing = [ export const sizing = [ { - value: 'calc(4/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '0rem', + type: 'sizing', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: '{base_sizing}*0', + type: 'sizing', + }, + name: '--fds-sizing-0', + attributes: {}, + path: ['sizing', '0'], + }, + { + value: '0.25rem', type: 'sizing', - description: '4px - 4.5px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_sizing}/16*{font-size.f0}', + value: '{base_sizing}*1', type: 'sizing', - description: '4px - 4.5px', }, name: '--fds-sizing-1', attributes: {}, path: ['sizing', '1'], }, { - value: 'calc(4*2/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '0.5rem', type: 'sizing', - description: '8px - 9px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_sizing}*2/16*{font-size.f0}', + value: '{base_sizing}*2', type: 'sizing', - description: '8px - 9px', }, name: '--fds-sizing-2', attributes: {}, path: ['sizing', '2'], }, { - value: 'calc(4*3/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '0.75rem', type: 'sizing', - description: '12px - 13.5px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_sizing}*3/16*{font-size.f0}', + value: '{base_sizing}*3', type: 'sizing', - description: '12px - 13.5px', }, name: '--fds-sizing-3', attributes: {}, path: ['sizing', '3'], }, { - value: 'calc(4*4/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '1rem', type: 'sizing', - description: '16px - 18px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_sizing}*4/16*{font-size.f0}', + value: '{base_sizing}*4', type: 'sizing', - description: '16px - 18px', }, name: '--fds-sizing-4', attributes: {}, path: ['sizing', '4'], }, { - value: 'calc(4*5/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '1.25rem', type: 'sizing', - description: '20px - 22.5', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_sizing}*5/16*{font-size.f0}', + value: '{base_sizing}*5', type: 'sizing', - description: '20px - 22.5', }, name: '--fds-sizing-5', attributes: {}, path: ['sizing', '5'], }, { - value: 'calc(4*6/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '1.5rem', type: 'sizing', - description: '24px - 27px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_sizing}*6/16*{font-size.f0}', + value: '{base_sizing}*6', type: 'sizing', - description: '24px - 27px', }, name: '--fds-sizing-6', attributes: {}, path: ['sizing', '6'], }, { - value: 'calc(4*7/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '1.75rem', type: 'sizing', - description: '28px - 31.5px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_sizing}*7/16*{font-size.f0}', + value: '{base_sizing}*7', type: 'sizing', - description: '28px - 31.5px', }, name: '--fds-sizing-7', attributes: {}, path: ['sizing', '7'], }, { - value: 'calc(4*8/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '2rem', type: 'sizing', - description: '32px - 36px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_sizing}*8/16*{font-size.f0}', + value: '{base_sizing}*8', type: 'sizing', - description: '32px - 36px', }, name: '--fds-sizing-8', attributes: {}, path: ['sizing', '8'], }, { - value: 'calc(4*10/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '2.25rem', + type: 'sizing', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: '{base_sizing}*9', + type: 'sizing', + }, + name: '--fds-sizing-9', + attributes: {}, + path: ['sizing', '9'], + }, + { + value: '2.5rem', type: 'sizing', - description: '40px - 45px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_sizing}*10/16*{font-size.f0}', + value: '{base_sizing}*10', type: 'sizing', - description: '40px - 45px', }, name: '--fds-sizing-10', attributes: {}, path: ['sizing', '10'], }, { - value: 'calc((4*12/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '2.75rem', type: 'sizing', - description: '48px - 54px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_sizing}*12/16)*{font-size.f0}', + value: '{base_sizing}*11', + type: 'sizing', + }, + name: '--fds-sizing-11', + attributes: {}, + path: ['sizing', '11'], + }, + { + value: '3rem', + type: 'sizing', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: '{base_sizing}*12', type: 'sizing', - description: '48px - 54px', }, name: '--fds-sizing-12', attributes: {}, path: ['sizing', '12'], }, { - value: 'calc((4*14/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '3.25rem', type: 'sizing', - description: '56px - 63px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_sizing}*14/16)*{font-size.f0}', + value: '{base_sizing}*13', + type: 'sizing', + }, + name: '--fds-sizing-13', + attributes: {}, + path: ['sizing', '13'], + }, + { + value: '3.5rem', + type: 'sizing', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: '{base_sizing}*14', type: 'sizing', - description: '56px - 63px', }, name: '--fds-sizing-14', attributes: {}, path: ['sizing', '14'], }, { - value: 'calc((4*18/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '3.75rem', + type: 'sizing', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: '{base_sizing}*15', + type: 'sizing', + }, + name: '--fds-sizing-15', + attributes: {}, + path: ['sizing', '15'], + }, + { + value: '4.5rem', type: 'sizing', - description: '72px - 81px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_sizing}*18/16)*{font-size.f0}', + value: '{base_sizing}*18', type: 'sizing', - description: '72px - 81px', }, name: '--fds-sizing-18', attributes: {}, path: ['sizing', '18'], }, { - value: 'calc((4*22/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '5.5rem', type: 'sizing', - description: '88px - 99px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_sizing}*22/16)*{font-size.f0}', + value: '{base_sizing}*22', type: 'sizing', - description: '88px - 99px', }, name: '--fds-sizing-22', attributes: {}, path: ['sizing', '22'], }, { - value: 'calc((4*26/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '6.5rem', type: 'sizing', - description: '104px - 117px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_sizing}*26/16)*{font-size.f0}', + value: '{base_sizing}*26', type: 'sizing', - description: '104px - 117px', }, name: '--fds-sizing-26', attributes: {}, path: ['sizing', '26'], }, { - value: 'calc((4*30/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '7.5rem', type: 'sizing', - description: '120px - 135px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_sizing}*30/16)*{font-size.f0}', + value: '{base_sizing}*30', type: 'sizing', - description: '120px - 135px', }, name: '--fds-sizing-30', attributes: {}, diff --git a/apps/storefront/tokens/digdir.ts b/apps/storefront/tokens/digdir.ts index ec0cfee8a2..8e05630e1c 100644 --- a/apps/storefront/tokens/digdir.ts +++ b/apps/storefront/tokens/digdir.ts @@ -2382,7 +2382,7 @@ export const color = [ export const typography = [ { - value: "500 clamp(1.94rem, calc(1.88vw + 1.56rem), 3.16rem)/1.3 'Inter'", + value: "500 3.75rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2395,30 +2395,12 @@ export const typography = [ }, type: 'typography', }, - name: '--fds-typography-heading-3xlarge', - attributes: {}, - path: ['typography', 'heading', '3xlarge'], - }, - { - value: "500 clamp(1.78rem, calc(1.44vw + 1.49rem), 2.72rem)/1.3 'Inter'", - type: 'typography', - filePath: '../../design-tokens/Base/Semantic.json', - isSource: false, - original: { - value: { - fontFamily: '{fontFamilies.inter}', - fontWeight: '{fontWeights.medium}', - lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f6}', - }, - type: 'typography', - }, name: '--fds-typography-heading-2xlarge', attributes: {}, path: ['typography', 'heading', '2xlarge'], }, { - value: "500 clamp(1.59rem, calc(1.15vw + 1.36rem), 2.34rem)/1.3 'Inter'", + value: "500 3rem/1.3 'Inter'", type: 'typography', description: 'H1', filePath: '../../design-tokens/Base/Semantic.json', @@ -2428,7 +2410,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f5}', + fontSize: '{font-size.f6}', }, type: 'typography', description: 'H1', @@ -2438,7 +2420,7 @@ export const typography = [ path: ['typography', 'heading', 'xlarge'], }, { - value: "500 clamp(1.47rem, calc(0.86vw + 1.30rem), 2.03rem)/1.3 'Inter'", + value: "500 2.25rem/1.3 'Inter'", type: 'typography', description: 'H2', filePath: '../../design-tokens/Base/Semantic.json', @@ -2448,7 +2430,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f4}', + fontSize: '{font-size.f5}', }, type: 'typography', description: 'H2', @@ -2458,7 +2440,7 @@ export const typography = [ path: ['typography', 'heading', 'large'], }, { - value: "500 clamp(1.34rem, calc(0.63vw + 1.22rem), 1.75rem)/1.3 'Inter'", + value: "500 1.875rem/1.3 'Inter'", type: 'typography', description: 'H3', filePath: '../../design-tokens/Base/Semantic.json', @@ -2468,7 +2450,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f3}', + fontSize: '{font-size.f4}', }, type: 'typography', description: 'H3', @@ -2478,7 +2460,7 @@ export const typography = [ path: ['typography', 'heading', 'medium'], }, { - value: "500 clamp(1.22rem, calc(0.43vw + 1.13rem), 1.50rem)/1.3 'Inter'", + value: "500 1.5rem/1.3 'Inter'", type: 'typography', description: 'H4', filePath: '../../design-tokens/Base/Semantic.json', @@ -2488,7 +2470,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f2}', + fontSize: '{font-size.f3}', }, type: 'typography', description: 'H4', @@ -2498,7 +2480,7 @@ export const typography = [ path: ['typography', 'heading', 'small'], }, { - value: "500 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.3 'Inter'", + value: "500 1.3125rem/1.3 'Inter'", type: 'typography', description: 'H5', filePath: '../../design-tokens/Base/Semantic.json', @@ -2508,7 +2490,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f1}', + fontSize: '{font-size.f2}', }, type: 'typography', description: 'H5', @@ -2518,7 +2500,7 @@ export const typography = [ path: ['typography', 'heading', 'xsmall'], }, { - value: "500 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.3 'Inter'", + value: "500 1.125rem/1.3 'Inter'", type: 'typography', description: 'H6', filePath: '../../design-tokens/Base/Semantic.json', @@ -2528,7 +2510,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f0}', + fontSize: '{font-size.f1}', }, type: 'typography', description: 'H6', @@ -2538,7 +2520,7 @@ export const typography = [ path: ['typography', 'heading', 'xxsmall'], }, { - value: "400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.6 'Inter'", + value: "400 1.875rem/1.6 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2547,7 +2529,25 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.600}', - fontSize: '{font-size.f1}', + fontSize: '{font-size.f4}', + }, + type: 'typography', + }, + name: '--fds-typography-ingress-large', + attributes: {}, + path: ['typography', 'ingress', 'large'], + }, + { + value: "400 1.5rem/1.6 'Inter'", + type: 'typography', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: { + fontFamily: '{fontFamilies.inter}', + fontWeight: '{fontWeights.regular}', + lineHeight: '{lineHeights.600}', + fontSize: '{font-size.f3}', }, type: 'typography', }, @@ -2556,7 +2556,7 @@ export const typography = [ path: ['typography', 'ingress', 'medium'], }, { - value: "400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.5 'Inter'", + value: "400 1.3125rem/1.6 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2564,17 +2564,53 @@ export const typography = [ value: { fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', - lineHeight: '{lineHeights.500}', + lineHeight: '{lineHeights.600}', + fontSize: '{font-size.f2}', + }, + type: 'typography', + }, + name: '--fds-typography-ingress-small', + attributes: {}, + path: ['typography', 'ingress', 'small'], + }, + { + value: "400 1.125rem/1.6 'Inter'", + type: 'typography', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: { + fontFamily: '{fontFamilies.inter}', + fontWeight: '{fontWeights.regular}', + lineHeight: '{lineHeights.600}', fontSize: '{font-size.f1}', }, type: 'typography', }, + name: '--fds-typography-ingress-xsmall', + attributes: {}, + path: ['typography', 'ingress', 'xsmall'], + }, + { + value: "400 1.3125rem/1.5 'Inter'", + type: 'typography', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: { + fontFamily: '{fontFamilies.inter}', + fontWeight: '{fontWeights.regular}', + lineHeight: '{lineHeights.500}', + fontSize: '{font-size.f2}', + }, + type: 'typography', + }, name: '--fds-typography-paragraph-large', attributes: {}, path: ['typography', 'paragraph', 'large'], }, { - value: "400 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.5 'Inter'", + value: "400 1.125rem/1.5 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2583,7 +2619,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.500}', - fontSize: '{font-size.f0}', + fontSize: '{font-size.f1}', }, type: 'typography', }, @@ -2592,7 +2628,7 @@ export const typography = [ path: ['typography', 'paragraph', 'medium'], }, { - value: "400 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.5 'Inter'", + value: "400 1rem/1.5 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2601,7 +2637,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.500}', - fontSize: '{font-size.f-1}', + fontSize: '{font-size.f0}', }, type: 'typography', }, @@ -2610,7 +2646,7 @@ export const typography = [ path: ['typography', 'paragraph', 'small'], }, { - value: "400 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.5 'Inter'", + value: "400 0.875rem/1.5 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2619,7 +2655,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.500}', - fontSize: '{font-size.f-2}', + fontSize: '{font-size.f-1}', }, type: 'typography', }, @@ -2628,7 +2664,7 @@ export const typography = [ path: ['typography', 'paragraph', 'xsmall'], }, { - value: "400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.3 'Inter'", + value: "400 1.3125rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2637,7 +2673,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f1}', + fontSize: '{font-size.f2}', }, type: 'typography', }, @@ -2646,7 +2682,7 @@ export const typography = [ path: ['typography', 'paragraph', 'short', 'large'], }, { - value: "400 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.3 'Inter'", + value: "400 1.125rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2655,7 +2691,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f0}', + fontSize: '{font-size.f1}', }, type: 'typography', }, @@ -2664,7 +2700,7 @@ export const typography = [ path: ['typography', 'paragraph', 'short', 'medium'], }, { - value: "400 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.3 'Inter'", + value: "400 1rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2673,7 +2709,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f-1}', + fontSize: '{font-size.f0}', }, type: 'typography', }, @@ -2682,7 +2718,7 @@ export const typography = [ path: ['typography', 'paragraph', 'short', 'small'], }, { - value: "400 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.3 'Inter'", + value: "400 0.875rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2691,7 +2727,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f-2}', + fontSize: '{font-size.f-1}', }, type: 'typography', }, @@ -2700,7 +2736,7 @@ export const typography = [ path: ['typography', 'paragraph', 'short', 'xsmall'], }, { - value: "400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.7 'Inter'", + value: "400 1.125rem/1.7 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2718,7 +2754,7 @@ export const typography = [ path: ['typography', 'paragraph', 'long', 'large'], }, { - value: "400 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.7 'Inter'", + value: "400 1rem/1.7 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2736,7 +2772,7 @@ export const typography = [ path: ['typography', 'paragraph', 'long', 'medium'], }, { - value: "400 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.7 'Inter'", + value: "400 0.875rem/1.7 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2754,7 +2790,7 @@ export const typography = [ path: ['typography', 'paragraph', 'long', 'small'], }, { - value: "400 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.7 'Inter'", + value: "400 0.8125rem/1.7 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2772,7 +2808,7 @@ export const typography = [ path: ['typography', 'paragraph', 'long', 'xsmall'], }, { - value: "500 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.3 'Inter'", + value: "500 1.3125rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2781,7 +2817,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f1}', + fontSize: '{font-size.f2}', }, type: 'typography', }, @@ -2790,7 +2826,7 @@ export const typography = [ path: ['typography', 'label', 'large'], }, { - value: "500 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.3 'Inter'", + value: "500 1.125rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2799,7 +2835,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f0}', + fontSize: '{font-size.f1}', }, type: 'typography', }, @@ -2808,7 +2844,7 @@ export const typography = [ path: ['typography', 'label', 'medium'], }, { - value: "500 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.3 'Inter'", + value: "500 1rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2817,7 +2853,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f-1}', + fontSize: '{font-size.f0}', }, type: 'typography', }, @@ -2826,7 +2862,7 @@ export const typography = [ path: ['typography', 'label', 'small'], }, { - value: "500 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.3 'Inter'", + value: "500 0.875rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2835,7 +2871,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f-2}', + fontSize: '{font-size.f-1}', }, type: 'typography', }, @@ -2844,7 +2880,7 @@ export const typography = [ path: ['typography', 'label', 'xsmall'], }, { - value: "400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.3 'Inter'", + value: "400 1.3125rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2853,7 +2889,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f1}', + fontSize: '{font-size.f2}', }, type: 'typography', }, @@ -2862,7 +2898,7 @@ export const typography = [ path: ['typography', 'error_message', 'large'], }, { - value: "400 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.3 'Inter'", + value: "400 1.125rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2871,7 +2907,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f0}', + fontSize: '{font-size.f1}', }, type: 'typography', }, @@ -2880,7 +2916,7 @@ export const typography = [ path: ['typography', 'error_message', 'medium'], }, { - value: "400 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.3 'Inter'", + value: "400 1rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2889,7 +2925,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f-1}', + fontSize: '{font-size.f0}', }, type: 'typography', }, @@ -2898,7 +2934,7 @@ export const typography = [ path: ['typography', 'error_message', 'small'], }, { - value: "400 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.3 'Inter'", + value: "400 0.875rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2907,7 +2943,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f-2}', + fontSize: '{font-size.f-1}', }, type: 'typography', }, @@ -3109,240 +3145,260 @@ export const borderRadius = [ export const spacing = [ { - value: 'calc(0)', + value: '0rem', type: 'spacing', - description: '0', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '0', + value: '{base_sizing}*0', type: 'spacing', - description: '0', }, name: '--fds-spacing-0', attributes: {}, path: ['spacing', '0'], }, { - value: 'calc(4/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '0.25rem', type: 'spacing', - description: '4px - 4.5px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_spacing}/16*{font-size.f0}', + value: '{base_sizing}*1', type: 'spacing', - description: '4px - 4.5px', }, name: '--fds-spacing-1', attributes: {}, path: ['spacing', '1'], }, { - value: 'calc(4*2/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '0.5rem', type: 'spacing', - description: '8px - 9px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_spacing}*2/16*{font-size.f0}', + value: '{base_sizing}*2', type: 'spacing', - description: '8px - 9px', }, name: '--fds-spacing-2', attributes: {}, path: ['spacing', '2'], }, { - value: 'calc(4*3/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '0.75rem', type: 'spacing', - description: '12px - 13.5px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_spacing}*3/16*{font-size.f0}', + value: '{base_sizing}*3', type: 'spacing', - description: '12px - 13.5px', }, name: '--fds-spacing-3', attributes: {}, path: ['spacing', '3'], }, { - value: 'calc(4*4/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '1rem', type: 'spacing', - description: '16px - 18px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_spacing}*4/16*{font-size.f0}', + value: '{base_sizing}*4', type: 'spacing', - description: '16px - 18px', }, name: '--fds-spacing-4', attributes: {}, path: ['spacing', '4'], }, { - value: 'calc(4*5/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '1.25rem', type: 'spacing', - description: '20px - 22.5px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_spacing}*5/16*{font-size.f0}', + value: '{base_sizing}*5', type: 'spacing', - description: '20px - 22.5px', }, name: '--fds-spacing-5', attributes: {}, path: ['spacing', '5'], }, { - value: 'calc(4*6/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '1.5rem', type: 'spacing', - description: '24px - 27px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_spacing}*6/16*{font-size.f0}', + value: '{base_sizing}*6', type: 'spacing', - description: '24px - 27px', }, name: '--fds-spacing-6', attributes: {}, path: ['spacing', '6'], }, { - value: 'calc(4*7/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '1.75rem', type: 'spacing', - description: '28px - 31.5px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_spacing}*7/16*{font-size.f0}', + value: '{base_sizing}*7', type: 'spacing', - description: '28px - 31.5px', }, name: '--fds-spacing-7', attributes: {}, path: ['spacing', '7'], }, { - value: 'calc((4*8/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '2rem', type: 'spacing', - description: '32px - 36px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_spacing}*8/16)*{font-size.f0}', + value: '{base_sizing}*8', type: 'spacing', - description: '32px - 36px', }, name: '--fds-spacing-8', attributes: {}, path: ['spacing', '8'], }, { - value: 'calc((4*10/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '2.25rem', + type: 'spacing', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: '{base_sizing}*9', + type: 'spacing', + }, + name: '--fds-spacing-9', + attributes: {}, + path: ['spacing', '9'], + }, + { + value: '2.5rem', type: 'spacing', - description: '40px - 45px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_spacing}*10/16)*{font-size.f0}', + value: '{base_sizing}*10', type: 'spacing', - description: '40px - 45px', }, name: '--fds-spacing-10', attributes: {}, path: ['spacing', '10'], }, { - value: 'calc((4*12/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '2.75rem', + type: 'spacing', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: '{base_sizing}*11', + type: 'spacing', + }, + name: '--fds-spacing-11', + attributes: {}, + path: ['spacing', '11'], + }, + { + value: '3rem', type: 'spacing', - description: '48px - 54px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_spacing}*12/16)*{font-size.f0}', + value: '{base_sizing}*12', type: 'spacing', - description: '48px - 54px', }, name: '--fds-spacing-12', attributes: {}, path: ['spacing', '12'], }, { - value: 'calc((4*14/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '3.25rem', + type: 'spacing', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: '{base_sizing}*13', + type: 'spacing', + }, + name: '--fds-spacing-13', + attributes: {}, + path: ['spacing', '13'], + }, + { + value: '3.5rem', type: 'spacing', - description: '56px - 63px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_spacing}*14/16)*{font-size.f0}', + value: '{base_sizing}*14', type: 'spacing', - description: '56px - 63px', }, name: '--fds-spacing-14', attributes: {}, path: ['spacing', '14'], }, { - value: 'calc((4*18/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '3.75rem', type: 'spacing', - description: '72px - 81px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_spacing}*18/16)*{font-size.f0}', + value: '{base_sizing}*15', + type: 'spacing', + }, + name: '--fds-spacing-15', + attributes: {}, + path: ['spacing', '15'], + }, + { + value: '4.5rem', + type: 'spacing', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: '{base_sizing}*18', type: 'spacing', - description: '72px - 81px', }, name: '--fds-spacing-18', attributes: {}, path: ['spacing', '18'], }, { - value: 'calc((4*22/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '5.5rem', type: 'spacing', - description: '88px - 99px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_spacing}*22/16)*{font-size.f0}', + value: '{base_sizing}*22', type: 'spacing', - description: '88px - 99px', }, name: '--fds-spacing-22', attributes: {}, path: ['spacing', '22'], }, { - value: 'calc((4*26/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '6.5rem', type: 'spacing', - description: '104px - 117px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_spacing}*26/16)*{font-size.f0}', + value: '{base_sizing}*26', type: 'spacing', - description: '104px - 117px', }, name: '--fds-spacing-26', attributes: {}, path: ['spacing', '26'], }, { - value: 'calc((4*30/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '7.5rem', type: 'spacing', - description: '120px - 135px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_spacing}*30/16)*{font-size.f0}', + value: '{base_sizing}*30', type: 'spacing', - description: '120px - 135px', }, name: '--fds-spacing-30', attributes: {}, @@ -3352,225 +3408,260 @@ export const spacing = [ export const sizing = [ { - value: 'calc(4/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '0rem', + type: 'sizing', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: '{base_sizing}*0', + type: 'sizing', + }, + name: '--fds-sizing-0', + attributes: {}, + path: ['sizing', '0'], + }, + { + value: '0.25rem', type: 'sizing', - description: '4px - 4.5px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_sizing}/16*{font-size.f0}', + value: '{base_sizing}*1', type: 'sizing', - description: '4px - 4.5px', }, name: '--fds-sizing-1', attributes: {}, path: ['sizing', '1'], }, { - value: 'calc(4*2/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '0.5rem', type: 'sizing', - description: '8px - 9px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_sizing}*2/16*{font-size.f0}', + value: '{base_sizing}*2', type: 'sizing', - description: '8px - 9px', }, name: '--fds-sizing-2', attributes: {}, path: ['sizing', '2'], }, { - value: 'calc(4*3/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '0.75rem', type: 'sizing', - description: '12px - 13.5px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_sizing}*3/16*{font-size.f0}', + value: '{base_sizing}*3', type: 'sizing', - description: '12px - 13.5px', }, name: '--fds-sizing-3', attributes: {}, path: ['sizing', '3'], }, { - value: 'calc(4*4/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '1rem', type: 'sizing', - description: '16px - 18px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_sizing}*4/16*{font-size.f0}', + value: '{base_sizing}*4', type: 'sizing', - description: '16px - 18px', }, name: '--fds-sizing-4', attributes: {}, path: ['sizing', '4'], }, { - value: 'calc(4*5/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '1.25rem', type: 'sizing', - description: '20px - 22.5', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_sizing}*5/16*{font-size.f0}', + value: '{base_sizing}*5', type: 'sizing', - description: '20px - 22.5', }, name: '--fds-sizing-5', attributes: {}, path: ['sizing', '5'], }, { - value: 'calc(4*6/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '1.5rem', type: 'sizing', - description: '24px - 27px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_sizing}*6/16*{font-size.f0}', + value: '{base_sizing}*6', type: 'sizing', - description: '24px - 27px', }, name: '--fds-sizing-6', attributes: {}, path: ['sizing', '6'], }, { - value: 'calc(4*7/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '1.75rem', type: 'sizing', - description: '28px - 31.5px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_sizing}*7/16*{font-size.f0}', + value: '{base_sizing}*7', type: 'sizing', - description: '28px - 31.5px', }, name: '--fds-sizing-7', attributes: {}, path: ['sizing', '7'], }, { - value: 'calc(4*8/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '2rem', type: 'sizing', - description: '32px - 36px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_sizing}*8/16*{font-size.f0}', + value: '{base_sizing}*8', type: 'sizing', - description: '32px - 36px', }, name: '--fds-sizing-8', attributes: {}, path: ['sizing', '8'], }, { - value: 'calc(4*10/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '2.25rem', + type: 'sizing', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: '{base_sizing}*9', + type: 'sizing', + }, + name: '--fds-sizing-9', + attributes: {}, + path: ['sizing', '9'], + }, + { + value: '2.5rem', type: 'sizing', - description: '40px - 45px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_sizing}*10/16*{font-size.f0}', + value: '{base_sizing}*10', type: 'sizing', - description: '40px - 45px', }, name: '--fds-sizing-10', attributes: {}, path: ['sizing', '10'], }, { - value: 'calc((4*12/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '2.75rem', type: 'sizing', - description: '48px - 54px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_sizing}*12/16)*{font-size.f0}', + value: '{base_sizing}*11', + type: 'sizing', + }, + name: '--fds-sizing-11', + attributes: {}, + path: ['sizing', '11'], + }, + { + value: '3rem', + type: 'sizing', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: '{base_sizing}*12', type: 'sizing', - description: '48px - 54px', }, name: '--fds-sizing-12', attributes: {}, path: ['sizing', '12'], }, { - value: 'calc((4*14/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '3.25rem', type: 'sizing', - description: '56px - 63px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_sizing}*14/16)*{font-size.f0}', + value: '{base_sizing}*13', + type: 'sizing', + }, + name: '--fds-sizing-13', + attributes: {}, + path: ['sizing', '13'], + }, + { + value: '3.5rem', + type: 'sizing', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: '{base_sizing}*14', type: 'sizing', - description: '56px - 63px', }, name: '--fds-sizing-14', attributes: {}, path: ['sizing', '14'], }, { - value: 'calc((4*18/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '3.75rem', + type: 'sizing', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: '{base_sizing}*15', + type: 'sizing', + }, + name: '--fds-sizing-15', + attributes: {}, + path: ['sizing', '15'], + }, + { + value: '4.5rem', type: 'sizing', - description: '72px - 81px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_sizing}*18/16)*{font-size.f0}', + value: '{base_sizing}*18', type: 'sizing', - description: '72px - 81px', }, name: '--fds-sizing-18', attributes: {}, path: ['sizing', '18'], }, { - value: 'calc((4*22/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '5.5rem', type: 'sizing', - description: '88px - 99px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_sizing}*22/16)*{font-size.f0}', + value: '{base_sizing}*22', type: 'sizing', - description: '88px - 99px', }, name: '--fds-sizing-22', attributes: {}, path: ['sizing', '22'], }, { - value: 'calc((4*26/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '6.5rem', type: 'sizing', - description: '104px - 117px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_sizing}*26/16)*{font-size.f0}', + value: '{base_sizing}*26', type: 'sizing', - description: '104px - 117px', }, name: '--fds-sizing-26', attributes: {}, path: ['sizing', '26'], }, { - value: 'calc((4*30/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '7.5rem', type: 'sizing', - description: '120px - 135px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_sizing}*30/16)*{font-size.f0}', + value: '{base_sizing}*30', type: 'sizing', - description: '120px - 135px', }, name: '--fds-sizing-30', attributes: {}, diff --git a/apps/storefront/tokens/tilsynet.ts b/apps/storefront/tokens/tilsynet.ts index 9976073d95..28e5f1998f 100644 --- a/apps/storefront/tokens/tilsynet.ts +++ b/apps/storefront/tokens/tilsynet.ts @@ -2328,7 +2328,7 @@ export const color = [ export const typography = [ { - value: "500 clamp(1.94rem, calc(1.88vw + 1.56rem), 3.16rem)/1.3 'Inter'", + value: "500 3.75rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2341,30 +2341,12 @@ export const typography = [ }, type: 'typography', }, - name: '--fds-typography-heading-3xlarge', - attributes: {}, - path: ['typography', 'heading', '3xlarge'], - }, - { - value: "500 clamp(1.78rem, calc(1.44vw + 1.49rem), 2.72rem)/1.3 'Inter'", - type: 'typography', - filePath: '../../design-tokens/Base/Semantic.json', - isSource: false, - original: { - value: { - fontFamily: '{fontFamilies.inter}', - fontWeight: '{fontWeights.medium}', - lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f6}', - }, - type: 'typography', - }, name: '--fds-typography-heading-2xlarge', attributes: {}, path: ['typography', 'heading', '2xlarge'], }, { - value: "500 clamp(1.59rem, calc(1.15vw + 1.36rem), 2.34rem)/1.3 'Inter'", + value: "500 3rem/1.3 'Inter'", type: 'typography', description: 'H1', filePath: '../../design-tokens/Base/Semantic.json', @@ -2374,7 +2356,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f5}', + fontSize: '{font-size.f6}', }, type: 'typography', description: 'H1', @@ -2384,7 +2366,7 @@ export const typography = [ path: ['typography', 'heading', 'xlarge'], }, { - value: "500 clamp(1.47rem, calc(0.86vw + 1.30rem), 2.03rem)/1.3 'Inter'", + value: "500 2.25rem/1.3 'Inter'", type: 'typography', description: 'H2', filePath: '../../design-tokens/Base/Semantic.json', @@ -2394,7 +2376,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f4}', + fontSize: '{font-size.f5}', }, type: 'typography', description: 'H2', @@ -2404,7 +2386,7 @@ export const typography = [ path: ['typography', 'heading', 'large'], }, { - value: "500 clamp(1.34rem, calc(0.63vw + 1.22rem), 1.75rem)/1.3 'Inter'", + value: "500 1.875rem/1.3 'Inter'", type: 'typography', description: 'H3', filePath: '../../design-tokens/Base/Semantic.json', @@ -2414,7 +2396,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f3}', + fontSize: '{font-size.f4}', }, type: 'typography', description: 'H3', @@ -2424,7 +2406,7 @@ export const typography = [ path: ['typography', 'heading', 'medium'], }, { - value: "500 clamp(1.22rem, calc(0.43vw + 1.13rem), 1.50rem)/1.3 'Inter'", + value: "500 1.5rem/1.3 'Inter'", type: 'typography', description: 'H4', filePath: '../../design-tokens/Base/Semantic.json', @@ -2434,7 +2416,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f2}', + fontSize: '{font-size.f3}', }, type: 'typography', description: 'H4', @@ -2444,7 +2426,7 @@ export const typography = [ path: ['typography', 'heading', 'small'], }, { - value: "500 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.3 'Inter'", + value: "500 1.3125rem/1.3 'Inter'", type: 'typography', description: 'H5', filePath: '../../design-tokens/Base/Semantic.json', @@ -2454,7 +2436,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f1}', + fontSize: '{font-size.f2}', }, type: 'typography', description: 'H5', @@ -2464,7 +2446,7 @@ export const typography = [ path: ['typography', 'heading', 'xsmall'], }, { - value: "500 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.3 'Inter'", + value: "500 1.125rem/1.3 'Inter'", type: 'typography', description: 'H6', filePath: '../../design-tokens/Base/Semantic.json', @@ -2474,7 +2456,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f0}', + fontSize: '{font-size.f1}', }, type: 'typography', description: 'H6', @@ -2484,7 +2466,7 @@ export const typography = [ path: ['typography', 'heading', 'xxsmall'], }, { - value: "400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.6 'Inter'", + value: "400 1.875rem/1.6 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2493,7 +2475,25 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.600}', - fontSize: '{font-size.f1}', + fontSize: '{font-size.f4}', + }, + type: 'typography', + }, + name: '--fds-typography-ingress-large', + attributes: {}, + path: ['typography', 'ingress', 'large'], + }, + { + value: "400 1.5rem/1.6 'Inter'", + type: 'typography', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: { + fontFamily: '{fontFamilies.inter}', + fontWeight: '{fontWeights.regular}', + lineHeight: '{lineHeights.600}', + fontSize: '{font-size.f3}', }, type: 'typography', }, @@ -2502,7 +2502,7 @@ export const typography = [ path: ['typography', 'ingress', 'medium'], }, { - value: "400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.5 'Inter'", + value: "400 1.3125rem/1.6 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2510,17 +2510,53 @@ export const typography = [ value: { fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', - lineHeight: '{lineHeights.500}', + lineHeight: '{lineHeights.600}', + fontSize: '{font-size.f2}', + }, + type: 'typography', + }, + name: '--fds-typography-ingress-small', + attributes: {}, + path: ['typography', 'ingress', 'small'], + }, + { + value: "400 1.125rem/1.6 'Inter'", + type: 'typography', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: { + fontFamily: '{fontFamilies.inter}', + fontWeight: '{fontWeights.regular}', + lineHeight: '{lineHeights.600}', fontSize: '{font-size.f1}', }, type: 'typography', }, + name: '--fds-typography-ingress-xsmall', + attributes: {}, + path: ['typography', 'ingress', 'xsmall'], + }, + { + value: "400 1.3125rem/1.5 'Inter'", + type: 'typography', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: { + fontFamily: '{fontFamilies.inter}', + fontWeight: '{fontWeights.regular}', + lineHeight: '{lineHeights.500}', + fontSize: '{font-size.f2}', + }, + type: 'typography', + }, name: '--fds-typography-paragraph-large', attributes: {}, path: ['typography', 'paragraph', 'large'], }, { - value: "400 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.5 'Inter'", + value: "400 1.125rem/1.5 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2529,7 +2565,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.500}', - fontSize: '{font-size.f0}', + fontSize: '{font-size.f1}', }, type: 'typography', }, @@ -2538,7 +2574,7 @@ export const typography = [ path: ['typography', 'paragraph', 'medium'], }, { - value: "400 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.5 'Inter'", + value: "400 1rem/1.5 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2547,7 +2583,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.500}', - fontSize: '{font-size.f-1}', + fontSize: '{font-size.f0}', }, type: 'typography', }, @@ -2556,7 +2592,7 @@ export const typography = [ path: ['typography', 'paragraph', 'small'], }, { - value: "400 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.5 'Inter'", + value: "400 0.875rem/1.5 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2565,7 +2601,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.500}', - fontSize: '{font-size.f-2}', + fontSize: '{font-size.f-1}', }, type: 'typography', }, @@ -2574,7 +2610,7 @@ export const typography = [ path: ['typography', 'paragraph', 'xsmall'], }, { - value: "400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.3 'Inter'", + value: "400 1.3125rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2583,7 +2619,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f1}', + fontSize: '{font-size.f2}', }, type: 'typography', }, @@ -2592,7 +2628,7 @@ export const typography = [ path: ['typography', 'paragraph', 'short', 'large'], }, { - value: "400 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.3 'Inter'", + value: "400 1.125rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2601,7 +2637,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f0}', + fontSize: '{font-size.f1}', }, type: 'typography', }, @@ -2610,7 +2646,7 @@ export const typography = [ path: ['typography', 'paragraph', 'short', 'medium'], }, { - value: "400 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.3 'Inter'", + value: "400 1rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2619,7 +2655,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f-1}', + fontSize: '{font-size.f0}', }, type: 'typography', }, @@ -2628,7 +2664,7 @@ export const typography = [ path: ['typography', 'paragraph', 'short', 'small'], }, { - value: "400 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.3 'Inter'", + value: "400 0.875rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2637,7 +2673,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f-2}', + fontSize: '{font-size.f-1}', }, type: 'typography', }, @@ -2646,7 +2682,7 @@ export const typography = [ path: ['typography', 'paragraph', 'short', 'xsmall'], }, { - value: "400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.7 'Inter'", + value: "400 1.125rem/1.7 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2664,7 +2700,7 @@ export const typography = [ path: ['typography', 'paragraph', 'long', 'large'], }, { - value: "400 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.7 'Inter'", + value: "400 1rem/1.7 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2682,7 +2718,7 @@ export const typography = [ path: ['typography', 'paragraph', 'long', 'medium'], }, { - value: "400 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.7 'Inter'", + value: "400 0.875rem/1.7 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2700,7 +2736,7 @@ export const typography = [ path: ['typography', 'paragraph', 'long', 'small'], }, { - value: "400 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.7 'Inter'", + value: "400 0.8125rem/1.7 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2718,7 +2754,7 @@ export const typography = [ path: ['typography', 'paragraph', 'long', 'xsmall'], }, { - value: "500 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.3 'Inter'", + value: "500 1.3125rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2727,7 +2763,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f1}', + fontSize: '{font-size.f2}', }, type: 'typography', }, @@ -2736,7 +2772,7 @@ export const typography = [ path: ['typography', 'label', 'large'], }, { - value: "500 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.3 'Inter'", + value: "500 1.125rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2745,7 +2781,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f0}', + fontSize: '{font-size.f1}', }, type: 'typography', }, @@ -2754,7 +2790,7 @@ export const typography = [ path: ['typography', 'label', 'medium'], }, { - value: "500 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.3 'Inter'", + value: "500 1rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2763,7 +2799,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f-1}', + fontSize: '{font-size.f0}', }, type: 'typography', }, @@ -2772,7 +2808,7 @@ export const typography = [ path: ['typography', 'label', 'small'], }, { - value: "500 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.3 'Inter'", + value: "500 0.875rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2781,7 +2817,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.medium}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f-2}', + fontSize: '{font-size.f-1}', }, type: 'typography', }, @@ -2790,7 +2826,7 @@ export const typography = [ path: ['typography', 'label', 'xsmall'], }, { - value: "400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.3 'Inter'", + value: "400 1.3125rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2799,7 +2835,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f1}', + fontSize: '{font-size.f2}', }, type: 'typography', }, @@ -2808,7 +2844,7 @@ export const typography = [ path: ['typography', 'error_message', 'large'], }, { - value: "400 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.3 'Inter'", + value: "400 1.125rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2817,7 +2853,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f0}', + fontSize: '{font-size.f1}', }, type: 'typography', }, @@ -2826,7 +2862,7 @@ export const typography = [ path: ['typography', 'error_message', 'medium'], }, { - value: "400 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.3 'Inter'", + value: "400 1rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2835,7 +2871,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f-1}', + fontSize: '{font-size.f0}', }, type: 'typography', }, @@ -2844,7 +2880,7 @@ export const typography = [ path: ['typography', 'error_message', 'small'], }, { - value: "400 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.3 'Inter'", + value: "400 0.875rem/1.3 'Inter'", type: 'typography', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, @@ -2853,7 +2889,7 @@ export const typography = [ fontFamily: '{fontFamilies.inter}', fontWeight: '{fontWeights.regular}', lineHeight: '{lineHeights.300}', - fontSize: '{font-size.f-2}', + fontSize: '{font-size.f-1}', }, type: 'typography', }, @@ -3055,240 +3091,260 @@ export const borderRadius = [ export const spacing = [ { - value: 'calc(0)', + value: '0rem', type: 'spacing', - description: '0', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '0', + value: '{base_sizing}*0', type: 'spacing', - description: '0', }, name: '--fds-spacing-0', attributes: {}, path: ['spacing', '0'], }, { - value: 'calc(4/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '0.25rem', type: 'spacing', - description: '4px - 4.5px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_spacing}/16*{font-size.f0}', + value: '{base_sizing}*1', type: 'spacing', - description: '4px - 4.5px', }, name: '--fds-spacing-1', attributes: {}, path: ['spacing', '1'], }, { - value: 'calc(4*2/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '0.5rem', type: 'spacing', - description: '8px - 9px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_spacing}*2/16*{font-size.f0}', + value: '{base_sizing}*2', type: 'spacing', - description: '8px - 9px', }, name: '--fds-spacing-2', attributes: {}, path: ['spacing', '2'], }, { - value: 'calc(4*3/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '0.75rem', type: 'spacing', - description: '12px - 13.5px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_spacing}*3/16*{font-size.f0}', + value: '{base_sizing}*3', type: 'spacing', - description: '12px - 13.5px', }, name: '--fds-spacing-3', attributes: {}, path: ['spacing', '3'], }, { - value: 'calc(4*4/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '1rem', type: 'spacing', - description: '16px - 18px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_spacing}*4/16*{font-size.f0}', + value: '{base_sizing}*4', type: 'spacing', - description: '16px - 18px', }, name: '--fds-spacing-4', attributes: {}, path: ['spacing', '4'], }, { - value: 'calc(4*5/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '1.25rem', type: 'spacing', - description: '20px - 22.5px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_spacing}*5/16*{font-size.f0}', + value: '{base_sizing}*5', type: 'spacing', - description: '20px - 22.5px', }, name: '--fds-spacing-5', attributes: {}, path: ['spacing', '5'], }, { - value: 'calc(4*6/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '1.5rem', type: 'spacing', - description: '24px - 27px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_spacing}*6/16*{font-size.f0}', + value: '{base_sizing}*6', type: 'spacing', - description: '24px - 27px', }, name: '--fds-spacing-6', attributes: {}, path: ['spacing', '6'], }, { - value: 'calc(4*7/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '1.75rem', type: 'spacing', - description: '28px - 31.5px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_spacing}*7/16*{font-size.f0}', + value: '{base_sizing}*7', type: 'spacing', - description: '28px - 31.5px', }, name: '--fds-spacing-7', attributes: {}, path: ['spacing', '7'], }, { - value: 'calc((4*8/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '2rem', type: 'spacing', - description: '32px - 36px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_spacing}*8/16)*{font-size.f0}', + value: '{base_sizing}*8', type: 'spacing', - description: '32px - 36px', }, name: '--fds-spacing-8', attributes: {}, path: ['spacing', '8'], }, { - value: 'calc((4*10/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '2.25rem', + type: 'spacing', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: '{base_sizing}*9', + type: 'spacing', + }, + name: '--fds-spacing-9', + attributes: {}, + path: ['spacing', '9'], + }, + { + value: '2.5rem', type: 'spacing', - description: '40px - 45px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_spacing}*10/16)*{font-size.f0}', + value: '{base_sizing}*10', type: 'spacing', - description: '40px - 45px', }, name: '--fds-spacing-10', attributes: {}, path: ['spacing', '10'], }, { - value: 'calc((4*12/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '2.75rem', + type: 'spacing', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: '{base_sizing}*11', + type: 'spacing', + }, + name: '--fds-spacing-11', + attributes: {}, + path: ['spacing', '11'], + }, + { + value: '3rem', type: 'spacing', - description: '48px - 54px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_spacing}*12/16)*{font-size.f0}', + value: '{base_sizing}*12', type: 'spacing', - description: '48px - 54px', }, name: '--fds-spacing-12', attributes: {}, path: ['spacing', '12'], }, { - value: 'calc((4*14/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '3.25rem', + type: 'spacing', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: '{base_sizing}*13', + type: 'spacing', + }, + name: '--fds-spacing-13', + attributes: {}, + path: ['spacing', '13'], + }, + { + value: '3.5rem', type: 'spacing', - description: '56px - 63px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_spacing}*14/16)*{font-size.f0}', + value: '{base_sizing}*14', type: 'spacing', - description: '56px - 63px', }, name: '--fds-spacing-14', attributes: {}, path: ['spacing', '14'], }, { - value: 'calc((4*18/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '3.75rem', type: 'spacing', - description: '72px - 81px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_spacing}*18/16)*{font-size.f0}', + value: '{base_sizing}*15', + type: 'spacing', + }, + name: '--fds-spacing-15', + attributes: {}, + path: ['spacing', '15'], + }, + { + value: '4.5rem', + type: 'spacing', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: '{base_sizing}*18', type: 'spacing', - description: '72px - 81px', }, name: '--fds-spacing-18', attributes: {}, path: ['spacing', '18'], }, { - value: 'calc((4*22/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '5.5rem', type: 'spacing', - description: '88px - 99px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_spacing}*22/16)*{font-size.f0}', + value: '{base_sizing}*22', type: 'spacing', - description: '88px - 99px', }, name: '--fds-spacing-22', attributes: {}, path: ['spacing', '22'], }, { - value: 'calc((4*26/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '6.5rem', type: 'spacing', - description: '104px - 117px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_spacing}*26/16)*{font-size.f0}', + value: '{base_sizing}*26', type: 'spacing', - description: '104px - 117px', }, name: '--fds-spacing-26', attributes: {}, path: ['spacing', '26'], }, { - value: 'calc((4*30/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '7.5rem', type: 'spacing', - description: '120px - 135px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_spacing}*30/16)*{font-size.f0}', + value: '{base_sizing}*30', type: 'spacing', - description: '120px - 135px', }, name: '--fds-spacing-30', attributes: {}, @@ -3298,225 +3354,260 @@ export const spacing = [ export const sizing = [ { - value: 'calc(4/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '0rem', + type: 'sizing', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: '{base_sizing}*0', + type: 'sizing', + }, + name: '--fds-sizing-0', + attributes: {}, + path: ['sizing', '0'], + }, + { + value: '0.25rem', type: 'sizing', - description: '4px - 4.5px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_sizing}/16*{font-size.f0}', + value: '{base_sizing}*1', type: 'sizing', - description: '4px - 4.5px', }, name: '--fds-sizing-1', attributes: {}, path: ['sizing', '1'], }, { - value: 'calc(4*2/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '0.5rem', type: 'sizing', - description: '8px - 9px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_sizing}*2/16*{font-size.f0}', + value: '{base_sizing}*2', type: 'sizing', - description: '8px - 9px', }, name: '--fds-sizing-2', attributes: {}, path: ['sizing', '2'], }, { - value: 'calc(4*3/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '0.75rem', type: 'sizing', - description: '12px - 13.5px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_sizing}*3/16*{font-size.f0}', + value: '{base_sizing}*3', type: 'sizing', - description: '12px - 13.5px', }, name: '--fds-sizing-3', attributes: {}, path: ['sizing', '3'], }, { - value: 'calc(4*4/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '1rem', type: 'sizing', - description: '16px - 18px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_sizing}*4/16*{font-size.f0}', + value: '{base_sizing}*4', type: 'sizing', - description: '16px - 18px', }, name: '--fds-sizing-4', attributes: {}, path: ['sizing', '4'], }, { - value: 'calc(4*5/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '1.25rem', type: 'sizing', - description: '20px - 22.5', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_sizing}*5/16*{font-size.f0}', + value: '{base_sizing}*5', type: 'sizing', - description: '20px - 22.5', }, name: '--fds-sizing-5', attributes: {}, path: ['sizing', '5'], }, { - value: 'calc(4*6/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '1.5rem', type: 'sizing', - description: '24px - 27px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_sizing}*6/16*{font-size.f0}', + value: '{base_sizing}*6', type: 'sizing', - description: '24px - 27px', }, name: '--fds-sizing-6', attributes: {}, path: ['sizing', '6'], }, { - value: 'calc(4*7/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '1.75rem', type: 'sizing', - description: '28px - 31.5px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_sizing}*7/16*{font-size.f0}', + value: '{base_sizing}*7', type: 'sizing', - description: '28px - 31.5px', }, name: '--fds-sizing-7', attributes: {}, path: ['sizing', '7'], }, { - value: 'calc(4*8/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '2rem', type: 'sizing', - description: '32px - 36px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_sizing}*8/16*{font-size.f0}', + value: '{base_sizing}*8', type: 'sizing', - description: '32px - 36px', }, name: '--fds-sizing-8', attributes: {}, path: ['sizing', '8'], }, { - value: 'calc(4*10/16*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '2.25rem', + type: 'sizing', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: '{base_sizing}*9', + type: 'sizing', + }, + name: '--fds-sizing-9', + attributes: {}, + path: ['sizing', '9'], + }, + { + value: '2.5rem', type: 'sizing', - description: '40px - 45px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '{base_sizing}*10/16*{font-size.f0}', + value: '{base_sizing}*10', type: 'sizing', - description: '40px - 45px', }, name: '--fds-sizing-10', attributes: {}, path: ['sizing', '10'], }, { - value: 'calc((4*12/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '2.75rem', type: 'sizing', - description: '48px - 54px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_sizing}*12/16)*{font-size.f0}', + value: '{base_sizing}*11', + type: 'sizing', + }, + name: '--fds-sizing-11', + attributes: {}, + path: ['sizing', '11'], + }, + { + value: '3rem', + type: 'sizing', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: '{base_sizing}*12', type: 'sizing', - description: '48px - 54px', }, name: '--fds-sizing-12', attributes: {}, path: ['sizing', '12'], }, { - value: 'calc((4*14/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '3.25rem', type: 'sizing', - description: '56px - 63px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_sizing}*14/16)*{font-size.f0}', + value: '{base_sizing}*13', + type: 'sizing', + }, + name: '--fds-sizing-13', + attributes: {}, + path: ['sizing', '13'], + }, + { + value: '3.5rem', + type: 'sizing', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: '{base_sizing}*14', type: 'sizing', - description: '56px - 63px', }, name: '--fds-sizing-14', attributes: {}, path: ['sizing', '14'], }, { - value: 'calc((4*18/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '3.75rem', + type: 'sizing', + filePath: '../../design-tokens/Base/Semantic.json', + isSource: false, + original: { + value: '{base_sizing}*15', + type: 'sizing', + }, + name: '--fds-sizing-15', + attributes: {}, + path: ['sizing', '15'], + }, + { + value: '4.5rem', type: 'sizing', - description: '72px - 81px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_sizing}*18/16)*{font-size.f0}', + value: '{base_sizing}*18', type: 'sizing', - description: '72px - 81px', }, name: '--fds-sizing-18', attributes: {}, path: ['sizing', '18'], }, { - value: 'calc((4*22/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '5.5rem', type: 'sizing', - description: '88px - 99px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_sizing}*22/16)*{font-size.f0}', + value: '{base_sizing}*22', type: 'sizing', - description: '88px - 99px', }, name: '--fds-sizing-22', attributes: {}, path: ['sizing', '22'], }, { - value: 'calc((4*26/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '6.5rem', type: 'sizing', - description: '104px - 117px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_sizing}*26/16)*{font-size.f0}', + value: '{base_sizing}*26', type: 'sizing', - description: '104px - 117px', }, name: '--fds-sizing-26', attributes: {}, path: ['sizing', '26'], }, { - value: 'calc((4*30/16)*clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem))', + value: '7.5rem', type: 'sizing', - description: '120px - 135px', filePath: '../../design-tokens/Base/Semantic.json', isSource: false, original: { - value: '({base_sizing}*30/16)*{font-size.f0}', + value: '{base_sizing}*30', type: 'sizing', - description: '120px - 135px', }, name: '--fds-sizing-30', attributes: {}, diff --git a/design-tokens/$metadata.json b/design-tokens/$metadata.json index a7af6cb206..323181d60e 100644 --- a/design-tokens/$metadata.json +++ b/design-tokens/$metadata.json @@ -2,6 +2,7 @@ "tokenSetOrder": [ "Base/Core", "Base/Semantic", + "Base/Fluid", "Brand/Digdir", "Brand/Tilsynet", "Brand/Altinn", diff --git a/design-tokens/Base/Core.json b/design-tokens/Base/Core.json index 3e806ffb04..9ddd62a636 100644 --- a/design-tokens/Base/Core.json +++ b/design-tokens/Base/Core.json @@ -502,338 +502,50 @@ "type": "boxShadow" } }, - "font-scale": { - "const": { - "min": { - "f0": { - "value": "16", - "type": "fontSizes" - }, - "r": { - "value": "1.77", - "type": "fontSizes" - }, - "n": { - "value": "6", - "type": "fontSizes" - } - }, - "max": { - "f0": { - "value": "18", - "type": "fontSizes" - }, - "r": { - "value": "2.414", - "type": "fontSizes" - }, - "n": { - "value": "6", - "type": "fontSizes" - } - } - }, - "f-3": { - "min": { - "value": "5*roundTo(({font-scale.const.min.f0}*{font-scale.const.min.r}^(-3/{font-scale.const.min.n})/5),1)", - "type": "fontSizes" - }, - "max": { - "value": "5*roundTo(({font-scale.const.max.f0}*{font-scale.const.max.r}^(-3/{font-scale.const.max.n})/5),1)", - "type": "fontSizes" - }, - "v": { - "value": "100 * ({font-scale.f-3.max}-{font-scale.f-3.min}) / ({viewport.max}-{viewport.min})", - "type": "fontSizes" - }, - "r": { - "value": "( {viewport.min} * {font-scale.f-3.max} - {viewport.max} * {font-scale.f-3.min}) / ({viewport.min}-{viewport.max})", - "type": "fontSizes" - }, - "fluid": { - "value": "round(({viewport.width}/100) * {font-scale.f-3.v} + {font-scale.f-3.r})", - "type": "fontSizes" - } - }, - "f-2": { - "min": { - "value": "5*roundTo(({font-scale.const.min.f0}*{font-scale.const.min.r}^(-2/{font-scale.const.min.n})/5),1)", - "type": "fontSizes" - }, - "max": { - "value": "5*roundTo(({font-scale.const.max.f0}*{font-scale.const.max.r}^(-2/{font-scale.const.max.n})/5),1)", - "type": "fontSizes" - }, - "v": { - "value": "100 * ({font-scale.f-2.max}-{font-scale.f-2.min}) / ({viewport.max}-{viewport.min})", - "type": "fontSizes" - }, - "r": { - "value": "( {viewport.min} * {font-scale.f-2.max} - {viewport.max} * {font-scale.f-2.min}) / ({viewport.min}-{viewport.max})", - "type": "fontSizes" - }, - "fluid": { - "value": "round(({viewport.width}/100) * {font-scale.f-2.v} + {font-scale.f-2.r})", - "type": "fontSizes" - } - }, - "f-1": { - "min": { - "value": "5*roundTo(({font-scale.const.min.f0}*{font-scale.const.min.r}^(-1/{font-scale.const.min.n})/5),1)", - "type": "fontSizes" - }, - "max": { - "value": "5*roundTo(({font-scale.const.max.f0}*{font-scale.const.max.r}^(-1/{font-scale.const.max.n})/5),1)", - "type": "fontSizes" - }, - "v": { - "value": "100 * ({font-scale.f-1.max}-{font-scale.f-1.min}) / ({viewport.max}-{viewport.min})", - "type": "fontSizes" - }, - "r": { - "value": "( {viewport.min} * {font-scale.f-1.max} - {viewport.max} * {font-scale.f-1.min}) / ({viewport.min}-{viewport.max})", - "type": "fontSizes" - }, - "fluid": { - "value": "round(({viewport.width}/100) * {font-scale.f-1.v} + {font-scale.f-1.r})", - "type": "fontSizes" - } - }, - "f0": { - "min": { - "value": "5*roundTo(({font-scale.const.min.f0}*{font-scale.const.min.r}^(0/{font-scale.const.min.n})/5),1)", - "type": "fontSizes" - }, - "max": { - "value": "5*roundTo(({font-scale.const.max.f0}*{font-scale.const.max.r}^(0/{font-scale.const.max.n})/5),1)", - "type": "fontSizes" - }, - "v": { - "value": "100 * ({font-scale.f0.max}-{font-scale.f0.min}) / ({viewport.max}-{viewport.min})", - "type": "fontSizes" - }, - "r": { - "value": "( {viewport.min} * {font-scale.f0.max} - {viewport.max} * {font-scale.f0.min}) / ({viewport.min}-{viewport.max})", - "type": "fontSizes" - }, - "fluid": { - "value": "round(({viewport.width}/100) * {font-scale.f0.v} + {font-scale.f0.r})", - "type": "fontSizes" - } - }, - "f1": { - "min": { - "value": "5*roundTo(({font-scale.const.min.f0}*{font-scale.const.min.r}^(1/{font-scale.const.min.n})/5),1)", - "type": "fontSizes" - }, - "max": { - "value": "5*roundTo(({font-scale.const.max.f0}*{font-scale.const.max.r}^(1/{font-scale.const.max.n})/5),1)", - "type": "fontSizes" - }, - "v": { - "value": "100 * ({font-scale.f1.max}-{font-scale.f1.min}) / ({viewport.max}-{viewport.min})", - "type": "fontSizes" - }, - "r": { - "value": "( {viewport.min} * {font-scale.f1.max} - {viewport.max} * {font-scale.f1.min}) / ({viewport.min}-{viewport.max})", - "type": "fontSizes" - }, - "fluid": { - "value": "round(({viewport.width}/100) * {font-scale.f1.v} + {font-scale.f1.r})", - "type": "fontSizes" - } - }, - "f2": { - "min": { - "value": "5*roundTo(({font-scale.const.min.f0}*{font-scale.const.min.r}^(2/{font-scale.const.min.n})/5),1)", - "type": "fontSizes" - }, - "max": { - "value": "5*roundTo(({font-scale.const.max.f0}*{font-scale.const.max.r}^(2/{font-scale.const.max.n})/5),1)", - "type": "fontSizes" - }, - "v": { - "value": "100 * ({font-scale.f2.max}-{font-scale.f2.min}) / ({viewport.max}-{viewport.min})", - "type": "fontSizes" - }, - "r": { - "value": "( {viewport.min} * {font-scale.f2.max} - {viewport.max} * {font-scale.f2.min}) / ({viewport.min}-{viewport.max})", - "type": "fontSizes" - }, - "fluid": { - "value": "round(({viewport.width}/100) * {font-scale.f2.v} + {font-scale.f2.r})", - "type": "fontSizes" - } - }, - "f3": { - "min": { - "value": "5*roundTo(({font-scale.const.min.f0}*{font-scale.const.min.r}^(3/{font-scale.const.min.n})/5),1)", - "type": "fontSizes" - }, - "max": { - "value": "5*roundTo(({font-scale.const.max.f0}*{font-scale.const.max.r}^(3/{font-scale.const.max.n})/5),1)", - "type": "fontSizes" - }, - "v": { - "value": "100 * ({font-scale.f3.max}-{font-scale.f3.min}) / ({viewport.max}-{viewport.min})", - "type": "fontSizes" - }, - "r": { - "value": "( {viewport.min} * {font-scale.f3.max} - {viewport.max} * {font-scale.f3.min}) / ({viewport.min}-{viewport.max})", - "type": "fontSizes" - }, - "fluid": { - "value": "round(({viewport.width}/100) * {font-scale.f3.v} + {font-scale.f3.r})", - "type": "fontSizes" - } - }, - "f4": { - "min": { - "value": "5*roundTo(({font-scale.const.min.f0}*{font-scale.const.min.r}^(4/{font-scale.const.min.n})/5),1)", - "type": "fontSizes" - }, - "max": { - "value": "5*roundTo(({font-scale.const.max.f0}*{font-scale.const.max.r}^(4/{font-scale.const.max.n})/5),1)", - "type": "fontSizes" - }, - "v": { - "value": "100 * ({font-scale.f4.max}-{font-scale.f4.min}) / ({viewport.max}-{viewport.min})", - "type": "fontSizes" - }, - "r": { - "value": "( {viewport.min} * {font-scale.f4.max} - {viewport.max} * {font-scale.f4.min}) / ({viewport.min}-{viewport.max})", - "type": "fontSizes" - }, - "fluid": { - "value": "round(({viewport.width}/100) * {font-scale.f4.v} + {font-scale.f4.r})", - "type": "fontSizes" - } - }, - "f5": { - "min": { - "value": "5*roundTo(({font-scale.const.min.f0}*{font-scale.const.min.r}^(5/{font-scale.const.min.n})/5),1)", - "type": "fontSizes" - }, - "max": { - "value": "5*roundTo(({font-scale.const.max.f0}*{font-scale.const.max.r}^(5/{font-scale.const.max.n})/5),1)", - "type": "fontSizes" - }, - "v": { - "value": "100 * ({font-scale.f5.max}-{font-scale.f5.min}) / ({viewport.max}-{viewport.min})", - "type": "fontSizes" - }, - "r": { - "value": "( {viewport.min} * {font-scale.f5.max} - {viewport.max} * {font-scale.f5.min}) / ({viewport.min}-{viewport.max})", - "type": "fontSizes" - }, - "fluid": { - "value": "round(({viewport.width}/100) * {font-scale.f5.v} + {font-scale.f5.r})", - "type": "fontSizes" - } - }, - "f6": { - "min": { - "value": "5*roundTo(({font-scale.const.min.f0}*{font-scale.const.min.r}^(6/{font-scale.const.min.n})/5),1)", - "type": "fontSizes" - }, - "max": { - "value": "5*roundTo(({font-scale.const.max.f0}*{font-scale.const.max.r}^(6/{font-scale.const.max.n})/5),1)", - "type": "fontSizes" - }, - "v": { - "value": "100 * ({font-scale.f6.max}-{font-scale.f6.min}) / ({viewport.max}-{viewport.min})", - "type": "fontSizes" - }, - "r": { - "value": "( {viewport.min} * {font-scale.f6.max} - {viewport.max} * {font-scale.f6.min}) / ({viewport.min}-{viewport.max})", - "type": "fontSizes" - }, - "fluid": { - "value": "round(({viewport.width}/100) * {font-scale.f6.v} + {font-scale.f6.r})", - "type": "fontSizes" - } - }, - "f7": { - "min": { - "value": "5*roundTo(({font-scale.const.min.f0}*{font-scale.const.min.r}^(7/{font-scale.const.min.n})/5),1)", - "type": "fontSizes" - }, - "max": { - "value": "5*roundTo(({font-scale.const.max.f0}*{font-scale.const.max.r}^(7/{font-scale.const.max.n})/5),1)", - "type": "fontSizes" - }, - "v": { - "value": "100 * ({font-scale.f7.max}-{font-scale.f7.min}) / ({viewport.max}-{viewport.min})", - "type": "fontSizes" - }, - "r": { - "value": "( {viewport.min} * {font-scale.f7.max} - {viewport.max} * {font-scale.f7.min}) / ({viewport.min}-{viewport.max})", - "type": "fontSizes" - }, - "fluid": { - "value": "round(({viewport.width}/100) * {font-scale.f7.v} + {font-scale.f7.r})", - "type": "fontSizes" - } - } - }, "font-size": { "f-3": { - "value": "min( max( {font-scale.f-3.min}, {font-scale.f-3.fluid}) ,{font-scale.f-3.max})", + "value": "12", "type": "fontSizes" }, "f-2": { - "value": "min( max( {font-scale.f-2.min}, {font-scale.f-2.fluid}) ,{font-scale.f-2.max})", + "value": "13", "type": "fontSizes" }, "f-1": { - "value": "min( max( {font-scale.f-1.min}, {font-scale.f-1.fluid}) ,{font-scale.f-1.max})", + "value": "14", "type": "fontSizes" }, "f0": { - "value": "min( max( {font-scale.f0.min}, {font-scale.f0.fluid}) ,{font-scale.f0.max})", + "value": "16", "type": "fontSizes" }, "f1": { - "value": "min( max( {font-scale.f1.min}, {font-scale.f1.fluid}) ,{font-scale.f1.max})", + "value": "18", "type": "fontSizes" }, "f2": { - "value": "min( max( {font-scale.f2.min}, {font-scale.f2.fluid}) ,{font-scale.f2.max})", + "value": "21", "type": "fontSizes" }, "f3": { - "value": "min( max( {font-scale.f3.min}, {font-scale.f3.fluid}) ,{font-scale.f3.max})", + "value": "24", "type": "fontSizes" }, "f4": { - "value": "min( max( {font-scale.f4.min}, {font-scale.f4.fluid}) ,{font-scale.f4.max})", + "value": "30", "type": "fontSizes" }, "f5": { - "value": "min( max( {font-scale.f5.min}, {font-scale.f5.fluid}) ,{font-scale.f5.max})", + "value": "36", "type": "fontSizes" }, "f6": { - "value": "min( max( {font-scale.f6.min}, {font-scale.f6.fluid}) ,{font-scale.f6.max})", + "value": "48", "type": "fontSizes" }, "f7": { - "value": "min( max( {font-scale.f7.min}, {font-scale.f7.fluid}) ,{font-scale.f7.max})", + "value": "60", "type": "fontSizes" } - }, - "viewport": { - "width": { - "value": "{viewport.max}", - "type": "sizing" - }, - "min": { - "value": "320", - "type": "sizing" - }, - "max": { - "value": "1360", - "type": "sizing" - } } } \ No newline at end of file diff --git a/design-tokens/Base/Fluid.json b/design-tokens/Base/Fluid.json new file mode 100644 index 0000000000..22d7dc1ae8 --- /dev/null +++ b/design-tokens/Base/Fluid.json @@ -0,0 +1,336 @@ +{ + "font-scale": { + "const": { + "min": { + "f0": { + "value": "16", + "type": "fontSizes" + }, + "r": { + "value": "1.77", + "type": "fontSizes" + }, + "n": { + "value": "6", + "type": "fontSizes" + } + }, + "max": { + "f0": { + "value": "18", + "type": "fontSizes" + }, + "r": { + "value": "2.414", + "type": "fontSizes" + }, + "n": { + "value": "6", + "type": "fontSizes" + } + } + }, + "f-3": { + "min": { + "value": "5*roundTo(({font-scale.const.min.f0}*{font-scale.const.min.r}^(-3/{font-scale.const.min.n})/5),1)", + "type": "fontSizes" + }, + "max": { + "value": "5*roundTo(({font-scale.const.max.f0}*{font-scale.const.max.r}^(-3/{font-scale.const.max.n})/5),1)", + "type": "fontSizes" + }, + "v": { + "value": "100 * ({font-scale.f-3.max}-{font-scale.f-3.min}) / ({viewport.max}-{viewport.min})", + "type": "fontSizes" + }, + "r": { + "value": "( {viewport.min} * {font-scale.f-3.max} - {viewport.max} * {font-scale.f-3.min}) / ({viewport.min}-{viewport.max})", + "type": "fontSizes" + }, + "fluid": { + "value": "round(({viewport.width}/100) * {font-scale.f-3.v} + {font-scale.f-3.r})", + "type": "fontSizes" + } + }, + "f-2": { + "min": { + "value": "5*roundTo(({font-scale.const.min.f0}*{font-scale.const.min.r}^(-2/{font-scale.const.min.n})/5),1)", + "type": "fontSizes" + }, + "max": { + "value": "5*roundTo(({font-scale.const.max.f0}*{font-scale.const.max.r}^(-2/{font-scale.const.max.n})/5),1)", + "type": "fontSizes" + }, + "v": { + "value": "100 * ({font-scale.f-2.max}-{font-scale.f-2.min}) / ({viewport.max}-{viewport.min})", + "type": "fontSizes" + }, + "r": { + "value": "( {viewport.min} * {font-scale.f-2.max} - {viewport.max} * {font-scale.f-2.min}) / ({viewport.min}-{viewport.max})", + "type": "fontSizes" + }, + "fluid": { + "value": "round(({viewport.width}/100) * {font-scale.f-2.v} + {font-scale.f-2.r})", + "type": "fontSizes" + } + }, + "f-1": { + "min": { + "value": "5*roundTo(({font-scale.const.min.f0}*{font-scale.const.min.r}^(-1/{font-scale.const.min.n})/5),1)", + "type": "fontSizes" + }, + "max": { + "value": "5*roundTo(({font-scale.const.max.f0}*{font-scale.const.max.r}^(-1/{font-scale.const.max.n})/5),1)", + "type": "fontSizes" + }, + "v": { + "value": "100 * ({font-scale.f-1.max}-{font-scale.f-1.min}) / ({viewport.max}-{viewport.min})", + "type": "fontSizes" + }, + "r": { + "value": "( {viewport.min} * {font-scale.f-1.max} - {viewport.max} * {font-scale.f-1.min}) / ({viewport.min}-{viewport.max})", + "type": "fontSizes" + }, + "fluid": { + "value": "round(({viewport.width}/100) * {font-scale.f-1.v} + {font-scale.f-1.r})", + "type": "fontSizes" + } + }, + "f0": { + "min": { + "value": "5*roundTo(({font-scale.const.min.f0}*{font-scale.const.min.r}^(0/{font-scale.const.min.n})/5),1)", + "type": "fontSizes" + }, + "max": { + "value": "5*roundTo(({font-scale.const.max.f0}*{font-scale.const.max.r}^(0/{font-scale.const.max.n})/5),1)", + "type": "fontSizes" + }, + "v": { + "value": "100 * ({font-scale.f0.max}-{font-scale.f0.min}) / ({viewport.max}-{viewport.min})", + "type": "fontSizes" + }, + "r": { + "value": "( {viewport.min} * {font-scale.f0.max} - {viewport.max} * {font-scale.f0.min}) / ({viewport.min}-{viewport.max})", + "type": "fontSizes" + }, + "fluid": { + "value": "round(({viewport.width}/100) * {font-scale.f0.v} + {font-scale.f0.r})", + "type": "fontSizes" + } + }, + "f1": { + "min": { + "value": "5*roundTo(({font-scale.const.min.f0}*{font-scale.const.min.r}^(1/{font-scale.const.min.n})/5),1)", + "type": "fontSizes" + }, + "max": { + "value": "5*roundTo(({font-scale.const.max.f0}*{font-scale.const.max.r}^(1/{font-scale.const.max.n})/5),1)", + "type": "fontSizes" + }, + "v": { + "value": "100 * ({font-scale.f1.max}-{font-scale.f1.min}) / ({viewport.max}-{viewport.min})", + "type": "fontSizes" + }, + "r": { + "value": "( {viewport.min} * {font-scale.f1.max} - {viewport.max} * {font-scale.f1.min}) / ({viewport.min}-{viewport.max})", + "type": "fontSizes" + }, + "fluid": { + "value": "round(({viewport.width}/100) * {font-scale.f1.v} + {font-scale.f1.r})", + "type": "fontSizes" + } + }, + "f2": { + "min": { + "value": "5*roundTo(({font-scale.const.min.f0}*{font-scale.const.min.r}^(2/{font-scale.const.min.n})/5),1)", + "type": "fontSizes" + }, + "max": { + "value": "5*roundTo(({font-scale.const.max.f0}*{font-scale.const.max.r}^(2/{font-scale.const.max.n})/5),1)", + "type": "fontSizes" + }, + "v": { + "value": "100 * ({font-scale.f2.max}-{font-scale.f2.min}) / ({viewport.max}-{viewport.min})", + "type": "fontSizes" + }, + "r": { + "value": "( {viewport.min} * {font-scale.f2.max} - {viewport.max} * {font-scale.f2.min}) / ({viewport.min}-{viewport.max})", + "type": "fontSizes" + }, + "fluid": { + "value": "round(({viewport.width}/100) * {font-scale.f2.v} + {font-scale.f2.r})", + "type": "fontSizes" + } + }, + "f3": { + "min": { + "value": "5*roundTo(({font-scale.const.min.f0}*{font-scale.const.min.r}^(3/{font-scale.const.min.n})/5),1)", + "type": "fontSizes" + }, + "max": { + "value": "5*roundTo(({font-scale.const.max.f0}*{font-scale.const.max.r}^(3/{font-scale.const.max.n})/5),1)", + "type": "fontSizes" + }, + "v": { + "value": "100 * ({font-scale.f3.max}-{font-scale.f3.min}) / ({viewport.max}-{viewport.min})", + "type": "fontSizes" + }, + "r": { + "value": "( {viewport.min} * {font-scale.f3.max} - {viewport.max} * {font-scale.f3.min}) / ({viewport.min}-{viewport.max})", + "type": "fontSizes" + }, + "fluid": { + "value": "round(({viewport.width}/100) * {font-scale.f3.v} + {font-scale.f3.r})", + "type": "fontSizes" + } + }, + "f4": { + "min": { + "value": "5*roundTo(({font-scale.const.min.f0}*{font-scale.const.min.r}^(4/{font-scale.const.min.n})/5),1)", + "type": "fontSizes" + }, + "max": { + "value": "5*roundTo(({font-scale.const.max.f0}*{font-scale.const.max.r}^(4/{font-scale.const.max.n})/5),1)", + "type": "fontSizes" + }, + "v": { + "value": "100 * ({font-scale.f4.max}-{font-scale.f4.min}) / ({viewport.max}-{viewport.min})", + "type": "fontSizes" + }, + "r": { + "value": "( {viewport.min} * {font-scale.f4.max} - {viewport.max} * {font-scale.f4.min}) / ({viewport.min}-{viewport.max})", + "type": "fontSizes" + }, + "fluid": { + "value": "round(({viewport.width}/100) * {font-scale.f4.v} + {font-scale.f4.r})", + "type": "fontSizes" + } + }, + "f5": { + "min": { + "value": "5*roundTo(({font-scale.const.min.f0}*{font-scale.const.min.r}^(5/{font-scale.const.min.n})/5),1)", + "type": "fontSizes" + }, + "max": { + "value": "5*roundTo(({font-scale.const.max.f0}*{font-scale.const.max.r}^(5/{font-scale.const.max.n})/5),1)", + "type": "fontSizes" + }, + "v": { + "value": "100 * ({font-scale.f5.max}-{font-scale.f5.min}) / ({viewport.max}-{viewport.min})", + "type": "fontSizes" + }, + "r": { + "value": "( {viewport.min} * {font-scale.f5.max} - {viewport.max} * {font-scale.f5.min}) / ({viewport.min}-{viewport.max})", + "type": "fontSizes" + }, + "fluid": { + "value": "round(({viewport.width}/100) * {font-scale.f5.v} + {font-scale.f5.r})", + "type": "fontSizes" + } + }, + "f6": { + "min": { + "value": "5*roundTo(({font-scale.const.min.f0}*{font-scale.const.min.r}^(6/{font-scale.const.min.n})/5),1)", + "type": "fontSizes" + }, + "max": { + "value": "5*roundTo(({font-scale.const.max.f0}*{font-scale.const.max.r}^(6/{font-scale.const.max.n})/5),1)", + "type": "fontSizes" + }, + "v": { + "value": "100 * ({font-scale.f6.max}-{font-scale.f6.min}) / ({viewport.max}-{viewport.min})", + "type": "fontSizes" + }, + "r": { + "value": "( {viewport.min} * {font-scale.f6.max} - {viewport.max} * {font-scale.f6.min}) / ({viewport.min}-{viewport.max})", + "type": "fontSizes" + }, + "fluid": { + "value": "round(({viewport.width}/100) * {font-scale.f6.v} + {font-scale.f6.r})", + "type": "fontSizes" + } + }, + "f7": { + "min": { + "value": "5*roundTo(({font-scale.const.min.f0}*{font-scale.const.min.r}^(7/{font-scale.const.min.n})/5),1)", + "type": "fontSizes" + }, + "max": { + "value": "5*roundTo(({font-scale.const.max.f0}*{font-scale.const.max.r}^(7/{font-scale.const.max.n})/5),1)", + "type": "fontSizes" + }, + "v": { + "value": "100 * ({font-scale.f7.max}-{font-scale.f7.min}) / ({viewport.max}-{viewport.min})", + "type": "fontSizes" + }, + "r": { + "value": "( {viewport.min} * {font-scale.f7.max} - {viewport.max} * {font-scale.f7.min}) / ({viewport.min}-{viewport.max})", + "type": "fontSizes" + }, + "fluid": { + "value": "round(({viewport.width}/100) * {font-scale.f7.v} + {font-scale.f7.r})", + "type": "fontSizes" + } + } + }, + "font-size": { + "f-3": { + "value": "min( max( {font-scale.f-3.min}, {font-scale.f-3.fluid}) ,{font-scale.f-3.max})", + "type": "fontSizes" + }, + "f-2": { + "value": "min( max( {font-scale.f-2.min}, {font-scale.f-2.fluid}) ,{font-scale.f-2.max})", + "type": "fontSizes" + }, + "f-1": { + "value": "min( max( {font-scale.f-1.min}, {font-scale.f-1.fluid}) ,{font-scale.f-1.max})", + "type": "fontSizes" + }, + "f0": { + "value": "min( max( {font-scale.f0.min}, {font-scale.f0.fluid}) ,{font-scale.f0.max})", + "type": "fontSizes" + }, + "f1": { + "value": "min( max( {font-scale.f1.min}, {font-scale.f1.fluid}) ,{font-scale.f1.max})", + "type": "fontSizes" + }, + "f2": { + "value": "min( max( {font-scale.f2.min}, {font-scale.f2.fluid}) ,{font-scale.f2.max})", + "type": "fontSizes" + }, + "f3": { + "value": "min( max( {font-scale.f3.min}, {font-scale.f3.fluid}) ,{font-scale.f3.max})", + "type": "fontSizes" + }, + "f4": { + "value": "min( max( {font-scale.f4.min}, {font-scale.f4.fluid}) ,{font-scale.f4.max})", + "type": "fontSizes" + }, + "f5": { + "value": "min( max( {font-scale.f5.min}, {font-scale.f5.fluid}) ,{font-scale.f5.max})", + "type": "fontSizes" + }, + "f6": { + "value": "min( max( {font-scale.f6.min}, {font-scale.f6.fluid}) ,{font-scale.f6.max})", + "type": "fontSizes" + }, + "f7": { + "value": "min( max( {font-scale.f7.min}, {font-scale.f7.fluid}) ,{font-scale.f7.max})", + "type": "fontSizes" + } + }, + "viewport": { + "width": { + "value": "{viewport.max}", + "type": "sizing" + }, + "min": { + "value": "320", + "type": "sizing" + }, + "max": { + "value": "1360", + "type": "sizing" + } + } +} \ No newline at end of file diff --git a/design-tokens/Base/Semantic.json b/design-tokens/Base/Semantic.json index f5ba26c39c..ce70f88cbf 100644 --- a/design-tokens/Base/Semantic.json +++ b/design-tokens/Base/Semantic.json @@ -444,21 +444,12 @@ }, "typography": { "heading": { - "3xlarge": { - "value": { - "fontFamily": "{fontFamilies.inter}", - "fontWeight": "{fontWeights.medium}", - "lineHeight": "{lineHeights.300}", - "fontSize": "{font-size.f7}" - }, - "type": "typography" - }, "2xlarge": { "value": { "fontFamily": "{fontFamilies.inter}", "fontWeight": "{fontWeights.medium}", "lineHeight": "{lineHeights.300}", - "fontSize": "{font-size.f6}" + "fontSize": "{font-size.f7}" }, "type": "typography" }, @@ -467,7 +458,7 @@ "fontFamily": "{fontFamilies.inter}", "fontWeight": "{fontWeights.medium}", "lineHeight": "{lineHeights.300}", - "fontSize": "{font-size.f5}" + "fontSize": "{font-size.f6}" }, "type": "typography", "description": "H1" @@ -477,7 +468,7 @@ "fontFamily": "{fontFamilies.inter}", "fontWeight": "{fontWeights.medium}", "lineHeight": "{lineHeights.300}", - "fontSize": "{font-size.f4}" + "fontSize": "{font-size.f5}" }, "type": "typography", "description": "H2" @@ -487,7 +478,7 @@ "fontFamily": "{fontFamilies.inter}", "fontWeight": "{fontWeights.medium}", "lineHeight": "{lineHeights.300}", - "fontSize": "{font-size.f3}" + "fontSize": "{font-size.f4}" }, "type": "typography", "description": "H3" @@ -497,7 +488,7 @@ "fontFamily": "{fontFamilies.inter}", "fontWeight": "{fontWeights.medium}", "lineHeight": "{lineHeights.300}", - "fontSize": "{font-size.f2}" + "fontSize": "{font-size.f3}" }, "type": "typography", "description": "H4" @@ -507,7 +498,7 @@ "fontFamily": "{fontFamilies.inter}", "fontWeight": "{fontWeights.medium}", "lineHeight": "{lineHeights.300}", - "fontSize": "{font-size.f1}" + "fontSize": "{font-size.f2}" }, "type": "typography", "description": "H5" @@ -517,14 +508,41 @@ "fontFamily": "{fontFamilies.inter}", "fontWeight": "{fontWeights.medium}", "lineHeight": "{lineHeights.300}", - "fontSize": "{font-size.f0}" + "fontSize": "{font-size.f1}" }, "type": "typography", "description": "H6" } }, "ingress": { + "large": { + "value": { + "fontFamily": "{fontFamilies.inter}", + "fontWeight": "{fontWeights.regular}", + "lineHeight": "{lineHeights.600}", + "fontSize": "{font-size.f4}" + }, + "type": "typography" + }, "medium": { + "value": { + "fontFamily": "{fontFamilies.inter}", + "fontWeight": "{fontWeights.regular}", + "lineHeight": "{lineHeights.600}", + "fontSize": "{font-size.f3}" + }, + "type": "typography" + }, + "small": { + "value": { + "fontFamily": "{fontFamilies.inter}", + "fontWeight": "{fontWeights.regular}", + "lineHeight": "{lineHeights.600}", + "fontSize": "{font-size.f2}" + }, + "type": "typography" + }, + "xsmall": { "value": { "fontFamily": "{fontFamilies.inter}", "fontWeight": "{fontWeights.regular}", @@ -540,7 +558,7 @@ "fontFamily": "{fontFamilies.inter}", "fontWeight": "{fontWeights.regular}", "lineHeight": "{lineHeights.500}", - "fontSize": "{font-size.f1}" + "fontSize": "{font-size.f2}" }, "type": "typography" }, @@ -549,7 +567,7 @@ "fontFamily": "{fontFamilies.inter}", "fontWeight": "{fontWeights.regular}", "lineHeight": "{lineHeights.500}", - "fontSize": "{font-size.f0}" + "fontSize": "{font-size.f1}" }, "type": "typography" }, @@ -558,7 +576,7 @@ "fontFamily": "{fontFamilies.inter}", "fontWeight": "{fontWeights.regular}", "lineHeight": "{lineHeights.500}", - "fontSize": "{font-size.f-1}" + "fontSize": "{font-size.f0}" }, "type": "typography" }, @@ -567,7 +585,7 @@ "fontFamily": "{fontFamilies.inter}", "fontWeight": "{fontWeights.regular}", "lineHeight": "{lineHeights.500}", - "fontSize": "{font-size.f-2}" + "fontSize": "{font-size.f-1}" }, "type": "typography" }, @@ -577,7 +595,7 @@ "fontFamily": "{fontFamilies.inter}", "fontWeight": "{fontWeights.regular}", "lineHeight": "{lineHeights.300}", - "fontSize": "{font-size.f1}" + "fontSize": "{font-size.f2}" }, "type": "typography" }, @@ -586,7 +604,7 @@ "fontFamily": "{fontFamilies.inter}", "fontWeight": "{fontWeights.regular}", "lineHeight": "{lineHeights.300}", - "fontSize": "{font-size.f0}" + "fontSize": "{font-size.f1}" }, "type": "typography" }, @@ -595,7 +613,7 @@ "fontFamily": "{fontFamilies.inter}", "fontWeight": "{fontWeights.regular}", "lineHeight": "{lineHeights.300}", - "fontSize": "{font-size.f-1}" + "fontSize": "{font-size.f0}" }, "type": "typography" }, @@ -604,7 +622,7 @@ "fontFamily": "{fontFamilies.inter}", "fontWeight": "{fontWeights.regular}", "lineHeight": "{lineHeights.300}", - "fontSize": "{font-size.f-2}" + "fontSize": "{font-size.f-1}" }, "type": "typography" } @@ -654,7 +672,7 @@ "fontFamily": "{fontFamilies.inter}", "fontWeight": "{fontWeights.medium}", "lineHeight": "{lineHeights.300}", - "fontSize": "{font-size.f1}" + "fontSize": "{font-size.f2}" }, "type": "typography" }, @@ -663,7 +681,7 @@ "fontFamily": "{fontFamilies.inter}", "fontWeight": "{fontWeights.medium}", "lineHeight": "{lineHeights.300}", - "fontSize": "{font-size.f0}" + "fontSize": "{font-size.f1}" }, "type": "typography" }, @@ -672,7 +690,7 @@ "fontFamily": "{fontFamilies.inter}", "fontWeight": "{fontWeights.medium}", "lineHeight": "{lineHeights.300}", - "fontSize": "{font-size.f-1}" + "fontSize": "{font-size.f0}" }, "type": "typography" }, @@ -681,7 +699,7 @@ "fontFamily": "{fontFamilies.inter}", "fontWeight": "{fontWeights.medium}", "lineHeight": "{lineHeights.300}", - "fontSize": "{font-size.f-2}" + "fontSize": "{font-size.f-1}" }, "type": "typography" } @@ -692,7 +710,7 @@ "fontFamily": "{fontFamilies.inter}", "fontWeight": "{fontWeights.regular}", "lineHeight": "{lineHeights.300}", - "fontSize": "{font-size.f1}" + "fontSize": "{font-size.f2}" }, "type": "typography" }, @@ -701,7 +719,7 @@ "fontFamily": "{fontFamilies.inter}", "fontWeight": "{fontWeights.regular}", "lineHeight": "{lineHeights.300}", - "fontSize": "{font-size.f0}" + "fontSize": "{font-size.f1}" }, "type": "typography" }, @@ -710,7 +728,7 @@ "fontFamily": "{fontFamilies.inter}", "fontWeight": "{fontWeights.regular}", "lineHeight": "{lineHeights.300}", - "fontSize": "{font-size.f-1}" + "fontSize": "{font-size.f0}" }, "type": "typography" }, @@ -719,7 +737,7 @@ "fontFamily": "{fontFamilies.inter}", "fontWeight": "{fontWeights.regular}", "lineHeight": "{lineHeights.300}", - "fontSize": "{font-size.f-2}" + "fontSize": "{font-size.f-1}" }, "type": "typography" } @@ -800,84 +818,84 @@ }, "spacing": { "0": { - "value": "0", - "type": "spacing", - "description": "0" + "value": "{base_sizing}*0", + "type": "spacing" }, "1": { - "value": "{base_spacing}/16*{font-size.f0}", - "type": "spacing", - "description": "4px - 4.5px" + "value": "{base_sizing}*1", + "type": "spacing" }, "2": { - "value": "{base_spacing}*2/16*{font-size.f0}", - "type": "spacing", - "description": "8px - 9px" + "value": "{base_sizing}*2", + "type": "spacing" }, "3": { - "value": "{base_spacing}*3/16*{font-size.f0}", - "type": "spacing", - "description": "12px - 13.5px" + "value": "{base_sizing}*3", + "type": "spacing" }, "4": { - "value": "{base_spacing}*4/16*{font-size.f0}", - "type": "spacing", - "description": "16px - 18px" + "value": "{base_sizing}*4", + "type": "spacing" }, "5": { - "value": "{base_spacing}*5/16*{font-size.f0}", - "type": "spacing", - "description": "20px - 22.5px" + "value": "{base_sizing}*5", + "type": "spacing" }, "6": { - "value": "{base_spacing}*6/16*{font-size.f0}", - "type": "spacing", - "description": "24px - 27px" + "value": "{base_sizing}*6", + "type": "spacing" }, "7": { - "value": "{base_spacing}*7/16*{font-size.f0}", - "type": "spacing", - "description": "28px - 31.5px" + "value": "{base_sizing}*7", + "type": "spacing" }, "8": { - "value": "({base_spacing}*8/16)*{font-size.f0}", - "type": "spacing", - "description": "32px - 36px" + "value": "{base_sizing}*8", + "type": "spacing" + }, + "9": { + "value": "{base_sizing}*9", + "type": "spacing" }, "10": { - "value": "({base_spacing}*10/16)*{font-size.f0}", - "type": "spacing", - "description": "40px - 45px" + "value": "{base_sizing}*10", + "type": "spacing" + }, + "11": { + "value": "{base_sizing}*11", + "type": "spacing" }, "12": { - "value": "({base_spacing}*12/16)*{font-size.f0}", - "type": "spacing", - "description": "48px - 54px" + "value": "{base_sizing}*12", + "type": "spacing" + }, + "13": { + "value": "{base_sizing}*13", + "type": "spacing" }, "14": { - "value": "({base_spacing}*14/16)*{font-size.f0}", - "type": "spacing", - "description": "56px - 63px" + "value": "{base_sizing}*14", + "type": "spacing" + }, + "15": { + "value": "{base_sizing}*15", + "type": "spacing" }, "18": { - "value": "({base_spacing}*18/16)*{font-size.f0}", - "type": "spacing", - "description": "72px - 81px" + "value": "{base_sizing}*18", + "type": "spacing" }, "22": { - "value": "({base_spacing}*22/16)*{font-size.f0}", - "type": "spacing", - "description": "88px - 99px" + "value": "{base_sizing}*22", + "type": "spacing" }, "26": { - "value": "({base_spacing}*26/16)*{font-size.f0}", - "type": "spacing", - "description": "104px - 117px" + "value": "{base_sizing}*26", + "type": "spacing" }, "30": { - "value": "({base_spacing}*30/16)*{font-size.f0}", - "type": "spacing", - "description": "120px - 135px" + "value": "{base_sizing}*30", + "type": "spacing" } }, "base_spacing": { @@ -886,80 +904,85 @@ "description": "4px" }, "sizing": { + "0": { + "value": "{base_sizing}*0", + "type": "sizing" + }, "1": { - "value": "{base_sizing}/16*{font-size.f0}", - "type": "sizing", - "description": "4px - 4.5px" + "value": "{base_sizing}*1", + "type": "sizing" }, "2": { - "value": "{base_sizing}*2/16*{font-size.f0}", - "type": "sizing", - "description": "8px - 9px" + "value": "{base_sizing}*2", + "type": "sizing" }, "3": { - "value": "{base_sizing}*3/16*{font-size.f0}", - "type": "sizing", - "description": "12px - 13.5px" + "value": "{base_sizing}*3", + "type": "sizing" }, "4": { - "value": "{base_sizing}*4/16*{font-size.f0}", - "type": "sizing", - "description": "16px - 18px" + "value": "{base_sizing}*4", + "type": "sizing" }, "5": { - "value": "{base_sizing}*5/16*{font-size.f0}", - "type": "sizing", - "description": "20px - 22.5" + "value": "{base_sizing}*5", + "type": "sizing" }, "6": { - "value": "{base_sizing}*6/16*{font-size.f0}", - "type": "sizing", - "description": "24px - 27px" + "value": "{base_sizing}*6", + "type": "sizing" }, "7": { - "value": "{base_sizing}*7/16*{font-size.f0}", - "type": "sizing", - "description": "28px - 31.5px" + "value": "{base_sizing}*7", + "type": "sizing" }, "8": { - "value": "{base_sizing}*8/16*{font-size.f0}", - "type": "sizing", - "description": "32px - 36px" + "value": "{base_sizing}*8", + "type": "sizing" + }, + "9": { + "value": "{base_sizing}*9", + "type": "sizing" }, "10": { - "value": "{base_sizing}*10/16*{font-size.f0}", - "type": "sizing", - "description": "40px - 45px" + "value": "{base_sizing}*10", + "type": "sizing" + }, + "11": { + "value": "{base_sizing}*11", + "type": "sizing" }, "12": { - "value": "({base_sizing}*12/16)*{font-size.f0}", - "type": "sizing", - "description": "48px - 54px" + "value": "{base_sizing}*12", + "type": "sizing" + }, + "13": { + "value": "{base_sizing}*13", + "type": "sizing" }, "14": { - "value": "({base_sizing}*14/16)*{font-size.f0}", - "type": "sizing", - "description": "56px - 63px" + "value": "{base_sizing}*14", + "type": "sizing" + }, + "15": { + "value": "{base_sizing}*15", + "type": "sizing" }, "18": { - "value": "({base_sizing}*18/16)*{font-size.f0}", - "type": "sizing", - "description": "72px - 81px" + "value": "{base_sizing}*18", + "type": "sizing" }, "22": { - "value": "({base_sizing}*22/16)*{font-size.f0}", - "type": "sizing", - "description": "88px - 99px" + "value": "{base_sizing}*22", + "type": "sizing" }, "26": { - "value": "({base_sizing}*26/16)*{font-size.f0}", - "type": "sizing", - "description": "104px - 117px" + "value": "{base_sizing}*26", + "type": "sizing" }, "30": { - "value": "({base_sizing}*30/16)*{font-size.f0}", - "type": "sizing", - "description": "120px - 135px" + "value": "{base_sizing}*30", + "type": "sizing" } }, "base_sizing": { @@ -1003,4 +1026,4 @@ "type": "boxShadow" } } -} \ No newline at end of file +} diff --git a/packages/css/alert.css b/packages/css/alert.css index e9697a879e..e0c35e0a4d 100644 --- a/packages/css/alert.css +++ b/packages/css/alert.css @@ -3,7 +3,7 @@ --fds-alert-border-left: 8px 0 0 0 var(--fds-alert-border) inset; --fds-alert-color: var(--fds-semantic-text-neutral-default); --fds-alert-icon-color: var(--fds-alert-border); - --fds-alert-icon-size: calc((4 * 6 / 16) * var(--fds-font-size-f0)); + --fds-alert-icon-size: var(--fds-sizing-7); --fds-alert-background: var(--fds-semantic-surface-info-subtle); box-shadow: var(--fds-alert-border-left); diff --git a/packages/css/react-css-modules.css b/packages/css/react-css-modules.css index eac79ee929..60f531c229 100644 --- a/packages/css/react-css-modules.css +++ b/packages/css/react-css-modules.css @@ -79,7 +79,7 @@ gap: var(--fds-sizing-1); font: var(--fds-typography-paragraph-short-small); font-family: inherit; - min-height: var(--fds-sizing-8); + min-height: var(--fds-sizing-10); } .fds-button-medium-8fa00f0f { @@ -88,7 +88,7 @@ gap: var(--fds-sizing-2); font: var(--fds-typography-paragraph-short-medium); font-family: inherit; - min-height: var(--fds-sizing-10); + min-height: var(--fds-sizing-12); } .fds-button-large-8fa00f0f { @@ -97,7 +97,7 @@ gap: var(--fds-sizing-2); font: var(--fds-typography-paragraph-short-large); font-family: inherit; - min-height: var(--fds-sizing-12); + min-height: var(--fds-sizing-14); } .fds-button-fullWidth-8fa00f0f { @@ -741,20 +741,20 @@ } .fds-helptext-helpTextIcon-f137834f.fds-helptext-small-f137834f { - --help_text-icon-width: 24px; - --help_text-icon-height: 24px; -} - -.fds-helptext-helpTextIcon-f137834f.fds-helptext-medium-f137834f { --help_text-icon-width: var(--fds-sizing-6); --help_text-icon-height: var(--fds-sizing-6); } -.fds-helptext-helpTextIcon-f137834f.fds-helptext-large-f137834f { +.fds-helptext-helpTextIcon-f137834f.fds-helptext-medium-f137834f { --help_text-icon-width: var(--fds-sizing-7); --help_text-icon-height: var(--fds-sizing-7); } +.fds-helptext-helpTextIcon-f137834f.fds-helptext-large-f137834f { + --help_text-icon-width: var(--fds-sizing-8); + --help_text-icon-height: var(--fds-sizing-8); +} + .fds-spinner-spinner-486ddf9b { animation: fds-spinner-rotate-animation-486ddf9b linear infinite; animation-duration: 2s; @@ -1064,19 +1064,19 @@ .fds-nativeselect-select-2e95d79c.fds-nativeselect-small-2e95d79c { padding: 0 var(--fds-spacing-2); padding-right: var(--fds-spacing-8); - height: var(--fds-sizing-8); + height: var(--fds-sizing-10); } .fds-nativeselect-select-2e95d79c.fds-nativeselect-medium-2e95d79c { padding: 0 var(--fds-spacing-3); padding-right: var(--fds-spacing-10); - height: var(--fds-sizing-10); + height: var(--fds-sizing-12); } .fds-nativeselect-select-2e95d79c.fds-nativeselect-large-2e95d79c { padding: 0 var(--fds-spacing-4); padding-right: var(--fds-spacing-12); - height: var(--fds-sizing-12); + height: var(--fds-sizing-14); } .fds-nativeselect-formField-2e95d79c { @@ -1139,18 +1139,18 @@ } .fds-tag-small-40d841d9 { - --fdsc-tag-padding: var(--fds-spacing-1); - --fdsc-tag-min-height: var(--fds-sizing-5); + --fdsc-tag-padding: var(--fds-spacing-2); + --fdsc-tag-min-height: var(--fds-sizing-7); } .fds-tag-medium-40d841d9 { - --fdsc-tag-padding: var(--fds-spacing-1); - --fdsc-tag-min-height: var(--fds-sizing-6); + --fdsc-tag-padding: var(--fds-spacing-2); + --fdsc-tag-min-height: var(--fds-sizing-8); } .fds-tag-large-40d841d9 { - --fdsc-tag-padding: var(--fds-spacing-2); - --fdsc-tag-min-height: var(--fds-sizing-7); + --fdsc-tag-padding: var(--fds-spacing-3); + --fdsc-tag-min-height: var(--fds-sizing-9); } .fds-tag-neutral-40d841d9 { @@ -1252,7 +1252,7 @@ background: var(--fdsc-removable-background); border: 0; padding-right: 0; - min-height: var(--fdsc-removable-chip-size); + min-height: var(--fdsc-chip-height); } .fds-chip-xMark-4563db0f { @@ -1262,18 +1262,6 @@ padding-right: var(--fdsc-removable-chip-xmark-padding_right); } -.fds-chip-removable-4563db0f.fds-chip-small-4563db0f { - --fdsc-removable-chip-size: var(--fds-sizing-6); -} - -.fds-chip-removable-4563db0f.fds-chip-medium-4563db0f { - --fdsc-removable-chip-size: var(--fds-sizing-7); -} - -.fds-chip-removable-4563db0f.fds-chip-large-4563db0f { - --fdsc-removable-chip-size: var(--fds-sizing-8); -} - .fds-chip-xMark-4563db0f .fds-chip-icon-4563db0f { height: var(--fdsc-removable-chip-xmark-size); width: var(--fdsc-removable-chip-xmark-size); @@ -1347,20 +1335,20 @@ } .fds-chip-small-4563db0f { - --fdsc-chip-height: var(--fds-sizing-6); - --fdsc-chip-padding: var(--fds-spacing-2); + --fdsc-chip-height: var(--fds-sizing-7); + --fdsc-chip-padding: var(--fds-spacing-3); --fdsc-removable-chip-xmark-size: var(--fds-sizing-5); } .fds-chip-medium-4563db0f { - --fdsc-chip-height: var(--fds-sizing-7); + --fdsc-chip-height: var(--fds-sizing-8); --fdsc-chip-padding: var(--fds-spacing-3); --fdsc-removable-chip-xmark-size: var(--fds-sizing-6); } .fds-chip-large-4563db0f { - --fdsc-chip-height: var(--fds-sizing-8); - --fdsc-chip-padding: var(--fds-spacing-3); + --fdsc-chip-height: var(--fds-sizing-9); + --fdsc-chip-padding: var(--fds-spacing-4); --fdsc-removable-chip-xmark-size: var(--fds-sizing-7); } @@ -1404,17 +1392,17 @@ .fds-pagination-listitem-ddc0278f:where(.fds-pagination-small-ddc0278f) { --fsdc-pagination-listitem-margin: var(--fds-spacing-2); - --fdsc-pagination-ellipsis-width: var(--fds-sizing-8); + --fdsc-pagination-ellipsis-width: var(--fds-sizing-10); } .fds-pagination-listitem-ddc0278f:where(.fds-pagination-medium-ddc0278f) { --fsdc-pagination-listitem-margin: var(--fds-spacing-4); - --fdsc-pagination-ellipsis-width: var(--fds-sizing-10); + --fdsc-pagination-ellipsis-width: var(--fds-sizing-12); } .fds-pagination-listitem-ddc0278f:where(.fds-pagination-large-ddc0278f) { --fsdc-pagination-listitem-margin: var(--fds-spacing-6); - --fdsc-pagination-ellipsis-width: var(--fds-sizing-12); + --fdsc-pagination-ellipsis-width: var(--fds-sizing-14); } .fds-pagination-listitem-ddc0278f:where(.fds-pagination-compact-ddc0278f) { @@ -1473,7 +1461,7 @@ --fds-checkbox-focus-border-width: 3px; --fds-checkbox-background: var(--fds-semantic-background-default); --fds-checkbox-border-color: var(--fds-semantic-border-input-default); - --fds-checkbox-border__hover: 0 0 0 calc((2.75rem - var(--fds-checkbox-size)) / 2) var(--fds-semantic-surface-info-subtle-hover); + --fds-checkbox-border__hover: 0 0 0 var(--fds-spacing-2) var(--fds-semantic-surface-info-subtle-hover); display: grid; } @@ -1619,19 +1607,19 @@ /** Sizing */ .fds-checkbox-small-ad9a8b9c { - --fds-checkbox-size: 1.5rem; + --fds-checkbox-size: var(--fds-sizing-5); - min-height: var(--fds-sizing-8); + min-height: var(--fds-sizing-10); } .fds-checkbox-medium-ad9a8b9c { - --fds-checkbox-size: 1.75rem; + --fds-checkbox-size: var(--fds-sizing-6); - min-height: var(--fds-sizing-10); + min-height: var(--fds-sizing-11); } .fds-checkbox-large-ad9a8b9c { - --fds-checkbox-size: 2rem; + --fds-checkbox-size: var(--fds-sizing-7); min-height: var(--fds-sizing-12); } @@ -1681,7 +1669,7 @@ --fds-radio-focus-border-width: 3px; --fds-radio-background: var(--fds-semantic-background-default); --fds-radio-border-color: var(--fds-semantic-border-input-default); - --fds-radio-border__hover: 0 0 0 calc((2.75rem - var(--fds-radio-size)) / 2) var(--fds-semantic-surface-info-subtle-hover); + --fds-radio-border__hover: 0 0 0 var(--fds-spacing-2) var(--fds-semantic-surface-info-subtle-hover); display: grid; } @@ -1812,19 +1800,19 @@ /** Sizing */ .fds-radio-small-7a9bd584 { - --fds-radio-size: 1.5rem; + --fds-radio-size: var(--fds-sizing-5); - min-height: var(--fds-sizing-8); + min-height: var(--fds-sizing-10); } .fds-radio-medium-7a9bd584 { - --fds-radio-size: 1.75rem; + --fds-radio-size: var(--fds-sizing-6); - min-height: var(--fds-sizing-10); + min-height: var(--fds-sizing-11); } .fds-radio-large-7a9bd584 { - --fds-radio-size: 2rem; + --fds-radio-size: var(--fds-sizing-7); min-height: var(--fds-sizing-12); } @@ -1939,22 +1927,22 @@ .fds-switch-small-9a6b03bc, .fds-switch-small-9a6b03bc .fds-switch-label-9a6b03bc { - min-height: var(--fds-sizing-8); + min-height: var(--fds-sizing-6); } .fds-switch-medium-9a6b03bc, .fds-switch-medium-9a6b03bc .fds-switch-label-9a6b03bc { - min-height: var(--fds-sizing-10); + min-height: var(--fds-sizing-7); } .fds-switch-large-9a6b03bc, .fds-switch-large-9a6b03bc .fds-switch-label-9a6b03bc { - min-height: var(--fds-sizing-12); + min-height: var(--fds-sizing-8); } .fds-switch-small-9a6b03bc { - --fds-switch-height: 1.5rem; - --fds-switch-width: 2.5rem; + --fds-switch-height: var(--fds-sizing-6); + --fds-switch-width: var(--fds-sizing-11); } .fds-switch-small-9a6b03bc .fds-switch-input-9a6b03bc { @@ -1963,8 +1951,8 @@ } .fds-switch-medium-9a6b03bc { - --fds-switch-height: 1.75rem; - --fds-switch-width: 3rem; + --fds-switch-height: var(--fds-sizing-7); + --fds-switch-width: var(--fds-sizing-13); } .fds-switch-medium-9a6b03bc .fds-switch-input-9a6b03bc { @@ -1973,8 +1961,8 @@ } .fds-switch-large-9a6b03bc { - --fds-switch-height: 2rem; - --fds-switch-width: 3.5rem; + --fds-switch-height: var(--fds-sizing-8); + --fds-switch-width: var(--fds-sizing-15); } .fds-switch-large-9a6b03bc .fds-switch-input-9a6b03bc { @@ -2104,27 +2092,27 @@ } .fds-textfield-formField-d98267a0.fds-textfield-small-d98267a0 .fds-textfield-adornment-d98267a0 { - padding: 6.5px var(--fds-spacing-3); + padding: var(--fds-sizing-2) var(--fds-spacing-3); } .fds-textfield-formField-d98267a0.fds-textfield-medium-d98267a0 .fds-textfield-adornment-d98267a0 { - padding: 9px var(--fds-spacing-4); + padding: 0.65rem var(--fds-spacing-4); } .fds-textfield-formField-d98267a0.fds-textfield-large-d98267a0 .fds-textfield-adornment-d98267a0 { - padding: 11px var(--fds-spacing-5); + padding: 0.85rem var(--fds-spacing-5); } .fds-textfield-formField-d98267a0.fds-textfield-small-d98267a0 .fds-textfield-field-d98267a0 { - height: var(--fds-sizing-8); + height: var(--fds-sizing-10); } .fds-textfield-formField-d98267a0.fds-textfield-medium-d98267a0 .fds-textfield-field-d98267a0 { - height: var(--fds-sizing-10); + height: var(--fds-sizing-12); } .fds-textfield-formField-d98267a0.fds-textfield-large-d98267a0 .fds-textfield-field-d98267a0 { - height: var(--fds-sizing-12); + height: var(--fds-sizing-14); } .fds-textfield-label-d98267a0 { @@ -2612,7 +2600,7 @@ position: absolute; height: 100%; z-index: 2; - left: var(--fds-spacing-3); + left: var(--fds-spacing-4); transform: scale(1.5); pointer-events: none; } @@ -2683,30 +2671,42 @@ z-index: 2; } -.fds-search-input-a6b5fe3c.fds-search-small-a6b5fe3c { +.fds-search-small-a6b5fe3c .fds-search-input-a6b5fe3c { --f-search-button-clear-size: var(--fds-sizing-4); - height: var(--fds-sizing-8); - padding: 0 var(--fds-spacing-2); + height: var(--fds-sizing-10); + padding: 0 var(--fds-spacing-3); padding-right: 2.5em; } -.fds-search-input-a6b5fe3c.fds-search-medium-a6b5fe3c { +.fds-search-small-a6b5fe3c .fds-search-icon-a6b5fe3c { + left: var(--fds-spacing-3); +} + +.fds-search-medium-a6b5fe3c .fds-search-input-a6b5fe3c { --f-search-button-clear-size: var(--fds-sizing-6); - height: var(--fds-sizing-10); - padding: 0 var(--fds-spacing-3); + height: var(--fds-sizing-12); + padding: 0 var(--fds-spacing-4); padding-right: 2.2em; } -.fds-search-input-a6b5fe3c.fds-search-large-a6b5fe3c { +.fds-search-medium-a6b5fe3c .fds-search-icon-a6b5fe3c { + left: var(--fds-spacing-4); +} + +.fds-search-large-a6b5fe3c .fds-search-input-a6b5fe3c { --f-search-button-clear-size: var(--fds-sizing-12); - height: var(--fds-sizing-12); - padding: 0 var(--fds-spacing-4); + height: var(--fds-sizing-14); + padding: 0 var(--fds-spacing-5); padding-right: 2em; } +.fds-search-large-a6b5fe3c .fds-search-icon-a6b5fe3c { + left: var(--fds-spacing-5); +} + .fds-search-input-a6b5fe3c.fds-search-simple-a6b5fe3c { padding-left: 2.4em; } @@ -3202,6 +3202,7 @@ } .fds-combobox-inputWrapper-249a725c.fds-combobox-small-249a725c { + min-height: var(--fds-sizing-10); font: var(--fds-typography-paragraph-small); font-family: inherit; padding: 5px var(--fds-spacing-2); @@ -3213,6 +3214,7 @@ } .fds-combobox-inputWrapper-249a725c.fds-combobox-medium-249a725c { + min-height: var(--fds-sizing-12); font: var(--fds-typography-paragraph-medium); font-family: inherit; padding: 7px var(--fds-spacing-3); @@ -3224,6 +3226,7 @@ } .fds-combobox-inputWrapper-249a725c.fds-combobox-large-249a725c { + min-height: var(--fds-sizing-14); font: var(--fds-typography-paragraph-large); font-family: inherit; padding: 7px var(--fds-spacing-4); diff --git a/packages/react/src/components/Button/Button.module.css b/packages/react/src/components/Button/Button.module.css index cecfc6fc63..dd4166b60b 100644 --- a/packages/react/src/components/Button/Button.module.css +++ b/packages/react/src/components/Button/Button.module.css @@ -54,7 +54,7 @@ gap: var(--fds-sizing-1); font: var(--fds-typography-paragraph-short-small); font-family: inherit; - min-height: var(--fds-sizing-8); + min-height: var(--fds-sizing-10); } .medium { @@ -63,7 +63,7 @@ gap: var(--fds-sizing-2); font: var(--fds-typography-paragraph-short-medium); font-family: inherit; - min-height: var(--fds-sizing-10); + min-height: var(--fds-sizing-12); } .large { @@ -72,7 +72,7 @@ gap: var(--fds-sizing-2); font: var(--fds-typography-paragraph-short-large); font-family: inherit; - min-height: var(--fds-sizing-12); + min-height: var(--fds-sizing-14); } .fullWidth { diff --git a/packages/react/src/components/Card/Card.stories.tsx b/packages/react/src/components/Card/Card.stories.tsx index 3563493603..d3588ace2b 100644 --- a/packages/react/src/components/Card/Card.stories.tsx +++ b/packages/react/src/components/Card/Card.stories.tsx @@ -350,7 +350,7 @@ export const Composed: Story = () => ( > Fjern diff --git a/packages/react/src/components/Chip/Chip.module.css b/packages/react/src/components/Chip/Chip.module.css index 7c43cf44ce..f9461af7dc 100644 --- a/packages/react/src/components/Chip/Chip.module.css +++ b/packages/react/src/components/Chip/Chip.module.css @@ -57,7 +57,7 @@ background: var(--fdsc-removable-background); border: 0; padding-right: 0; - min-height: var(--fdsc-removable-chip-size); + min-height: var(--fdsc-chip-height); } .xMark { @@ -67,18 +67,6 @@ padding-right: var(--fdsc-removable-chip-xmark-padding_right); } -.removable.small { - --fdsc-removable-chip-size: var(--fds-sizing-6); -} - -.removable.medium { - --fdsc-removable-chip-size: var(--fds-sizing-7); -} - -.removable.large { - --fdsc-removable-chip-size: var(--fds-sizing-8); -} - .xMark .icon { height: var(--fdsc-removable-chip-xmark-size); width: var(--fdsc-removable-chip-xmark-size); @@ -152,19 +140,19 @@ } .small { - --fdsc-chip-height: var(--fds-sizing-6); - --fdsc-chip-padding: var(--fds-spacing-2); + --fdsc-chip-height: var(--fds-sizing-7); + --fdsc-chip-padding: var(--fds-spacing-3); --fdsc-removable-chip-xmark-size: var(--fds-sizing-5); } .medium { - --fdsc-chip-height: var(--fds-sizing-7); + --fdsc-chip-height: var(--fds-sizing-8); --fdsc-chip-padding: var(--fds-spacing-3); --fdsc-removable-chip-xmark-size: var(--fds-sizing-6); } .large { - --fdsc-chip-height: var(--fds-sizing-8); - --fdsc-chip-padding: var(--fds-spacing-3); + --fdsc-chip-height: var(--fds-sizing-9); + --fdsc-chip-padding: var(--fds-spacing-4); --fdsc-removable-chip-xmark-size: var(--fds-sizing-7); } diff --git a/packages/react/src/components/HelpText/HelpText.module.css b/packages/react/src/components/HelpText/HelpText.module.css index 011553b912..464bae8924 100644 --- a/packages/react/src/components/HelpText/HelpText.module.css +++ b/packages/react/src/components/HelpText/HelpText.module.css @@ -41,16 +41,16 @@ } .helpTextIcon.small { - --help_text-icon-width: 24px; - --help_text-icon-height: 24px; -} - -.helpTextIcon.medium { --help_text-icon-width: var(--fds-sizing-6); --help_text-icon-height: var(--fds-sizing-6); } -.helpTextIcon.large { +.helpTextIcon.medium { --help_text-icon-width: var(--fds-sizing-7); --help_text-icon-height: var(--fds-sizing-7); } + +.helpTextIcon.large { + --help_text-icon-width: var(--fds-sizing-8); + --help_text-icon-height: var(--fds-sizing-8); +} diff --git a/packages/react/src/components/Pagination/Pagination.module.css b/packages/react/src/components/Pagination/Pagination.module.css index f1c80be949..ec7b530592 100644 --- a/packages/react/src/components/Pagination/Pagination.module.css +++ b/packages/react/src/components/Pagination/Pagination.module.css @@ -38,17 +38,17 @@ .listitem:where(.small) { --fsdc-pagination-listitem-margin: var(--fds-spacing-2); - --fdsc-pagination-ellipsis-width: var(--fds-sizing-8); + --fdsc-pagination-ellipsis-width: var(--fds-sizing-10); } .listitem:where(.medium) { --fsdc-pagination-listitem-margin: var(--fds-spacing-4); - --fdsc-pagination-ellipsis-width: var(--fds-sizing-10); + --fdsc-pagination-ellipsis-width: var(--fds-sizing-12); } .listitem:where(.large) { --fsdc-pagination-listitem-margin: var(--fds-spacing-6); - --fdsc-pagination-ellipsis-width: var(--fds-sizing-12); + --fdsc-pagination-ellipsis-width: var(--fds-sizing-14); } .listitem:where(.compact) { diff --git a/packages/react/src/components/Tag/Tag.module.css b/packages/react/src/components/Tag/Tag.module.css index d3df28232a..17ca7b6c74 100644 --- a/packages/react/src/components/Tag/Tag.module.css +++ b/packages/react/src/components/Tag/Tag.module.css @@ -18,18 +18,18 @@ } .small { - --fdsc-tag-padding: var(--fds-spacing-1); - --fdsc-tag-min-height: var(--fds-sizing-5); + --fdsc-tag-padding: var(--fds-spacing-2); + --fdsc-tag-min-height: var(--fds-sizing-7); } .medium { - --fdsc-tag-padding: var(--fds-spacing-1); - --fdsc-tag-min-height: var(--fds-sizing-6); + --fdsc-tag-padding: var(--fds-spacing-2); + --fdsc-tag-min-height: var(--fds-sizing-8); } .large { - --fdsc-tag-padding: var(--fds-spacing-2); - --fdsc-tag-min-height: var(--fds-sizing-7); + --fdsc-tag-padding: var(--fds-spacing-3); + --fdsc-tag-min-height: var(--fds-sizing-9); } .neutral { diff --git a/packages/react/src/components/form/Checkbox/Checkbox.module.css b/packages/react/src/components/form/Checkbox/Checkbox.module.css index 56539a5d59..ce1850c9c4 100644 --- a/packages/react/src/components/form/Checkbox/Checkbox.module.css +++ b/packages/react/src/components/form/Checkbox/Checkbox.module.css @@ -3,7 +3,7 @@ --fds-checkbox-focus-border-width: 3px; --fds-checkbox-background: var(--fds-semantic-background-default); --fds-checkbox-border-color: var(--fds-semantic-border-input-default); - --fds-checkbox-border__hover: 0 0 0 calc((2.75rem - var(--fds-checkbox-size)) / 2) var(--fds-semantic-surface-info-subtle-hover); + --fds-checkbox-border__hover: 0 0 0 var(--fds-spacing-2) var(--fds-semantic-surface-info-subtle-hover); display: grid; } @@ -149,19 +149,19 @@ /** Sizing */ .small { - --fds-checkbox-size: 1.5rem; + --fds-checkbox-size: var(--fds-sizing-5); - min-height: var(--fds-sizing-8); + min-height: var(--fds-sizing-10); } .medium { - --fds-checkbox-size: 1.75rem; + --fds-checkbox-size: var(--fds-sizing-6); - min-height: var(--fds-sizing-10); + min-height: var(--fds-sizing-11); } .large { - --fds-checkbox-size: 2rem; + --fds-checkbox-size: var(--fds-sizing-7); min-height: var(--fds-sizing-12); } diff --git a/packages/react/src/components/form/Combobox/Combobox.module.css b/packages/react/src/components/form/Combobox/Combobox.module.css index de1ef923cb..9980cd9ed8 100644 --- a/packages/react/src/components/form/Combobox/Combobox.module.css +++ b/packages/react/src/components/form/Combobox/Combobox.module.css @@ -39,6 +39,7 @@ } .inputWrapper.small { + min-height: var(--fds-sizing-10); font: var(--fds-typography-paragraph-small); font-family: inherit; padding: 5px var(--fds-spacing-2); @@ -50,6 +51,7 @@ } .inputWrapper.medium { + min-height: var(--fds-sizing-12); font: var(--fds-typography-paragraph-medium); font-family: inherit; padding: 7px var(--fds-spacing-3); @@ -61,6 +63,7 @@ } .inputWrapper.large { + min-height: var(--fds-sizing-14); font: var(--fds-typography-paragraph-large); font-family: inherit; padding: 7px var(--fds-spacing-4); diff --git a/packages/react/src/components/form/NativeSelect/NativeSelect.module.css b/packages/react/src/components/form/NativeSelect/NativeSelect.module.css index 147c238cc6..ab802d7567 100644 --- a/packages/react/src/components/form/NativeSelect/NativeSelect.module.css +++ b/packages/react/src/components/form/NativeSelect/NativeSelect.module.css @@ -29,19 +29,19 @@ .select.small { padding: 0 var(--fds-spacing-2); padding-right: var(--fds-spacing-8); - height: var(--fds-sizing-8); + height: var(--fds-sizing-10); } .select.medium { padding: 0 var(--fds-spacing-3); padding-right: var(--fds-spacing-10); - height: var(--fds-sizing-10); + height: var(--fds-sizing-12); } .select.large { padding: 0 var(--fds-spacing-4); padding-right: var(--fds-spacing-12); - height: var(--fds-sizing-12); + height: var(--fds-sizing-14); } .formField { diff --git a/packages/react/src/components/form/Radio/Radio.module.css b/packages/react/src/components/form/Radio/Radio.module.css index 7221714276..589cd57d5a 100644 --- a/packages/react/src/components/form/Radio/Radio.module.css +++ b/packages/react/src/components/form/Radio/Radio.module.css @@ -3,7 +3,7 @@ --fds-radio-focus-border-width: 3px; --fds-radio-background: var(--fds-semantic-background-default); --fds-radio-border-color: var(--fds-semantic-border-input-default); - --fds-radio-border__hover: 0 0 0 calc((2.75rem - var(--fds-radio-size)) / 2) var(--fds-semantic-surface-info-subtle-hover); + --fds-radio-border__hover: 0 0 0 var(--fds-spacing-2) var(--fds-semantic-surface-info-subtle-hover); display: grid; } @@ -134,19 +134,19 @@ /** Sizing */ .small { - --fds-radio-size: 1.5rem; + --fds-radio-size: var(--fds-sizing-5); - min-height: var(--fds-sizing-8); + min-height: var(--fds-sizing-10); } .medium { - --fds-radio-size: 1.75rem; + --fds-radio-size: var(--fds-sizing-6); - min-height: var(--fds-sizing-10); + min-height: var(--fds-sizing-11); } .large { - --fds-radio-size: 2rem; + --fds-radio-size: var(--fds-sizing-7); min-height: var(--fds-sizing-12); } diff --git a/packages/react/src/components/form/Search/Search.module.css b/packages/react/src/components/form/Search/Search.module.css index f199e16459..53cce0c153 100644 --- a/packages/react/src/components/form/Search/Search.module.css +++ b/packages/react/src/components/form/Search/Search.module.css @@ -40,7 +40,7 @@ position: absolute; height: 100%; z-index: 2; - left: var(--fds-spacing-3); + left: var(--fds-spacing-4); transform: scale(1.5); pointer-events: none; } @@ -111,30 +111,42 @@ z-index: 2; } -.input.small { +.small .input { --f-search-button-clear-size: var(--fds-sizing-4); - height: var(--fds-sizing-8); - padding: 0 var(--fds-spacing-2); + height: var(--fds-sizing-10); + padding: 0 var(--fds-spacing-3); padding-right: 2.5em; } -.input.medium { +.small .icon { + left: var(--fds-spacing-3); +} + +.medium .input { --f-search-button-clear-size: var(--fds-sizing-6); - height: var(--fds-sizing-10); - padding: 0 var(--fds-spacing-3); + height: var(--fds-sizing-12); + padding: 0 var(--fds-spacing-4); padding-right: 2.2em; } -.input.large { +.medium .icon { + left: var(--fds-spacing-4); +} + +.large .input { --f-search-button-clear-size: var(--fds-sizing-12); - height: var(--fds-sizing-12); - padding: 0 var(--fds-spacing-4); + height: var(--fds-sizing-14); + padding: 0 var(--fds-spacing-5); padding-right: 2em; } +.large .icon { + left: var(--fds-spacing-5); +} + .input.simple { padding-left: 2.4em; } diff --git a/packages/react/src/components/form/Search/Search.tsx b/packages/react/src/components/form/Search/Search.tsx index edc177c3f8..51dab9d707 100644 --- a/packages/react/src/components/form/Search/Search.tsx +++ b/packages/react/src/components/form/Search/Search.tsx @@ -132,7 +132,7 @@ export const Search = forwardRef( )}
-
+
{isSimple && ( ( className={cl( classes.input, utilityClasses.focusable, - classes[size], isSimple && classes.simple, !isSimple && classes.withSearchButton, )} diff --git a/packages/react/src/components/form/Switch/Switch.module.css b/packages/react/src/components/form/Switch/Switch.module.css index aef3af494d..6369497b07 100644 --- a/packages/react/src/components/form/Switch/Switch.module.css +++ b/packages/react/src/components/form/Switch/Switch.module.css @@ -102,22 +102,22 @@ .small, .small .label { - min-height: var(--fds-sizing-8); + min-height: var(--fds-sizing-6); } .medium, .medium .label { - min-height: var(--fds-sizing-10); + min-height: var(--fds-sizing-7); } .large, .large .label { - min-height: var(--fds-sizing-12); + min-height: var(--fds-sizing-8); } .small { - --fds-switch-height: 1.5rem; - --fds-switch-width: 2.5rem; + --fds-switch-height: var(--fds-sizing-6); + --fds-switch-width: var(--fds-sizing-11); } .small .input { @@ -126,8 +126,8 @@ } .medium { - --fds-switch-height: 1.75rem; - --fds-switch-width: 3rem; + --fds-switch-height: var(--fds-sizing-7); + --fds-switch-width: var(--fds-sizing-13); } .medium .input { @@ -136,8 +136,8 @@ } .large { - --fds-switch-height: 2rem; - --fds-switch-width: 3.5rem; + --fds-switch-height: var(--fds-sizing-8); + --fds-switch-width: var(--fds-sizing-15); } .large .input { diff --git a/packages/react/src/components/form/Switch/Switch.stories.tsx b/packages/react/src/components/form/Switch/Switch.stories.tsx index bed717bea4..54015977f3 100644 --- a/packages/react/src/components/form/Switch/Switch.stories.tsx +++ b/packages/react/src/components/form/Switch/Switch.stories.tsx @@ -18,6 +18,7 @@ export const Preview: Story = { readOnly: false, size: 'medium', position: 'left', + description: '', }, }; diff --git a/packages/react/src/components/form/Textfield/Textfield.module.css b/packages/react/src/components/form/Textfield/Textfield.module.css index 132afdae0d..88ef87eca5 100644 --- a/packages/react/src/components/form/Textfield/Textfield.module.css +++ b/packages/react/src/components/form/Textfield/Textfield.module.css @@ -52,27 +52,27 @@ } .formField.small .adornment { - padding: 6.5px var(--fds-spacing-3); + padding: var(--fds-sizing-2) var(--fds-spacing-3); } .formField.medium .adornment { - padding: 9px var(--fds-spacing-4); + padding: 0.65rem var(--fds-spacing-4); } .formField.large .adornment { - padding: 11px var(--fds-spacing-5); + padding: 0.85rem var(--fds-spacing-5); } .formField.small .field { - height: var(--fds-sizing-8); + height: var(--fds-sizing-10); } .formField.medium .field { - height: var(--fds-sizing-10); + height: var(--fds-sizing-12); } .formField.large .field { - height: var(--fds-sizing-12); + height: var(--fds-sizing-14); } .label { diff --git a/packages/react/stories/testing.stories.tsx b/packages/react/stories/testing.stories.tsx index d2d151ed68..40074956dc 100644 --- a/packages/react/stories/testing.stories.tsx +++ b/packages/react/stories/testing.stories.tsx @@ -9,6 +9,7 @@ import { Radio, Tag, Combobox, + Chip, type ButtonProps, } from '../src/components'; @@ -37,11 +38,7 @@ export const MediumRow: StoryFn<{ prefix='prefix' suffix='suffix' /> - Switch - + @@ -50,6 +47,7 @@ export const MediumRow: StoryFn<{ Sogndal + Stavanger

@@ -62,6 +60,15 @@ export const MediumRow: StoryFn<{ flexDirection: direction, }} > + Switch + + Toggle + Removable + Tag + - Tag
); diff --git a/packages/theme/CHANGELOG.md b/packages/theme/CHANGELOG.md index 33cc94dc43..2ebde88e37 100644 --- a/packages/theme/CHANGELOG.md +++ b/packages/theme/CHANGELOG.md @@ -3,6 +3,18 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.15.1-alpha.1](https://github.com/digdir/designsystemet/compare/@digdir/designsystemet-theme@0.15.0...@digdir/designsystemet-theme@0.15.1-alpha.1) (2024-04-04) + +### Reverts + +- Revert "🍱 Generated new package tokens" ([afa9a47](https://github.com/digdir/designsystemet/commit/afa9a476483612bd162f23d371d4e467755774c8)) + +## [0.15.1-alpha.0](https://github.com/digdir/designsystemet/compare/@digdir/designsystemet-theme@0.15.0...@digdir/designsystemet-theme@0.15.1-alpha.0) (2024-03-21) + +### Reverts + +- Revert "🍱 Generated new package tokens" ([106c9c7](https://github.com/digdir/designsystemet/commit/106c9c74463696c22846725c67c3ac08e43249b0)) + # [0.15.0](https://github.com/digdir/designsystemet/compare/@digdir/designsystemet-theme@0.14.1...@digdir/designsystemet-theme@0.15.0) (2024-03-20) ### Features diff --git a/packages/theme/brand/altinn/tokens.css b/packages/theme/brand/altinn/tokens.css index 5969797e4b..a72c02e693 100644 --- a/packages/theme/brand/altinn/tokens.css +++ b/packages/theme/brand/altinn/tokens.css @@ -39,7 +39,6 @@ --fds-colors-grey-400: #bcbfc5; --fds-colors-red-800: #5a121d; --fds-colors-purple-700: #7a1265; - --fds-font-size-f0: clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem); /** Tokens */ --fds-brand-alt1-100: #E6EFF8; @@ -220,35 +219,37 @@ --fds-semantic-text-visited-default: var(--fds-colors-purple-700); --fds-semantic-background-default: var(--fds-colors-white); --fds-semantic-background-subtle: var(--fds-colors-grey-100); - --fds-typography-heading-3xlarge: 500 clamp(1.94rem, calc(1.88vw + 1.56rem), 3.16rem)/1.3 'Inter'; - --fds-typography-heading-2xlarge: 500 clamp(1.78rem, calc(1.44vw + 1.49rem), 2.72rem)/1.3 'Inter'; - --fds-typography-heading-xlarge: 500 clamp(1.59rem, calc(1.15vw + 1.36rem), 2.34rem)/1.3 'Inter'; - --fds-typography-heading-large: 500 clamp(1.47rem, calc(0.86vw + 1.30rem), 2.03rem)/1.3 'Inter'; - --fds-typography-heading-medium: 500 clamp(1.34rem, calc(0.63vw + 1.22rem), 1.75rem)/1.3 'Inter'; - --fds-typography-heading-small: 500 clamp(1.22rem, calc(0.43vw + 1.13rem), 1.50rem)/1.3 'Inter'; - --fds-typography-heading-xsmall: 500 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.3 'Inter'; - --fds-typography-heading-xxsmall: 500 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.3 'Inter'; - --fds-typography-ingress-medium: 400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.6 'Inter'; - --fds-typography-paragraph-large: 400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.5 'Inter'; - --fds-typography-paragraph-medium: 400 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.5 'Inter'; - --fds-typography-paragraph-small: 400 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.5 'Inter'; - --fds-typography-paragraph-xsmall: 400 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.5 'Inter'; - --fds-typography-paragraph-short-large: 400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.3 'Inter'; - --fds-typography-paragraph-short-medium: 400 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.3 'Inter'; - --fds-typography-paragraph-short-small: 400 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.3 'Inter'; - --fds-typography-paragraph-short-xsmall: 400 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.3 'Inter'; - --fds-typography-paragraph-long-large: 400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.7 'Inter'; - --fds-typography-paragraph-long-medium: 400 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.7 'Inter'; - --fds-typography-paragraph-long-small: 400 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.7 'Inter'; - --fds-typography-paragraph-long-xsmall: 400 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.7 'Inter'; - --fds-typography-label-large: 500 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.3 'Inter'; - --fds-typography-label-medium: 500 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.3 'Inter'; - --fds-typography-label-small: 500 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.3 'Inter'; - --fds-typography-label-xsmall: 500 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.3 'Inter'; - --fds-typography-error_message-large: 400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.3 'Inter'; - --fds-typography-error_message-medium: 400 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.3 'Inter'; - --fds-typography-error_message-small: 400 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.3 'Inter'; - --fds-typography-error_message-xsmall: 400 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.3 'Inter'; + --fds-typography-heading-2xlarge: 500 3.75rem/1.3 'Inter'; + --fds-typography-heading-xlarge: 500 3rem/1.3 'Inter'; + --fds-typography-heading-large: 500 2.25rem/1.3 'Inter'; + --fds-typography-heading-medium: 500 1.875rem/1.3 'Inter'; + --fds-typography-heading-small: 500 1.5rem/1.3 'Inter'; + --fds-typography-heading-xsmall: 500 1.3125rem/1.3 'Inter'; + --fds-typography-heading-xxsmall: 500 1.125rem/1.3 'Inter'; + --fds-typography-ingress-large: 400 1.875rem/1.6 'Inter'; + --fds-typography-ingress-medium: 400 1.5rem/1.6 'Inter'; + --fds-typography-ingress-small: 400 1.3125rem/1.6 'Inter'; + --fds-typography-ingress-xsmall: 400 1.125rem/1.6 'Inter'; + --fds-typography-paragraph-large: 400 1.3125rem/1.5 'Inter'; + --fds-typography-paragraph-medium: 400 1.125rem/1.5 'Inter'; + --fds-typography-paragraph-small: 400 1rem/1.5 'Inter'; + --fds-typography-paragraph-xsmall: 400 0.875rem/1.5 'Inter'; + --fds-typography-paragraph-short-large: 400 1.3125rem/1.3 'Inter'; + --fds-typography-paragraph-short-medium: 400 1.125rem/1.3 'Inter'; + --fds-typography-paragraph-short-small: 400 1rem/1.3 'Inter'; + --fds-typography-paragraph-short-xsmall: 400 0.875rem/1.3 'Inter'; + --fds-typography-paragraph-long-large: 400 1.125rem/1.7 'Inter'; + --fds-typography-paragraph-long-medium: 400 1rem/1.7 'Inter'; + --fds-typography-paragraph-long-small: 400 0.875rem/1.7 'Inter'; + --fds-typography-paragraph-long-xsmall: 400 0.8125rem/1.7 'Inter'; + --fds-typography-label-large: 500 1.3125rem/1.3 'Inter'; + --fds-typography-label-medium: 500 1.125rem/1.3 'Inter'; + --fds-typography-label-small: 500 1rem/1.3 'Inter'; + --fds-typography-label-xsmall: 500 0.875rem/1.3 'Inter'; + --fds-typography-error_message-large: 400 1.3125rem/1.3 'Inter'; + --fds-typography-error_message-medium: 400 1.125rem/1.3 'Inter'; + --fds-typography-error_message-small: 400 1rem/1.3 'Inter'; + --fds-typography-error_message-xsmall: 400 0.875rem/1.3 'Inter'; --fds-typography-interactive-large: 400 1.5rem/1.3 'Inter'; --fds-typography-interactive-medium: 400 1.125rem/1.3 'Inter'; --fds-typography-interactive-small: 400 1rem/1.3 'Inter'; @@ -262,38 +263,47 @@ --fds-border_radius-xxxlarge: 24px; --fds-border_radius-xxxxlarge: 32px; --fds-border_radius-full: 9999px; - --fds-spacing-0: calc(0); - --fds-spacing-1: calc(var(--fds-base_spacing)/16*var(--fds-font-size-f0)); - --fds-spacing-2: calc(var(--fds-base_spacing)*2/16*var(--fds-font-size-f0)); - --fds-spacing-3: calc(var(--fds-base_spacing)*3/16*var(--fds-font-size-f0)); - --fds-spacing-4: calc(var(--fds-base_spacing)*4/16*var(--fds-font-size-f0)); - --fds-spacing-5: calc(var(--fds-base_spacing)*5/16*var(--fds-font-size-f0)); - --fds-spacing-6: calc(var(--fds-base_spacing)*6/16*var(--fds-font-size-f0)); - --fds-spacing-7: calc(var(--fds-base_spacing)*7/16*var(--fds-font-size-f0)); - --fds-spacing-8: calc((var(--fds-base_spacing)*8/16)*var(--fds-font-size-f0)); - --fds-spacing-10: calc((var(--fds-base_spacing)*10/16)*var(--fds-font-size-f0)); - --fds-spacing-12: calc((var(--fds-base_spacing)*12/16)*var(--fds-font-size-f0)); - --fds-spacing-14: calc((var(--fds-base_spacing)*14/16)*var(--fds-font-size-f0)); - --fds-spacing-18: calc((var(--fds-base_spacing)*18/16)*var(--fds-font-size-f0)); - --fds-spacing-22: calc((var(--fds-base_spacing)*22/16)*var(--fds-font-size-f0)); - --fds-spacing-26: calc((var(--fds-base_spacing)*26/16)*var(--fds-font-size-f0)); - --fds-spacing-30: calc((var(--fds-base_spacing)*30/16)*var(--fds-font-size-f0)); + --fds-spacing-0: 0rem; + --fds-spacing-1: 0.25rem; + --fds-spacing-2: 0.5rem; + --fds-spacing-3: 0.75rem; + --fds-spacing-4: 1rem; + --fds-spacing-5: 1.25rem; + --fds-spacing-6: 1.5rem; + --fds-spacing-7: 1.75rem; + --fds-spacing-8: 2rem; + --fds-spacing-9: 2.25rem; + --fds-spacing-10: 2.5rem; + --fds-spacing-11: 2.75rem; + --fds-spacing-12: 3rem; + --fds-spacing-13: 3.25rem; + --fds-spacing-14: 3.5rem; + --fds-spacing-15: 3.75rem; + --fds-spacing-18: 4.5rem; + --fds-spacing-22: 5.5rem; + --fds-spacing-26: 6.5rem; + --fds-spacing-30: 7.5rem; --fds-base_spacing: 4; - --fds-sizing-1: calc(var(--fds-base_sizing)/16*var(--fds-font-size-f0)); - --fds-sizing-2: calc(var(--fds-base_sizing)*2/16*var(--fds-font-size-f0)); - --fds-sizing-3: calc(var(--fds-base_sizing)*3/16*var(--fds-font-size-f0)); - --fds-sizing-4: calc(var(--fds-base_sizing)*4/16*var(--fds-font-size-f0)); - --fds-sizing-5: calc(var(--fds-base_sizing)*5/16*var(--fds-font-size-f0)); - --fds-sizing-6: calc(var(--fds-base_sizing)*6/16*var(--fds-font-size-f0)); - --fds-sizing-7: calc(var(--fds-base_sizing)*7/16*var(--fds-font-size-f0)); - --fds-sizing-8: calc(var(--fds-base_sizing)*8/16*var(--fds-font-size-f0)); - --fds-sizing-10: calc(var(--fds-base_sizing)*10/16*var(--fds-font-size-f0)); - --fds-sizing-12: calc((var(--fds-base_sizing)*12/16)*var(--fds-font-size-f0)); - --fds-sizing-14: calc((var(--fds-base_sizing)*14/16)*var(--fds-font-size-f0)); - --fds-sizing-18: calc((var(--fds-base_sizing)*18/16)*var(--fds-font-size-f0)); - --fds-sizing-22: calc((var(--fds-base_sizing)*22/16)*var(--fds-font-size-f0)); - --fds-sizing-26: calc((var(--fds-base_sizing)*26/16)*var(--fds-font-size-f0)); - --fds-sizing-30: calc((var(--fds-base_sizing)*30/16)*var(--fds-font-size-f0)); + --fds-sizing-0: 0rem; + --fds-sizing-1: 0.25rem; + --fds-sizing-2: 0.5rem; + --fds-sizing-3: 0.75rem; + --fds-sizing-4: 1rem; + --fds-sizing-5: 1.25rem; + --fds-sizing-6: 1.5rem; + --fds-sizing-7: 1.75rem; + --fds-sizing-8: 2rem; + --fds-sizing-9: 2.25rem; + --fds-sizing-10: 2.5rem; + --fds-sizing-11: 2.75rem; + --fds-sizing-12: 3rem; + --fds-sizing-13: 3.25rem; + --fds-sizing-14: 3.5rem; + --fds-sizing-15: 3.75rem; + --fds-sizing-18: 4.5rem; + --fds-sizing-22: 5.5rem; + --fds-sizing-26: 6.5rem; + --fds-sizing-30: 7.5rem; --fds-base_sizing: 4; --fds-border_width-default: 1px; --fds-border_width-active: 2px; diff --git a/packages/theme/brand/brreg/tokens.css b/packages/theme/brand/brreg/tokens.css index 9bd270a6f5..4476f25063 100644 --- a/packages/theme/brand/brreg/tokens.css +++ b/packages/theme/brand/brreg/tokens.css @@ -39,7 +39,6 @@ --fds-colors-grey-400: #bcbfc5; --fds-colors-red-800: #5a121d; --fds-colors-purple-700: #7a1265; - --fds-font-size-f0: clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem); /** Tokens */ --fds-brand-alt1-50: #FFFFFF; @@ -226,35 +225,37 @@ --fds-semantic-text-visited-default: var(--fds-colors-purple-700); --fds-semantic-background-default: var(--fds-colors-white); --fds-semantic-background-subtle: var(--fds-colors-grey-100); - --fds-typography-heading-3xlarge: 500 clamp(1.94rem, calc(1.88vw + 1.56rem), 3.16rem)/1.3 'Inter'; - --fds-typography-heading-2xlarge: 500 clamp(1.78rem, calc(1.44vw + 1.49rem), 2.72rem)/1.3 'Inter'; - --fds-typography-heading-xlarge: 500 clamp(1.59rem, calc(1.15vw + 1.36rem), 2.34rem)/1.3 'Inter'; - --fds-typography-heading-large: 500 clamp(1.47rem, calc(0.86vw + 1.30rem), 2.03rem)/1.3 'Inter'; - --fds-typography-heading-medium: 500 clamp(1.34rem, calc(0.63vw + 1.22rem), 1.75rem)/1.3 'Inter'; - --fds-typography-heading-small: 500 clamp(1.22rem, calc(0.43vw + 1.13rem), 1.50rem)/1.3 'Inter'; - --fds-typography-heading-xsmall: 500 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.3 'Inter'; - --fds-typography-heading-xxsmall: 500 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.3 'Inter'; - --fds-typography-ingress-medium: 400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.6 'Inter'; - --fds-typography-paragraph-large: 400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.5 'Inter'; - --fds-typography-paragraph-medium: 400 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.5 'Inter'; - --fds-typography-paragraph-small: 400 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.5 'Inter'; - --fds-typography-paragraph-xsmall: 400 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.5 'Inter'; - --fds-typography-paragraph-short-large: 400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.3 'Inter'; - --fds-typography-paragraph-short-medium: 400 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.3 'Inter'; - --fds-typography-paragraph-short-small: 400 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.3 'Inter'; - --fds-typography-paragraph-short-xsmall: 400 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.3 'Inter'; - --fds-typography-paragraph-long-large: 400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.7 'Inter'; - --fds-typography-paragraph-long-medium: 400 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.7 'Inter'; - --fds-typography-paragraph-long-small: 400 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.7 'Inter'; - --fds-typography-paragraph-long-xsmall: 400 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.7 'Inter'; - --fds-typography-label-large: 500 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.3 'Inter'; - --fds-typography-label-medium: 500 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.3 'Inter'; - --fds-typography-label-small: 500 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.3 'Inter'; - --fds-typography-label-xsmall: 500 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.3 'Inter'; - --fds-typography-error_message-large: 400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.3 'Inter'; - --fds-typography-error_message-medium: 400 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.3 'Inter'; - --fds-typography-error_message-small: 400 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.3 'Inter'; - --fds-typography-error_message-xsmall: 400 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.3 'Inter'; + --fds-typography-heading-2xlarge: 500 3.75rem/1.3 'Inter'; + --fds-typography-heading-xlarge: 500 3rem/1.3 'Inter'; + --fds-typography-heading-large: 500 2.25rem/1.3 'Inter'; + --fds-typography-heading-medium: 500 1.875rem/1.3 'Inter'; + --fds-typography-heading-small: 500 1.5rem/1.3 'Inter'; + --fds-typography-heading-xsmall: 500 1.3125rem/1.3 'Inter'; + --fds-typography-heading-xxsmall: 500 1.125rem/1.3 'Inter'; + --fds-typography-ingress-large: 400 1.875rem/1.6 'Inter'; + --fds-typography-ingress-medium: 400 1.5rem/1.6 'Inter'; + --fds-typography-ingress-small: 400 1.3125rem/1.6 'Inter'; + --fds-typography-ingress-xsmall: 400 1.125rem/1.6 'Inter'; + --fds-typography-paragraph-large: 400 1.3125rem/1.5 'Inter'; + --fds-typography-paragraph-medium: 400 1.125rem/1.5 'Inter'; + --fds-typography-paragraph-small: 400 1rem/1.5 'Inter'; + --fds-typography-paragraph-xsmall: 400 0.875rem/1.5 'Inter'; + --fds-typography-paragraph-short-large: 400 1.3125rem/1.3 'Inter'; + --fds-typography-paragraph-short-medium: 400 1.125rem/1.3 'Inter'; + --fds-typography-paragraph-short-small: 400 1rem/1.3 'Inter'; + --fds-typography-paragraph-short-xsmall: 400 0.875rem/1.3 'Inter'; + --fds-typography-paragraph-long-large: 400 1.125rem/1.7 'Inter'; + --fds-typography-paragraph-long-medium: 400 1rem/1.7 'Inter'; + --fds-typography-paragraph-long-small: 400 0.875rem/1.7 'Inter'; + --fds-typography-paragraph-long-xsmall: 400 0.8125rem/1.7 'Inter'; + --fds-typography-label-large: 500 1.3125rem/1.3 'Inter'; + --fds-typography-label-medium: 500 1.125rem/1.3 'Inter'; + --fds-typography-label-small: 500 1rem/1.3 'Inter'; + --fds-typography-label-xsmall: 500 0.875rem/1.3 'Inter'; + --fds-typography-error_message-large: 400 1.3125rem/1.3 'Inter'; + --fds-typography-error_message-medium: 400 1.125rem/1.3 'Inter'; + --fds-typography-error_message-small: 400 1rem/1.3 'Inter'; + --fds-typography-error_message-xsmall: 400 0.875rem/1.3 'Inter'; --fds-typography-interactive-large: 400 1.5rem/1.3 'Inter'; --fds-typography-interactive-medium: 400 1.125rem/1.3 'Inter'; --fds-typography-interactive-small: 400 1rem/1.3 'Inter'; @@ -268,38 +269,47 @@ --fds-border_radius-xxxlarge: 24px; --fds-border_radius-xxxxlarge: 32px; --fds-border_radius-full: 9999px; - --fds-spacing-0: calc(0); - --fds-spacing-1: calc(var(--fds-base_spacing)/16*var(--fds-font-size-f0)); - --fds-spacing-2: calc(var(--fds-base_spacing)*2/16*var(--fds-font-size-f0)); - --fds-spacing-3: calc(var(--fds-base_spacing)*3/16*var(--fds-font-size-f0)); - --fds-spacing-4: calc(var(--fds-base_spacing)*4/16*var(--fds-font-size-f0)); - --fds-spacing-5: calc(var(--fds-base_spacing)*5/16*var(--fds-font-size-f0)); - --fds-spacing-6: calc(var(--fds-base_spacing)*6/16*var(--fds-font-size-f0)); - --fds-spacing-7: calc(var(--fds-base_spacing)*7/16*var(--fds-font-size-f0)); - --fds-spacing-8: calc((var(--fds-base_spacing)*8/16)*var(--fds-font-size-f0)); - --fds-spacing-10: calc((var(--fds-base_spacing)*10/16)*var(--fds-font-size-f0)); - --fds-spacing-12: calc((var(--fds-base_spacing)*12/16)*var(--fds-font-size-f0)); - --fds-spacing-14: calc((var(--fds-base_spacing)*14/16)*var(--fds-font-size-f0)); - --fds-spacing-18: calc((var(--fds-base_spacing)*18/16)*var(--fds-font-size-f0)); - --fds-spacing-22: calc((var(--fds-base_spacing)*22/16)*var(--fds-font-size-f0)); - --fds-spacing-26: calc((var(--fds-base_spacing)*26/16)*var(--fds-font-size-f0)); - --fds-spacing-30: calc((var(--fds-base_spacing)*30/16)*var(--fds-font-size-f0)); + --fds-spacing-0: 0rem; + --fds-spacing-1: 0.25rem; + --fds-spacing-2: 0.5rem; + --fds-spacing-3: 0.75rem; + --fds-spacing-4: 1rem; + --fds-spacing-5: 1.25rem; + --fds-spacing-6: 1.5rem; + --fds-spacing-7: 1.75rem; + --fds-spacing-8: 2rem; + --fds-spacing-9: 2.25rem; + --fds-spacing-10: 2.5rem; + --fds-spacing-11: 2.75rem; + --fds-spacing-12: 3rem; + --fds-spacing-13: 3.25rem; + --fds-spacing-14: 3.5rem; + --fds-spacing-15: 3.75rem; + --fds-spacing-18: 4.5rem; + --fds-spacing-22: 5.5rem; + --fds-spacing-26: 6.5rem; + --fds-spacing-30: 7.5rem; --fds-base_spacing: 4; - --fds-sizing-1: calc(var(--fds-base_sizing)/16*var(--fds-font-size-f0)); - --fds-sizing-2: calc(var(--fds-base_sizing)*2/16*var(--fds-font-size-f0)); - --fds-sizing-3: calc(var(--fds-base_sizing)*3/16*var(--fds-font-size-f0)); - --fds-sizing-4: calc(var(--fds-base_sizing)*4/16*var(--fds-font-size-f0)); - --fds-sizing-5: calc(var(--fds-base_sizing)*5/16*var(--fds-font-size-f0)); - --fds-sizing-6: calc(var(--fds-base_sizing)*6/16*var(--fds-font-size-f0)); - --fds-sizing-7: calc(var(--fds-base_sizing)*7/16*var(--fds-font-size-f0)); - --fds-sizing-8: calc(var(--fds-base_sizing)*8/16*var(--fds-font-size-f0)); - --fds-sizing-10: calc(var(--fds-base_sizing)*10/16*var(--fds-font-size-f0)); - --fds-sizing-12: calc((var(--fds-base_sizing)*12/16)*var(--fds-font-size-f0)); - --fds-sizing-14: calc((var(--fds-base_sizing)*14/16)*var(--fds-font-size-f0)); - --fds-sizing-18: calc((var(--fds-base_sizing)*18/16)*var(--fds-font-size-f0)); - --fds-sizing-22: calc((var(--fds-base_sizing)*22/16)*var(--fds-font-size-f0)); - --fds-sizing-26: calc((var(--fds-base_sizing)*26/16)*var(--fds-font-size-f0)); - --fds-sizing-30: calc((var(--fds-base_sizing)*30/16)*var(--fds-font-size-f0)); + --fds-sizing-0: 0rem; + --fds-sizing-1: 0.25rem; + --fds-sizing-2: 0.5rem; + --fds-sizing-3: 0.75rem; + --fds-sizing-4: 1rem; + --fds-sizing-5: 1.25rem; + --fds-sizing-6: 1.5rem; + --fds-sizing-7: 1.75rem; + --fds-sizing-8: 2rem; + --fds-sizing-9: 2.25rem; + --fds-sizing-10: 2.5rem; + --fds-sizing-11: 2.75rem; + --fds-sizing-12: 3rem; + --fds-sizing-13: 3.25rem; + --fds-sizing-14: 3.5rem; + --fds-sizing-15: 3.75rem; + --fds-sizing-18: 4.5rem; + --fds-sizing-22: 5.5rem; + --fds-sizing-26: 6.5rem; + --fds-sizing-30: 7.5rem; --fds-base_sizing: 4; --fds-border_width-default: 1px; --fds-border_width-active: 2px; diff --git a/packages/theme/brand/digdir/tokens.css b/packages/theme/brand/digdir/tokens.css index f77f2d84b2..7cdd2a6e5d 100644 --- a/packages/theme/brand/digdir/tokens.css +++ b/packages/theme/brand/digdir/tokens.css @@ -39,7 +39,6 @@ --fds-colors-grey-400: #bcbfc5; --fds-colors-red-800: #5a121d; --fds-colors-purple-700: #7a1265; - --fds-font-size-f0: clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem); /** Tokens */ --fds-brand-alt1-100: #feefef; @@ -220,35 +219,37 @@ --fds-semantic-text-visited-default: var(--fds-colors-purple-700); --fds-semantic-background-default: var(--fds-colors-white); --fds-semantic-background-subtle: var(--fds-colors-grey-100); - --fds-typography-heading-3xlarge: 500 clamp(1.94rem, calc(1.88vw + 1.56rem), 3.16rem)/1.3 'Inter'; - --fds-typography-heading-2xlarge: 500 clamp(1.78rem, calc(1.44vw + 1.49rem), 2.72rem)/1.3 'Inter'; - --fds-typography-heading-xlarge: 500 clamp(1.59rem, calc(1.15vw + 1.36rem), 2.34rem)/1.3 'Inter'; - --fds-typography-heading-large: 500 clamp(1.47rem, calc(0.86vw + 1.30rem), 2.03rem)/1.3 'Inter'; - --fds-typography-heading-medium: 500 clamp(1.34rem, calc(0.63vw + 1.22rem), 1.75rem)/1.3 'Inter'; - --fds-typography-heading-small: 500 clamp(1.22rem, calc(0.43vw + 1.13rem), 1.50rem)/1.3 'Inter'; - --fds-typography-heading-xsmall: 500 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.3 'Inter'; - --fds-typography-heading-xxsmall: 500 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.3 'Inter'; - --fds-typography-ingress-medium: 400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.6 'Inter'; - --fds-typography-paragraph-large: 400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.5 'Inter'; - --fds-typography-paragraph-medium: 400 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.5 'Inter'; - --fds-typography-paragraph-small: 400 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.5 'Inter'; - --fds-typography-paragraph-xsmall: 400 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.5 'Inter'; - --fds-typography-paragraph-short-large: 400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.3 'Inter'; - --fds-typography-paragraph-short-medium: 400 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.3 'Inter'; - --fds-typography-paragraph-short-small: 400 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.3 'Inter'; - --fds-typography-paragraph-short-xsmall: 400 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.3 'Inter'; - --fds-typography-paragraph-long-large: 400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.7 'Inter'; - --fds-typography-paragraph-long-medium: 400 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.7 'Inter'; - --fds-typography-paragraph-long-small: 400 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.7 'Inter'; - --fds-typography-paragraph-long-xsmall: 400 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.7 'Inter'; - --fds-typography-label-large: 500 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.3 'Inter'; - --fds-typography-label-medium: 500 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.3 'Inter'; - --fds-typography-label-small: 500 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.3 'Inter'; - --fds-typography-label-xsmall: 500 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.3 'Inter'; - --fds-typography-error_message-large: 400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.3 'Inter'; - --fds-typography-error_message-medium: 400 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.3 'Inter'; - --fds-typography-error_message-small: 400 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.3 'Inter'; - --fds-typography-error_message-xsmall: 400 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.3 'Inter'; + --fds-typography-heading-2xlarge: 500 3.75rem/1.3 'Inter'; + --fds-typography-heading-xlarge: 500 3rem/1.3 'Inter'; + --fds-typography-heading-large: 500 2.25rem/1.3 'Inter'; + --fds-typography-heading-medium: 500 1.875rem/1.3 'Inter'; + --fds-typography-heading-small: 500 1.5rem/1.3 'Inter'; + --fds-typography-heading-xsmall: 500 1.3125rem/1.3 'Inter'; + --fds-typography-heading-xxsmall: 500 1.125rem/1.3 'Inter'; + --fds-typography-ingress-large: 400 1.875rem/1.6 'Inter'; + --fds-typography-ingress-medium: 400 1.5rem/1.6 'Inter'; + --fds-typography-ingress-small: 400 1.3125rem/1.6 'Inter'; + --fds-typography-ingress-xsmall: 400 1.125rem/1.6 'Inter'; + --fds-typography-paragraph-large: 400 1.3125rem/1.5 'Inter'; + --fds-typography-paragraph-medium: 400 1.125rem/1.5 'Inter'; + --fds-typography-paragraph-small: 400 1rem/1.5 'Inter'; + --fds-typography-paragraph-xsmall: 400 0.875rem/1.5 'Inter'; + --fds-typography-paragraph-short-large: 400 1.3125rem/1.3 'Inter'; + --fds-typography-paragraph-short-medium: 400 1.125rem/1.3 'Inter'; + --fds-typography-paragraph-short-small: 400 1rem/1.3 'Inter'; + --fds-typography-paragraph-short-xsmall: 400 0.875rem/1.3 'Inter'; + --fds-typography-paragraph-long-large: 400 1.125rem/1.7 'Inter'; + --fds-typography-paragraph-long-medium: 400 1rem/1.7 'Inter'; + --fds-typography-paragraph-long-small: 400 0.875rem/1.7 'Inter'; + --fds-typography-paragraph-long-xsmall: 400 0.8125rem/1.7 'Inter'; + --fds-typography-label-large: 500 1.3125rem/1.3 'Inter'; + --fds-typography-label-medium: 500 1.125rem/1.3 'Inter'; + --fds-typography-label-small: 500 1rem/1.3 'Inter'; + --fds-typography-label-xsmall: 500 0.875rem/1.3 'Inter'; + --fds-typography-error_message-large: 400 1.3125rem/1.3 'Inter'; + --fds-typography-error_message-medium: 400 1.125rem/1.3 'Inter'; + --fds-typography-error_message-small: 400 1rem/1.3 'Inter'; + --fds-typography-error_message-xsmall: 400 0.875rem/1.3 'Inter'; --fds-typography-interactive-large: 400 1.5rem/1.3 'Inter'; --fds-typography-interactive-medium: 400 1.125rem/1.3 'Inter'; --fds-typography-interactive-small: 400 1rem/1.3 'Inter'; @@ -262,38 +263,47 @@ --fds-border_radius-xxxlarge: 24px; --fds-border_radius-xxxxlarge: 32px; --fds-border_radius-full: 9999px; - --fds-spacing-0: calc(0); - --fds-spacing-1: calc(var(--fds-base_spacing)/16*var(--fds-font-size-f0)); - --fds-spacing-2: calc(var(--fds-base_spacing)*2/16*var(--fds-font-size-f0)); - --fds-spacing-3: calc(var(--fds-base_spacing)*3/16*var(--fds-font-size-f0)); - --fds-spacing-4: calc(var(--fds-base_spacing)*4/16*var(--fds-font-size-f0)); - --fds-spacing-5: calc(var(--fds-base_spacing)*5/16*var(--fds-font-size-f0)); - --fds-spacing-6: calc(var(--fds-base_spacing)*6/16*var(--fds-font-size-f0)); - --fds-spacing-7: calc(var(--fds-base_spacing)*7/16*var(--fds-font-size-f0)); - --fds-spacing-8: calc((var(--fds-base_spacing)*8/16)*var(--fds-font-size-f0)); - --fds-spacing-10: calc((var(--fds-base_spacing)*10/16)*var(--fds-font-size-f0)); - --fds-spacing-12: calc((var(--fds-base_spacing)*12/16)*var(--fds-font-size-f0)); - --fds-spacing-14: calc((var(--fds-base_spacing)*14/16)*var(--fds-font-size-f0)); - --fds-spacing-18: calc((var(--fds-base_spacing)*18/16)*var(--fds-font-size-f0)); - --fds-spacing-22: calc((var(--fds-base_spacing)*22/16)*var(--fds-font-size-f0)); - --fds-spacing-26: calc((var(--fds-base_spacing)*26/16)*var(--fds-font-size-f0)); - --fds-spacing-30: calc((var(--fds-base_spacing)*30/16)*var(--fds-font-size-f0)); + --fds-spacing-0: 0rem; + --fds-spacing-1: 0.25rem; + --fds-spacing-2: 0.5rem; + --fds-spacing-3: 0.75rem; + --fds-spacing-4: 1rem; + --fds-spacing-5: 1.25rem; + --fds-spacing-6: 1.5rem; + --fds-spacing-7: 1.75rem; + --fds-spacing-8: 2rem; + --fds-spacing-9: 2.25rem; + --fds-spacing-10: 2.5rem; + --fds-spacing-11: 2.75rem; + --fds-spacing-12: 3rem; + --fds-spacing-13: 3.25rem; + --fds-spacing-14: 3.5rem; + --fds-spacing-15: 3.75rem; + --fds-spacing-18: 4.5rem; + --fds-spacing-22: 5.5rem; + --fds-spacing-26: 6.5rem; + --fds-spacing-30: 7.5rem; --fds-base_spacing: 4; - --fds-sizing-1: calc(var(--fds-base_sizing)/16*var(--fds-font-size-f0)); - --fds-sizing-2: calc(var(--fds-base_sizing)*2/16*var(--fds-font-size-f0)); - --fds-sizing-3: calc(var(--fds-base_sizing)*3/16*var(--fds-font-size-f0)); - --fds-sizing-4: calc(var(--fds-base_sizing)*4/16*var(--fds-font-size-f0)); - --fds-sizing-5: calc(var(--fds-base_sizing)*5/16*var(--fds-font-size-f0)); - --fds-sizing-6: calc(var(--fds-base_sizing)*6/16*var(--fds-font-size-f0)); - --fds-sizing-7: calc(var(--fds-base_sizing)*7/16*var(--fds-font-size-f0)); - --fds-sizing-8: calc(var(--fds-base_sizing)*8/16*var(--fds-font-size-f0)); - --fds-sizing-10: calc(var(--fds-base_sizing)*10/16*var(--fds-font-size-f0)); - --fds-sizing-12: calc((var(--fds-base_sizing)*12/16)*var(--fds-font-size-f0)); - --fds-sizing-14: calc((var(--fds-base_sizing)*14/16)*var(--fds-font-size-f0)); - --fds-sizing-18: calc((var(--fds-base_sizing)*18/16)*var(--fds-font-size-f0)); - --fds-sizing-22: calc((var(--fds-base_sizing)*22/16)*var(--fds-font-size-f0)); - --fds-sizing-26: calc((var(--fds-base_sizing)*26/16)*var(--fds-font-size-f0)); - --fds-sizing-30: calc((var(--fds-base_sizing)*30/16)*var(--fds-font-size-f0)); + --fds-sizing-0: 0rem; + --fds-sizing-1: 0.25rem; + --fds-sizing-2: 0.5rem; + --fds-sizing-3: 0.75rem; + --fds-sizing-4: 1rem; + --fds-sizing-5: 1.25rem; + --fds-sizing-6: 1.5rem; + --fds-sizing-7: 1.75rem; + --fds-sizing-8: 2rem; + --fds-sizing-9: 2.25rem; + --fds-sizing-10: 2.5rem; + --fds-sizing-11: 2.75rem; + --fds-sizing-12: 3rem; + --fds-sizing-13: 3.25rem; + --fds-sizing-14: 3.5rem; + --fds-sizing-15: 3.75rem; + --fds-sizing-18: 4.5rem; + --fds-sizing-22: 5.5rem; + --fds-sizing-26: 6.5rem; + --fds-sizing-30: 7.5rem; --fds-base_sizing: 4; --fds-border_width-default: 1px; --fds-border_width-active: 2px; diff --git a/packages/theme/brand/tilsynet/tokens.css b/packages/theme/brand/tilsynet/tokens.css index 7070942048..c3defca4a4 100644 --- a/packages/theme/brand/tilsynet/tokens.css +++ b/packages/theme/brand/tilsynet/tokens.css @@ -39,7 +39,6 @@ --fds-colors-grey-400: #bcbfc5; --fds-colors-red-800: #5a121d; --fds-colors-purple-700: #7a1265; - --fds-font-size-f0: clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem); /** Tokens */ --fds-brand-alt1-100: #efeffb; @@ -220,35 +219,37 @@ --fds-semantic-text-visited-default: var(--fds-colors-purple-700); --fds-semantic-background-default: var(--fds-colors-white); --fds-semantic-background-subtle: var(--fds-colors-grey-100); - --fds-typography-heading-3xlarge: 500 clamp(1.94rem, calc(1.88vw + 1.56rem), 3.16rem)/1.3 'Inter'; - --fds-typography-heading-2xlarge: 500 clamp(1.78rem, calc(1.44vw + 1.49rem), 2.72rem)/1.3 'Inter'; - --fds-typography-heading-xlarge: 500 clamp(1.59rem, calc(1.15vw + 1.36rem), 2.34rem)/1.3 'Inter'; - --fds-typography-heading-large: 500 clamp(1.47rem, calc(0.86vw + 1.30rem), 2.03rem)/1.3 'Inter'; - --fds-typography-heading-medium: 500 clamp(1.34rem, calc(0.63vw + 1.22rem), 1.75rem)/1.3 'Inter'; - --fds-typography-heading-small: 500 clamp(1.22rem, calc(0.43vw + 1.13rem), 1.50rem)/1.3 'Inter'; - --fds-typography-heading-xsmall: 500 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.3 'Inter'; - --fds-typography-heading-xxsmall: 500 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.3 'Inter'; - --fds-typography-ingress-medium: 400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.6 'Inter'; - --fds-typography-paragraph-large: 400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.5 'Inter'; - --fds-typography-paragraph-medium: 400 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.5 'Inter'; - --fds-typography-paragraph-small: 400 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.5 'Inter'; - --fds-typography-paragraph-xsmall: 400 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.5 'Inter'; - --fds-typography-paragraph-short-large: 400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.3 'Inter'; - --fds-typography-paragraph-short-medium: 400 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.3 'Inter'; - --fds-typography-paragraph-short-small: 400 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.3 'Inter'; - --fds-typography-paragraph-short-xsmall: 400 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.3 'Inter'; - --fds-typography-paragraph-long-large: 400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.7 'Inter'; - --fds-typography-paragraph-long-medium: 400 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.7 'Inter'; - --fds-typography-paragraph-long-small: 400 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.7 'Inter'; - --fds-typography-paragraph-long-xsmall: 400 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.7 'Inter'; - --fds-typography-label-large: 500 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.3 'Inter'; - --fds-typography-label-medium: 500 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.3 'Inter'; - --fds-typography-label-small: 500 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.3 'Inter'; - --fds-typography-label-xsmall: 500 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.3 'Inter'; - --fds-typography-error_message-large: 400 clamp(1.09rem, calc(0.34vw + 1.03rem), 1.31rem)/1.3 'Inter'; - --fds-typography-error_message-medium: 400 clamp(1.00rem, calc(0.19vw + 0.96rem), 1.13rem)/1.3 'Inter'; - --fds-typography-error_message-small: 400 clamp(0.91rem, calc(0.10vw + 0.89rem), 0.97rem)/1.3 'Inter'; - --fds-typography-error_message-xsmall: 400 clamp(0.81rem, calc(0.05vw + 0.80rem), 0.84rem)/1.3 'Inter'; + --fds-typography-heading-2xlarge: 500 3.75rem/1.3 'Inter'; + --fds-typography-heading-xlarge: 500 3rem/1.3 'Inter'; + --fds-typography-heading-large: 500 2.25rem/1.3 'Inter'; + --fds-typography-heading-medium: 500 1.875rem/1.3 'Inter'; + --fds-typography-heading-small: 500 1.5rem/1.3 'Inter'; + --fds-typography-heading-xsmall: 500 1.3125rem/1.3 'Inter'; + --fds-typography-heading-xxsmall: 500 1.125rem/1.3 'Inter'; + --fds-typography-ingress-large: 400 1.875rem/1.6 'Inter'; + --fds-typography-ingress-medium: 400 1.5rem/1.6 'Inter'; + --fds-typography-ingress-small: 400 1.3125rem/1.6 'Inter'; + --fds-typography-ingress-xsmall: 400 1.125rem/1.6 'Inter'; + --fds-typography-paragraph-large: 400 1.3125rem/1.5 'Inter'; + --fds-typography-paragraph-medium: 400 1.125rem/1.5 'Inter'; + --fds-typography-paragraph-small: 400 1rem/1.5 'Inter'; + --fds-typography-paragraph-xsmall: 400 0.875rem/1.5 'Inter'; + --fds-typography-paragraph-short-large: 400 1.3125rem/1.3 'Inter'; + --fds-typography-paragraph-short-medium: 400 1.125rem/1.3 'Inter'; + --fds-typography-paragraph-short-small: 400 1rem/1.3 'Inter'; + --fds-typography-paragraph-short-xsmall: 400 0.875rem/1.3 'Inter'; + --fds-typography-paragraph-long-large: 400 1.125rem/1.7 'Inter'; + --fds-typography-paragraph-long-medium: 400 1rem/1.7 'Inter'; + --fds-typography-paragraph-long-small: 400 0.875rem/1.7 'Inter'; + --fds-typography-paragraph-long-xsmall: 400 0.8125rem/1.7 'Inter'; + --fds-typography-label-large: 500 1.3125rem/1.3 'Inter'; + --fds-typography-label-medium: 500 1.125rem/1.3 'Inter'; + --fds-typography-label-small: 500 1rem/1.3 'Inter'; + --fds-typography-label-xsmall: 500 0.875rem/1.3 'Inter'; + --fds-typography-error_message-large: 400 1.3125rem/1.3 'Inter'; + --fds-typography-error_message-medium: 400 1.125rem/1.3 'Inter'; + --fds-typography-error_message-small: 400 1rem/1.3 'Inter'; + --fds-typography-error_message-xsmall: 400 0.875rem/1.3 'Inter'; --fds-typography-interactive-large: 400 1.5rem/1.3 'Inter'; --fds-typography-interactive-medium: 400 1.125rem/1.3 'Inter'; --fds-typography-interactive-small: 400 1rem/1.3 'Inter'; @@ -262,38 +263,47 @@ --fds-border_radius-xxxlarge: 24px; --fds-border_radius-xxxxlarge: 32px; --fds-border_radius-full: 9999px; - --fds-spacing-0: calc(0); - --fds-spacing-1: calc(var(--fds-base_spacing)/16*var(--fds-font-size-f0)); - --fds-spacing-2: calc(var(--fds-base_spacing)*2/16*var(--fds-font-size-f0)); - --fds-spacing-3: calc(var(--fds-base_spacing)*3/16*var(--fds-font-size-f0)); - --fds-spacing-4: calc(var(--fds-base_spacing)*4/16*var(--fds-font-size-f0)); - --fds-spacing-5: calc(var(--fds-base_spacing)*5/16*var(--fds-font-size-f0)); - --fds-spacing-6: calc(var(--fds-base_spacing)*6/16*var(--fds-font-size-f0)); - --fds-spacing-7: calc(var(--fds-base_spacing)*7/16*var(--fds-font-size-f0)); - --fds-spacing-8: calc((var(--fds-base_spacing)*8/16)*var(--fds-font-size-f0)); - --fds-spacing-10: calc((var(--fds-base_spacing)*10/16)*var(--fds-font-size-f0)); - --fds-spacing-12: calc((var(--fds-base_spacing)*12/16)*var(--fds-font-size-f0)); - --fds-spacing-14: calc((var(--fds-base_spacing)*14/16)*var(--fds-font-size-f0)); - --fds-spacing-18: calc((var(--fds-base_spacing)*18/16)*var(--fds-font-size-f0)); - --fds-spacing-22: calc((var(--fds-base_spacing)*22/16)*var(--fds-font-size-f0)); - --fds-spacing-26: calc((var(--fds-base_spacing)*26/16)*var(--fds-font-size-f0)); - --fds-spacing-30: calc((var(--fds-base_spacing)*30/16)*var(--fds-font-size-f0)); + --fds-spacing-0: 0rem; + --fds-spacing-1: 0.25rem; + --fds-spacing-2: 0.5rem; + --fds-spacing-3: 0.75rem; + --fds-spacing-4: 1rem; + --fds-spacing-5: 1.25rem; + --fds-spacing-6: 1.5rem; + --fds-spacing-7: 1.75rem; + --fds-spacing-8: 2rem; + --fds-spacing-9: 2.25rem; + --fds-spacing-10: 2.5rem; + --fds-spacing-11: 2.75rem; + --fds-spacing-12: 3rem; + --fds-spacing-13: 3.25rem; + --fds-spacing-14: 3.5rem; + --fds-spacing-15: 3.75rem; + --fds-spacing-18: 4.5rem; + --fds-spacing-22: 5.5rem; + --fds-spacing-26: 6.5rem; + --fds-spacing-30: 7.5rem; --fds-base_spacing: 4; - --fds-sizing-1: calc(var(--fds-base_sizing)/16*var(--fds-font-size-f0)); - --fds-sizing-2: calc(var(--fds-base_sizing)*2/16*var(--fds-font-size-f0)); - --fds-sizing-3: calc(var(--fds-base_sizing)*3/16*var(--fds-font-size-f0)); - --fds-sizing-4: calc(var(--fds-base_sizing)*4/16*var(--fds-font-size-f0)); - --fds-sizing-5: calc(var(--fds-base_sizing)*5/16*var(--fds-font-size-f0)); - --fds-sizing-6: calc(var(--fds-base_sizing)*6/16*var(--fds-font-size-f0)); - --fds-sizing-7: calc(var(--fds-base_sizing)*7/16*var(--fds-font-size-f0)); - --fds-sizing-8: calc(var(--fds-base_sizing)*8/16*var(--fds-font-size-f0)); - --fds-sizing-10: calc(var(--fds-base_sizing)*10/16*var(--fds-font-size-f0)); - --fds-sizing-12: calc((var(--fds-base_sizing)*12/16)*var(--fds-font-size-f0)); - --fds-sizing-14: calc((var(--fds-base_sizing)*14/16)*var(--fds-font-size-f0)); - --fds-sizing-18: calc((var(--fds-base_sizing)*18/16)*var(--fds-font-size-f0)); - --fds-sizing-22: calc((var(--fds-base_sizing)*22/16)*var(--fds-font-size-f0)); - --fds-sizing-26: calc((var(--fds-base_sizing)*26/16)*var(--fds-font-size-f0)); - --fds-sizing-30: calc((var(--fds-base_sizing)*30/16)*var(--fds-font-size-f0)); + --fds-sizing-0: 0rem; + --fds-sizing-1: 0.25rem; + --fds-sizing-2: 0.5rem; + --fds-sizing-3: 0.75rem; + --fds-sizing-4: 1rem; + --fds-sizing-5: 1.25rem; + --fds-sizing-6: 1.5rem; + --fds-sizing-7: 1.75rem; + --fds-sizing-8: 2rem; + --fds-sizing-9: 2.25rem; + --fds-sizing-10: 2.5rem; + --fds-sizing-11: 2.75rem; + --fds-sizing-12: 3rem; + --fds-sizing-13: 3.25rem; + --fds-sizing-14: 3.5rem; + --fds-sizing-15: 3.75rem; + --fds-sizing-18: 4.5rem; + --fds-sizing-22: 5.5rem; + --fds-sizing-26: 6.5rem; + --fds-sizing-30: 7.5rem; --fds-base_sizing: 4; --fds-border_width-default: 1px; --fds-border_width-active: 2px; diff --git a/packages/theme/package.json b/packages/theme/package.json index 91523598ef..2981abf4bc 100644 --- a/packages/theme/package.json +++ b/packages/theme/package.json @@ -1,6 +1,6 @@ { "name": "@digdir/designsystemet-theme", - "version": "0.15.0", + "version": "0.15.1-alpha.1", "description": "Tokens for Designsystemet", "author": "Designsystemet team", "repository": "https://github.com/digdir/designsystemet", diff --git a/packages/theme/scripts/build.ts b/packages/theme/scripts/build.ts index 9adee23009..d07531614a 100644 --- a/packages/theme/scripts/build.ts +++ b/packages/theme/scripts/build.ts @@ -17,6 +17,7 @@ import { fluidFontSize, calc, fontScaleHackFormat, + sizeRem, } from './transformers'; import { scopedReferenceVariables, @@ -46,6 +47,7 @@ const packageTokensPath = 'brand'; setupFormatters('./../../prettier.config.js'); StyleDictionary.registerTransform(sizePx); +StyleDictionary.registerTransform(sizeRem); StyleDictionary.registerTransform(nameKebab); StyleDictionary.registerTransform(nameKebabUnderscore); StyleDictionary.registerTransform(typographyShorthand); @@ -61,14 +63,14 @@ StyleDictionary.registerFileHeader(fileheader); StyleDictionary.registerTransformGroup({ name: 'fds/css', transforms: [ - nameKebab.name, 'ts/resolveMath', - fluidFontSize.name, - calc.name, + nameKebab.name, + // fluidFontSize.name, + // calc.name, typographyShorthand.name, 'ts/size/lineheight', + sizeRem.name, 'ts/shadow/css/shorthand', - sizePx.name, 'ts/color/modifiers', 'ts/color/css/hexrgba', ], @@ -121,7 +123,7 @@ const getTokensPackageConfig = (brand: Brands, targetFolder = ''): Config => { fileHeader: fileheader.name, referencesFilter: (token: TransformedToken) => !(token.path[0] === 'viewport') && - ['spacing', 'sizing', 'color'].includes(token.type as string), + ['color'].includes(token.type as string), // outputReferences: true, }, }, diff --git a/packages/theme/scripts/transformers.ts b/packages/theme/scripts/transformers.ts index e7392a39d9..8bda35e4bb 100644 --- a/packages/theme/scripts/transformers.ts +++ b/packages/theme/scripts/transformers.ts @@ -19,6 +19,25 @@ export const sizePx: Named = { transformer: (token) => transformDimension(token.value as number), }; +export const sizeRem: Named = { + name: 'fds/size/toRem', + type: 'value', + transitive: true, + matcher: (token) => + ['sizing', 'spacing'].includes(token.type as string) && + !token.name.includes('base'), + transformer: (token, options) => { + const baseFont = options.basePxFontSize || 16; + const value = token.value as number; + + if (value === 0) { + return '0'; + } + + return `${value / baseFont}rem`; + }, +}; + export const nameKebab: Named = { name: 'name/cti/hierarchical-kebab', type: 'name', diff --git a/yarn.lock b/yarn.lock index 8a7ed39d1c..9c104f499a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2641,7 +2641,14 @@ __metadata: languageName: unknown linkType: soft -"@digdir/designsystemet-theme@npm:0.15.0, @digdir/designsystemet-theme@workspace:packages/theme": +"@digdir/designsystemet-theme@npm:0.15.0": + version: 0.15.0 + resolution: "@digdir/designsystemet-theme@npm:0.15.0" + checksum: cdf3c71cb37f8dee69ab53d8bbad84b2f9c0d6836b800e03e5dd1f48e08fb4d45b6bc7d2a5f316b606d1cb3c81bd26eba457ae21b93fccd7b4b223113eaece7d + languageName: node + linkType: hard + +"@digdir/designsystemet-theme@workspace:packages/theme": version: 0.0.0-use.local resolution: "@digdir/designsystemet-theme@workspace:packages/theme" dependencies: