diff --git a/tokens/tokens.json b/tokens/tokens.json index 8e44caa..aeeec75 100644 --- a/tokens/tokens.json +++ b/tokens/tokens.json @@ -401,11 +401,11 @@ "font": { "family": { "default": { - "value": "Poppins", + "value": "Karla", "type": "fontFamilies" }, "secondary": { - "value": "Karla", + "value": "Poppins", "type": "fontFamilies" } }, @@ -502,6 +502,10 @@ "value": "{ds.core.font.size.base} *137.5", "type": "fontSizes" }, + "175": { + "value": "{ds.core.font.size.base}*175", + "type": "fontSizes" + }, "200": { "value": "{ds.core.font.size.base} *200", "type": "fontSizes" @@ -539,21 +543,33 @@ "description": "Hi there! SCALE is the base-scale of all size-related tokens (size, space, dimension). The default is 16(px), so it relates to 1rem = 16(px) for font-sizes. If you change it, it will change all size-related tokens. :)" }, "letter-spacing": { - "s": { + "nL": { "value": "-1.5px", "type": "letterSpacing" }, - "m": { + "nS": { + "value": "-0.5px", + "type": "letterSpacing" + }, + "none": { "value": "0px", "type": "letterSpacing" }, - "l": { + "pS": { "value": "0.2px", "type": "letterSpacing" }, - "xl": { + "pM": { "value": "0.3px", "type": "letterSpacing" + }, + "pL": { + "value": "0.5px", + "type": "letterSpacing" + }, + "pXL": { + "value": "1px", + "type": "letterSpacing" } }, "border": { @@ -799,387 +815,537 @@ "heading": { "1": { "value": { - "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.600}", + "fontFamily": "{ds.core.font.family.secondary}", + "fontWeight": "{ds.core.font.weight.500}", "lineHeight": "{ds.core.font.line-height.xxs}", "fontSize": "{ds.core.font.size.400}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.pXL}" }, "type": "typography" }, "2": { "value": { - "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.600}", + "fontFamily": "{ds.core.font.family.secondary}", + "fontWeight": "{ds.core.font.weight.500}", "lineHeight": "{ds.core.font.line-height.xxs}", "fontSize": "{ds.core.font.size.350}", - "letterSpacing": "{ds.core.letter-spacing.s}" + "letterSpacing": "{ds.core.letter-spacing.pXL}" }, "type": "typography" }, "3": { "value": { - "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.600}", + "fontFamily": "{ds.core.font.family.secondary}", + "fontWeight": "{ds.core.font.weight.500}", "lineHeight": "{ds.core.font.line-height.xxs}", "fontSize": "{ds.core.font.size.300}", - "letterSpacing": "{ds.core.letter-spacing.s}" + "letterSpacing": "{ds.core.letter-spacing.pXL}" }, "type": "typography" }, "4": { "value": { - "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.600}", + "fontFamily": "{ds.core.font.family.secondary}", + "fontWeight": "{ds.core.font.weight.500}", "lineHeight": "{ds.core.font.line-height.xxs}", "fontSize": "{ds.core.font.size.250}", - "letterSpacing": "{ds.core.letter-spacing.s}" + "letterSpacing": "{ds.core.letter-spacing.pXL}" }, "type": "typography" }, "5": { "value": { - "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.600}", + "fontFamily": "{ds.core.font.family.secondary}", + "fontWeight": "{ds.core.font.weight.500}", "lineHeight": "{ds.core.font.line-height.xs}", "fontSize": "{ds.core.font.size.225}", - "letterSpacing": "{ds.core.letter-spacing.s}" + "letterSpacing": "{ds.core.letter-spacing.pL}" }, "type": "typography" }, "6": { "value": { - "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.600}", + "fontFamily": "{ds.core.font.family.secondary}", + "fontWeight": "{ds.core.font.weight.500}", "lineHeight": "{ds.core.font.line-height.xs}", "fontSize": "{ds.core.font.size.200}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.pL}" }, "type": "typography" }, "7": { "value": { - "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.600}", + "fontFamily": "{ds.core.font.family.secondary}", + "fontWeight": "{ds.core.font.weight.500}", "lineHeight": "{ds.core.font.line-height.xs}", + "fontSize": "{ds.core.font.size.175}", + "letterSpacing": "{ds.core.letter-spacing.pL}" + }, + "type": "typography" + }, + "8": { + "value": { + "fontFamily": "{ds.core.font.family.secondary}", + "fontWeight": "{ds.core.font.weight.500}", "fontSize": "{ds.core.font.size.137}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "lineHeight": "{ds.core.font.line-height.xs}", + "letterSpacing": "{ds.core.letter-spacing.pL}" + }, + "type": "typography" + }, + "9": { + "value": { + "fontFamily": "{ds.core.font.family.secondary}", + "fontWeight": "{ds.core.font.weight.500}", + "fontSize": "{ds.core.font.size.125}", + "lineHeight": "{ds.core.font.line-height.xs}", + "letterSpacing": "{ds.core.letter-spacing.pL}" + }, + "type": "typography" + }, + "10": { + "value": { + "fontFamily": "{ds.core.font.family.secondary}", + "fontWeight": "{ds.core.font.weight.500}", + "fontSize": "{ds.core.font.size.112}", + "lineHeight": "{ds.core.font.line-height.xs}", + "letterSpacing": "{ds.core.letter-spacing.pL}" + }, + "type": "typography" + }, + "11": { + "value": { + "fontFamily": "{ds.core.font.family.secondary}", + "fontWeight": "{ds.core.font.weight.600}", + "fontSize": "{ds.core.font.size.100}", + "lineHeight": "{ds.core.font.line-height.xs}", + "letterSpacing": "{ds.core.letter-spacing.pL}" }, "type": "typography" } }, "subtitle": { - "1": { + "1a": { "value": { "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.700}", + "fontWeight": "{ds.core.font.weight.800}", "lineHeight": "{ds.core.font.line-height.xs}", "fontSize": "{ds.core.font.size.200}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "2": { + "1b": { "value": { "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.600}", + "fontWeight": "{ds.core.font.weight.700}", "lineHeight": "{ds.core.font.line-height.xs}", "fontSize": "{ds.core.font.size.200}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "3": { + "1c": { "value": { "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.400}", + "fontWeight": "{ds.core.font.weight.500}", "lineHeight": "{ds.core.font.line-height.xs}", "fontSize": "{ds.core.font.size.200}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "4": { + "2a": { + "value": { + "fontFamily": "{ds.core.font.family.default}", + "fontWeight": "{ds.core.font.weight.800}", + "lineHeight": "{ds.core.font.line-height.xs}", + "fontSize": "{ds.core.font.size.175}", + "letterSpacing": "{ds.core.letter-spacing.none}" + }, + "type": "typography" + }, + "2b": { "value": { "fontFamily": "{ds.core.font.family.default}", "fontWeight": "{ds.core.font.weight.700}", "lineHeight": "{ds.core.font.line-height.xs}", - "fontSize": "{ds.core.font.size.137}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "fontSize": "{ds.core.font.size.175}", + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "5": { + "2c": { "value": { "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.600}", + "fontWeight": "{ds.core.font.weight.500}", + "lineHeight": "{ds.core.font.line-height.xs}", + "fontSize": "{ds.core.font.size.175}", + "letterSpacing": "{ds.core.letter-spacing.none}" + }, + "type": "typography" + }, + "3a": { + "value": { + "fontFamily": "{ds.core.font.family.default}", + "fontWeight": "{ds.core.font.weight.800}", "lineHeight": "{ds.core.font.line-height.xs}", "fontSize": "{ds.core.font.size.137}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "6": { + "3b": { "value": { "fontFamily": "{ds.core.font.family.default}", "fontWeight": "{ds.core.font.weight.700}", "lineHeight": "{ds.core.font.line-height.xs}", "fontSize": "{ds.core.font.size.137}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "7": { + "3c": { "value": { "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.700}", + "fontWeight": "{ds.core.font.weight.500}", + "lineHeight": "{ds.core.font.line-height.xs}", + "fontSize": "{ds.core.font.size.137}", + "letterSpacing": "{ds.core.letter-spacing.none}" + }, + "type": "typography" + }, + "4a": { + "value": { + "fontFamily": "{ds.core.font.family.default}", + "fontWeight": "{ds.core.font.weight.800}", "lineHeight": "{ds.core.font.line-height.m}", "fontSize": "{ds.core.font.size.125}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "8": { + "4b": { "value": { "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.600}", + "fontWeight": "{ds.core.font.weight.700}", "lineHeight": "{ds.core.font.line-height.m}", "fontSize": "{ds.core.font.size.125}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "9": { + "4c": { "value": { "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.400}", + "fontWeight": "{ds.core.font.weight.500}", "lineHeight": "{ds.core.font.line-height.m}", "fontSize": "{ds.core.font.size.125}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "10": { + "5a": { "value": { "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.700}", - "lineHeight": "{ds.core.font.line-height.s}", + "fontWeight": "{ds.core.font.weight.800}", "fontSize": "{ds.core.font.size.112}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "lineHeight": "{ds.core.font.line-height.s}", + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "11": { + "5b": { "value": { "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.600}", - "lineHeight": "{ds.core.font.line-height.s}", + "fontWeight": "{ds.core.font.weight.700}", "fontSize": "{ds.core.font.size.112}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "lineHeight": "{ds.core.font.line-height.s}", + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "12": { + "5c": { "value": { "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.400}", - "lineHeight": "{ds.core.font.line-height.s}", + "fontWeight": "{ds.core.font.weight.500}", "fontSize": "{ds.core.font.size.112}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "lineHeight": "{ds.core.font.line-height.s}", + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" } }, "description": { - "1": { + "1a": { "value": { "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.700}", + "fontWeight": "{ds.core.font.weight.800}", "lineHeight": "{ds.core.font.line-height.m}", "fontSize": "{ds.core.font.size.137}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "2": { + "1b": { "value": { "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.600}", + "fontWeight": "{ds.core.font.weight.700}", "lineHeight": "{ds.core.font.line-height.m}", "fontSize": "{ds.core.font.size.137}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "3": { + "1c": { "value": { "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.400}", + "fontWeight": "{ds.core.font.weight.500}", "lineHeight": "{ds.core.font.line-height.m}", "fontSize": "{ds.core.font.size.137}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "4": { + "2a": { "value": { "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.700}", + "fontWeight": "{ds.core.font.weight.800}", "lineHeight": "{ds.core.font.line-height.m}", "fontSize": "{ds.core.font.size.125}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "5": { + "2b": { "value": { "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.600}", + "fontWeight": "{ds.core.font.weight.700}", "lineHeight": "{ds.core.font.line-height.m}", "fontSize": "{ds.core.font.size.125}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "6": { + "2c": { "value": { "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.400}", + "fontWeight": "{ds.core.font.weight.500}", "lineHeight": "{ds.core.font.line-height.m}", "fontSize": "{ds.core.font.size.125}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "7": { + "3a": { "value": { "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.700}", + "fontWeight": "{ds.core.font.weight.800}", "lineHeight": "{ds.core.font.line-height.m}", "fontSize": "{ds.core.font.size.112}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "8": { + "3b": { "value": { "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.600}", + "fontWeight": "{ds.core.font.weight.700}", "lineHeight": "{ds.core.font.line-height.m}", "fontSize": "{ds.core.font.size.112}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "9": { + "3c": { "value": { "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.400}", - "lineHeight": "{ds.core.font.line-height.m}", + "fontWeight": "{ds.core.font.weight.500}", + "lineHeight": "{ds.core.font.line-height.xs}", "fontSize": "{ds.core.font.size.112}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.nS}" }, "type": "typography" } }, "body": { - "1": { + "1a": { + "value": { + "fontFamily": "{ds.core.font.family.default}", + "fontWeight": "{ds.core.font.weight.700}", + "lineHeight": "{ds.core.font.line-height.m}", + "fontSize": "{ds.core.font.size.125}", + "letterSpacing": "{ds.core.letter-spacing.none}" + }, + "type": "typography" + }, + "1b": { + "value": { + "fontFamily": "{ds.core.font.family.default}", + "fontWeight": "{ds.core.font.weight.600}", + "lineHeight": "{ds.core.font.line-height.m}", + "fontSize": "{ds.core.font.size.125}", + "letterSpacing": "{ds.core.letter-spacing.none}" + }, + "type": "typography" + }, + "1c": { + "value": { + "fontFamily": "{ds.core.font.family.default}", + "fontWeight": "{ds.core.font.weight.400}", + "lineHeight": "{ds.core.font.line-height.m}", + "fontSize": "{ds.core.font.size.125}", + "letterSpacing": "{ds.core.letter-spacing.none}" + }, + "type": "typography" + }, + "2a": { "value": { "fontFamily": "{ds.core.font.family.default}", "fontWeight": "{ds.core.font.weight.700}", "lineHeight": "{ds.core.font.line-height.m}", "fontSize": "{ds.core.font.size.112}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "2": { + "2b": { "value": { "fontFamily": "{ds.core.font.family.default}", "fontWeight": "{ds.core.font.weight.600}", "lineHeight": "{ds.core.font.line-height.m}", "fontSize": "{ds.core.font.size.112}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "3": { + "2c": { "value": { "fontFamily": "{ds.core.font.family.default}", "fontWeight": "{ds.core.font.weight.400}", "lineHeight": "{ds.core.font.line-height.m}", "fontSize": "{ds.core.font.size.112}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "4": { + "3a": { "value": { "fontFamily": "{ds.core.font.family.default}", "fontWeight": "{ds.core.font.weight.700}", "lineHeight": "{ds.core.font.line-height.s}", "fontSize": "{ds.core.font.size.100}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "5": { + "3b": { "value": { "fontFamily": "{ds.core.font.family.default}", "fontWeight": "{ds.core.font.weight.600}", "lineHeight": "{ds.core.font.line-height.s}", "fontSize": "{ds.core.font.size.100}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "6": { + "3c": { "value": { "fontFamily": "{ds.core.font.family.default}", "fontWeight": "{ds.core.font.weight.400}", "lineHeight": "{ds.core.font.line-height.s}", "fontSize": "{ds.core.font.size.100}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "7": { + "4a": { "value": { "fontFamily": "{ds.core.font.family.default}", "fontWeight": "{ds.core.font.weight.700}", "lineHeight": "{ds.core.font.line-height.s}", "fontSize": "{ds.core.font.size.87}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "8": { + "4b": { "value": { "fontFamily": "{ds.core.font.family.default}", "fontWeight": "{ds.core.font.weight.600}", - "lineHeight": "{ds.core.font.line-height.s}", "fontSize": "{ds.core.font.size.87}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "lineHeight": "{ds.core.font.line-height.s}", + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "9": { + "4c": { "value": { "fontFamily": "{ds.core.font.family.default}", "fontWeight": "{ds.core.font.weight.400}", - "lineHeight": "{ds.core.font.line-height.s}", "fontSize": "{ds.core.font.size.87}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "lineHeight": "{ds.core.font.line-height.s}", + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "10": { + "5a": { + "value": { + "fontFamily": "{ds.core.font.family.default}", + "fontWeight": "{ds.core.font.weight.700}", + "fontSize": "{ds.core.font.size.75}", + "lineHeight": "{ds.core.font.line-height.s}", + "letterSpacing": "{ds.core.letter-spacing.none}" + }, + "type": "typography" + }, + "5b": { + "value": { + "fontFamily": "{ds.core.font.family.default}", + "fontWeight": "{ds.core.font.weight.600}", + "fontSize": "{ds.core.font.size.75}", + "lineHeight": "{ds.core.font.line-height.s}", + "letterSpacing": "{ds.core.letter-spacing.none}" + }, + "type": "typography" + }, + "5c": { "value": { "fontFamily": "{ds.core.font.family.default}", "fontWeight": "{ds.core.font.weight.400}", + "fontSize": "{ds.core.font.size.75}", + "lineHeight": "{ds.core.font.line-height.s}", + "letterSpacing": "{ds.core.letter-spacing.none}" + }, + "type": "typography" + }, + "6a": { + "value": { + "fontFamily": "{ds.core.font.family.default}", + "fontWeight": "{ds.core.font.weight.700}", + "fontSize": "{ds.core.font.size.75}", "lineHeight": "{ds.core.font.line-height.s}", + "letterSpacing": "{ds.core.letter-spacing.none}" + }, + "type": "typography" + }, + "6b": { + "value": { + "fontFamily": "{ds.core.font.family.default}", + "fontWeight": "{ds.core.font.weight.600}", "fontSize": "{ds.core.font.size.75}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "lineHeight": "{ds.core.font.line-height.s}", + "letterSpacing": "{ds.core.letter-spacing.none}" + }, + "type": "typography" + }, + "6c": { + "value": { + "fontFamily": "{ds.core.font.family.default}", + "fontWeight": "{ds.core.font.weight.400}", + "fontSize": "{ds.core.font.size.75}", + "lineHeight": "{ds.core.font.line-height.s}", + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" } @@ -1191,7 +1357,7 @@ "fontWeight": "{ds.core.font.weight.400}", "lineHeight": "{ds.core.font.line-height.l}", "fontSize": "{ds.core.font.size.75}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, @@ -1201,7 +1367,7 @@ "fontWeight": "{ds.core.font.weight.400}", "lineHeight": "{ds.core.font.line-height.l}", "fontSize": "{ds.core.font.size.62}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" } @@ -1210,30 +1376,30 @@ "1": { "value": { "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.600}", + "fontWeight": "{ds.core.font.weight.700}", "lineHeight": "{ds.core.font.line-height.xxxs}", "fontSize": "{ds.core.font.size.112}", - "letterSpacing": "{ds.core.letter-spacing.xl}" + "letterSpacing": "{ds.core.letter-spacing.pM}" }, "type": "typography" }, "2": { "value": { "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.600}", + "fontWeight": "{ds.core.font.weight.700}", "lineHeight": "{ds.core.font.line-height.xxxs}", "fontSize": "{ds.core.font.size.100}", - "letterSpacing": "{ds.core.letter-spacing.xl}" + "letterSpacing": "{ds.core.letter-spacing.pM}" }, "type": "typography" }, "3": { "value": { "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.600}", + "fontWeight": "{ds.core.font.weight.700}", "lineHeight": "{ds.core.font.line-height.xxxs}", "fontSize": "{ds.core.font.size.87}", - "letterSpacing": "{ds.core.letter-spacing.l}" + "letterSpacing": "{ds.core.letter-spacing.pS}" }, "type": "typography" } @@ -1245,7 +1411,7 @@ "fontWeight": "{ds.core.font.weight.500}", "lineHeight": "{ds.core.font.line-height.s}", "fontSize": "{ds.core.font.size.100}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, @@ -1255,7 +1421,7 @@ "fontWeight": "{ds.core.font.weight.500}", "lineHeight": "{ds.core.font.line-height.s}", "fontSize": "{ds.core.font.size.87}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, @@ -1265,130 +1431,130 @@ "fontWeight": "{ds.core.font.weight.500}", "lineHeight": "{ds.core.font.line-height.s}", "fontSize": "{ds.core.font.size.75}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" } }, "tagline": { - "1": { + "1a": { "value": { "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.700}", + "fontWeight": "{ds.core.font.weight.800}", "lineHeight": "{ds.core.font.line-height.m}", "fontSize": "{ds.core.font.size.112}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "2": { + "1b": { "value": { "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.600}", + "fontWeight": "{ds.core.font.weight.700}", "lineHeight": "{ds.core.font.line-height.m}", "fontSize": "{ds.core.font.size.112}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "3": { + "1c": { "value": { "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.500}", + "fontWeight": "{ds.core.font.weight.600}", "lineHeight": "{ds.core.font.line-height.m}", "fontSize": "{ds.core.font.size.112}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "4": { + "2a": { "value": { "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.700}", + "fontWeight": "{ds.core.font.weight.800}", "lineHeight": "{ds.core.font.line-height.m}", "fontSize": "{ds.core.font.size.100}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "5": { + "2b": { "value": { "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.600}", + "fontWeight": "{ds.core.font.weight.700}", "lineHeight": "{ds.core.font.line-height.m}", "fontSize": "{ds.core.font.size.100}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "6": { + "2c": { "value": { "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.500}", + "fontWeight": "{ds.core.font.weight.600}", "lineHeight": "{ds.core.font.line-height.m}", "fontSize": "{ds.core.font.size.100}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "7": { + "3a": { "value": { "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.700}", + "fontWeight": "{ds.core.font.weight.800}", "lineHeight": "{ds.core.font.line-height.m}", "fontSize": "{ds.core.font.size.87}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "8": { + "3b": { "value": { "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.600}", + "fontWeight": "{ds.core.font.weight.700}", "lineHeight": "{ds.core.font.line-height.m}", "fontSize": "{ds.core.font.size.87}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "9": { + "3c": { "value": { "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.500}", + "fontWeight": "{ds.core.font.weight.600}", "lineHeight": "{ds.core.font.line-height.m}", "fontSize": "{ds.core.font.size.87}", - "letterSpacing": "{ds.core.letter-spacing.m}", + "letterSpacing": "{ds.core.letter-spacing.none}", "textCase": "Uppercase" }, "type": "typography" }, - "10": { + "4a": { "value": { "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.700}", + "fontWeight": "{ds.core.font.weight.800}", "lineHeight": "{ds.core.font.line-height.m}", "fontSize": "{ds.core.font.size.75}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "11": { + "4b": { "value": { "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.600}", + "fontWeight": "{ds.core.font.weight.700}", "lineHeight": "{ds.core.font.line-height.m}", "fontSize": "{ds.core.font.size.75}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, - "12": { + "4c": { "value": { "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.500}", + "fontWeight": "{ds.core.font.weight.600}", "lineHeight": "{ds.core.font.line-height.m}", "fontSize": "{ds.core.font.size.75}", - "letterSpacing": "{ds.core.letter-spacing.m}", + "letterSpacing": "{ds.core.letter-spacing.none}", "textCase": "Uppercase" }, "type": "typography" @@ -1398,10 +1564,10 @@ "1": { "value": { "fontFamily": "{ds.core.font.family.default}", - "fontWeight": "{ds.core.font.weight.400}", + "fontWeight": "{ds.core.font.weight.500}", "lineHeight": "{ds.core.font.line-height.m}", "fontSize": "{ds.core.font.size.100}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, @@ -1411,17 +1577,27 @@ "fontWeight": "{ds.core.font.weight.500}", "lineHeight": "{ds.core.font.line-height.m}", "fontSize": "{ds.core.font.size.87}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" }, "3": { + "value": { + "fontFamily": "{ds.core.font.family.secondary}", + "fontWeight": "{ds.core.font.weight.400}", + "lineHeight": "{ds.core.font.line-height.xs}", + "fontSize": "{ds.core.font.size.87}", + "letterSpacing": "{ds.core.letter-spacing.pS}" + }, + "type": "typography" + }, + "4": { "value": { "fontFamily": "{ds.core.font.family.default}", "fontWeight": "{ds.core.font.weight.500}", - "lineHeight": "{ds.core.font.line-height.m}", "fontSize": "{ds.core.font.size.75}", - "letterSpacing": "{ds.core.letter-spacing.m}" + "lineHeight": "{ds.core.font.line-height.m}", + "letterSpacing": "{ds.core.letter-spacing.none}" }, "type": "typography" } @@ -1445,7 +1621,7 @@ "default": { "value": { "border": "{ds.semantic.input.border.default}", - "typography": "{ds.semantic.font.body.9}", + "typography": "{ds.semantic.font.body.3c}", "fill": "{ds.semantic.color.background.default}", "verticalPadding": "{ds.core.spacing.50}", "horizontalPadding": "{ds.core.spacing.75}" @@ -1825,7 +2001,7 @@ "default": { "value": { "border": "{ds.semantic.input.border.default}", - "typography": "{ds.semantic.font.body.9}", + "typography": "{ds.semantic.font.body.3c}", "fill": "{ds.semantic.color.background.default}", "verticalPadding": "{ds.core.spacing.50}", "horizontalPadding": "{ds.core.spacing.75}" @@ -2216,7 +2392,7 @@ "default": { "value": { "border": "{ds.semantic.input.border.default}", - "typography": "{ds.semantic.font.body.9}", + "typography": "{ds.semantic.font.body.3c}", "fill": "{ds.semantic.color.background.default}", "verticalPadding": "{ds.core.spacing.50}", "horizontalPadding": "{ds.core.spacing.75}"