diff --git a/proprietary/tokens/src/components/amsterdam/accordion.tokens.json b/proprietary/tokens/src/components/amsterdam/accordion.tokens.json index 9dbf55d5a4..16de651e15 100644 --- a/proprietary/tokens/src/components/amsterdam/accordion.tokens.json +++ b/proprietary/tokens/src/components/amsterdam/accordion.tokens.json @@ -3,21 +3,15 @@ "accordion": { "button": { "color": { "value": "{amsterdam.color.primary-blue}" }, + "font-family": { "value": "{amsterdam.typography.font-family}" }, + "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, + "font-weight": { "value": "{amsterdam.typography.font-weight.bold}" }, + "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" }, "focus": { "outline-offset": { "value": "{amsterdam.focus.outline-offset}" } }, - "font-family": { "value": "{amsterdam.typography.font-family}" }, - "font-weight": { "value": "{amsterdam.typography.font-weight.bold}" }, "hover": { "box-shadow": { "value": "inset 0 0 0 2px {amsterdam.color.neutral-grey3}" } - }, - "spacious": { - "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" } - }, - "compact": { - "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" } } } } diff --git a/proprietary/tokens/src/components/amsterdam/alert.tokens.json b/proprietary/tokens/src/components/amsterdam/alert.tokens.json index 5506185d64..01be7a801a 100644 --- a/proprietary/tokens/src/components/amsterdam/alert.tokens.json +++ b/proprietary/tokens/src/components/amsterdam/alert.tokens.json @@ -11,15 +11,9 @@ "title": { "color": { "value": "{amsterdam.color.primary-black}" }, "font-family": { "value": "{amsterdam.typography.font-family}" }, + "font-size": { "value": "{amsterdam.typography.text-level.4.font-size}" }, "font-weight": { "value": "{amsterdam.typography.font-weight.bold}" }, - "spacious": { - "font-size": { "value": "{amsterdam.typography.text-level.4.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.4.line-height}" } - }, - "compact": { - "font-size": { "value": "{amsterdam.typography.text-level.4.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.4.line-height}" } - } + "line-height": { "value": "{amsterdam.typography.text-level.4.line-height}" } }, "error": { "border-color": { "value": "{amsterdam.color.primary-red}" } diff --git a/proprietary/tokens/src/components/amsterdam/badge.tokens.json b/proprietary/tokens/src/components/amsterdam/badge.tokens.json index a27408d47c..4b9492cc1f 100644 --- a/proprietary/tokens/src/components/amsterdam/badge.tokens.json +++ b/proprietary/tokens/src/components/amsterdam/badge.tokens.json @@ -2,16 +2,10 @@ "amsterdam": { "badge": { "font-family": { "value": "{amsterdam.typography.font-family}" }, + "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, "font-weight": { "value": "{amsterdam.typography.font-weight.bold}" }, + "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" }, "padding-inline": { "value": "0.5rem" }, - "spacious": { - "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" } - }, - "compact": { - "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" } - }, "blue": { "background-color": { "value": "{amsterdam.color.blue}" }, "color": { "value": "{amsterdam.color.primary-black}" } diff --git a/proprietary/tokens/src/components/amsterdam/blockquote.tokens.json b/proprietary/tokens/src/components/amsterdam/blockquote.tokens.json index b294ff0038..3061174dc7 100644 --- a/proprietary/tokens/src/components/amsterdam/blockquote.tokens.json +++ b/proprietary/tokens/src/components/amsterdam/blockquote.tokens.json @@ -3,16 +3,10 @@ "blockquote": { "color": { "value": "{amsterdam.color.primary-black}" }, "font-family": { "value": "{amsterdam.typography.font-family}" }, + "font-size": { "value": "{amsterdam.typography.text-level.3.font-size}" }, "font-weight": { "value": "{amsterdam.typography.font-weight.bold}" }, - "inverse-color": { "value": "{amsterdam.color.primary-white}" }, - "spacious": { - "font-size": { "value": "{amsterdam.typography.text-level.3.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.3.line-height}" } - }, - "compact": { - "font-size": { "value": "{amsterdam.typography.text-level.3.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.3.line-height}" } - } + "line-height": { "value": "{amsterdam.typography.text-level.3.line-height}" }, + "inverse-color": { "value": "{amsterdam.color.primary-white}" } } } } diff --git a/proprietary/tokens/src/components/amsterdam/breadcrumb.tokens.json b/proprietary/tokens/src/components/amsterdam/breadcrumb.tokens.json index 2376eae017..31cd659d70 100644 --- a/proprietary/tokens/src/components/amsterdam/breadcrumb.tokens.json +++ b/proprietary/tokens/src/components/amsterdam/breadcrumb.tokens.json @@ -2,7 +2,9 @@ "amsterdam": { "breadcrumb": { "font-family": { "value": "{amsterdam.typography.font-family}" }, + "font-size": { "value": "{amsterdam.typography.text-level.6.font-size}" }, "font-weight": { "value": "{amsterdam.typography.font-weight.normal}" }, + "line-height": { "value": "{amsterdam.typography.text-level.6.line-height}" }, "separator": { "background-image": { "value": "url(\"data:image/svg+xml;utf8,\")" @@ -18,14 +20,6 @@ "color": { "value": "{amsterdam.color.dark-blue}" }, "text-decoration-line": { "value": "{amsterdam.link-appearance.subtle.hover.text-decoration-line}" } } - }, - "spacious": { - "font-size": { "value": "{amsterdam.typography.text-level.6.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.6.line-height}" } - }, - "compact": { - "font-size": { "value": "{amsterdam.typography.text-level.6.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.6.line-height}" } } } } diff --git a/proprietary/tokens/src/components/amsterdam/button.tokens.json b/proprietary/tokens/src/components/amsterdam/button.tokens.json index e7d8a204c0..0ebe731227 100644 --- a/proprietary/tokens/src/components/amsterdam/button.tokens.json +++ b/proprietary/tokens/src/components/amsterdam/button.tokens.json @@ -1,14 +1,8 @@ { "amsterdam": { "button": { - "spacious": { - "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" } - }, - "compact": { - "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" } - }, + "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, + "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" }, "secondary": { "box-shadow": { "value": "inset 0 0 0 2px {amsterdam.color.primary-blue}" }, "hover": { diff --git a/proprietary/tokens/src/components/amsterdam/checkbox.tokens.json b/proprietary/tokens/src/components/amsterdam/checkbox.tokens.json index c88d0ad42a..73b9d548aa 100644 --- a/proprietary/tokens/src/components/amsterdam/checkbox.tokens.json +++ b/proprietary/tokens/src/components/amsterdam/checkbox.tokens.json @@ -2,6 +2,11 @@ "amsterdam": { "checkbox": { "color": { "value": "{amsterdam.color.primary-black}" }, + "font-family": { "value": "{amsterdam.typography.font-family}" }, + "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, + "font-weight": { "value": "{amsterdam.typography.font-weight.normal}" }, + "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" }, + "outline-offset": { "value": "{amsterdam.focus.outline-offset}" }, "checkmark": { "border-color": { "value": "{amsterdam.color.primary-blue}" }, "checked": { @@ -56,19 +61,8 @@ "disabled": { "color": { "value": "{amsterdam.color.neutral-grey3}" } }, - "font-family": { "value": "{amsterdam.typography.font-family}" }, - "font-weight": { "value": "{amsterdam.typography.font-weight.normal}" }, "hover": { "color": { "value": "{amsterdam.color.dark-blue}" } - }, - "outline-offset": { "value": "{amsterdam.focus.outline-offset}" }, - "spacious": { - "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" } - }, - "compact": { - "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" } } } } diff --git a/proprietary/tokens/src/components/amsterdam/dialog.tokens.json b/proprietary/tokens/src/components/amsterdam/dialog.tokens.json index e6c328eabe..6e3bf4a413 100644 --- a/proprietary/tokens/src/components/amsterdam/dialog.tokens.json +++ b/proprietary/tokens/src/components/amsterdam/dialog.tokens.json @@ -7,15 +7,9 @@ "title": { "color": { "value": "{amsterdam.color.primary-black}" }, "font-family": { "value": "{amsterdam.typography.font-family}" }, + "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, "font-weight": { "value": "{amsterdam.typography.font-weight.bold}" }, - "spacious": { - "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" } - }, - "compact": { - "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" } - } + "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" } }, "backdrop": { "background": { "value": "#0006" } diff --git a/proprietary/tokens/src/components/amsterdam/form-label.tokens.json b/proprietary/tokens/src/components/amsterdam/form-label.tokens.json index 125fc36913..01d8f6377b 100644 --- a/proprietary/tokens/src/components/amsterdam/form-label.tokens.json +++ b/proprietary/tokens/src/components/amsterdam/form-label.tokens.json @@ -3,15 +3,9 @@ "form-label": { "color": { "value": "{amsterdam.color.primary-black}" }, "font-family": { "value": "{amsterdam.typography.font-family}" }, + "font-size": { "value": "{amsterdam.typography.text-level.4.font-size}" }, "font-weight": { "value": "{amsterdam.typography.font-weight.bold}" }, - "spacious": { - "font-size": { "value": "{amsterdam.typography.text-level.4.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.4.line-height}" } - }, - "compact": { - "font-size": { "value": "{amsterdam.typography.text-level.4.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.4.line-height}" } - } + "line-height": { "value": "{amsterdam.typography.text-level.4.line-height}" } } } } diff --git a/proprietary/tokens/src/components/amsterdam/heading.tokens.json b/proprietary/tokens/src/components/amsterdam/heading.tokens.json index cfed097a57..a7a07a076a 100644 --- a/proprietary/tokens/src/components/amsterdam/heading.tokens.json +++ b/proprietary/tokens/src/components/amsterdam/heading.tokens.json @@ -5,57 +5,29 @@ "font-family": { "value": "{amsterdam.typography.font-family}" }, "font-weight": { "value": "{amsterdam.typography.font-weight.bold}" }, "inverse-color": { "value": "{amsterdam.color.primary-white}" }, - "spacious": { - "level-1": { - "line-height": { "value": "{amsterdam.typography.text-level.1.line-height}" }, - "font-size": { "value": "{amsterdam.typography.text-level.1.font-size}" } - }, - "level-2": { - "line-height": { "value": "{amsterdam.typography.text-level.2.line-height}" }, - "font-size": { "value": "{amsterdam.typography.text-level.2.font-size}" } - }, - "level-3": { - "line-height": { "value": "{amsterdam.typography.text-level.3.line-height}" }, - "font-size": { "value": "{amsterdam.typography.text-level.3.font-size}" } - }, - "level-4": { - "line-height": { "value": "{amsterdam.typography.text-level.4.line-height}" }, - "font-size": { "value": "{amsterdam.typography.text-level.4.font-size}" } - }, - "level-5": { - "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" }, - "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" } - }, - "level-6": { - "line-height": { "value": "{amsterdam.typography.text-level.6.line-height}" }, - "font-size": { "value": "{amsterdam.typography.text-level.6.font-size}" } - } + "level-1": { + "font-size": { "value": "{amsterdam.typography.text-level.1.font-size}" }, + "line-height": { "value": "{amsterdam.typography.text-level.1.line-height}" } }, - "compact": { - "level-1": { - "line-height": { "value": "{amsterdam.typography.text-level.1.line-height}" }, - "font-size": { "value": "{amsterdam.typography.text-level.1.font-size}" } - }, - "level-2": { - "line-height": { "value": "{amsterdam.typography.text-level.2.line-height}" }, - "font-size": { "value": "{amsterdam.typography.text-level.2.font-size}" } - }, - "level-3": { - "line-height": { "value": "{amsterdam.typography.text-level.3.line-height}" }, - "font-size": { "value": "{amsterdam.typography.text-level.3.font-size}" } - }, - "level-4": { - "line-height": { "value": "{amsterdam.typography.text-level.4.line-height}" }, - "font-size": { "value": "{amsterdam.typography.text-level.4.font-size}" } - }, - "level-5": { - "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" }, - "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" } - }, - "level-6": { - "line-height": { "value": "{amsterdam.typography.text-level.6.line-height}" }, - "font-size": { "value": "{amsterdam.typography.text-level.6.font-size}" } - } + "level-2": { + "font-size": { "value": "{amsterdam.typography.text-level.2.font-size}" }, + "line-height": { "value": "{amsterdam.typography.text-level.2.line-height}" } + }, + "level-3": { + "font-size": { "value": "{amsterdam.typography.text-level.3.font-size}" }, + "line-height": { "value": "{amsterdam.typography.text-level.3.line-height}" } + }, + "level-4": { + "font-size": { "value": "{amsterdam.typography.text-level.4.font-size}" }, + "line-height": { "value": "{amsterdam.typography.text-level.4.line-height}" } + }, + "level-5": { + "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, + "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" } + }, + "level-6": { + "font-size": { "value": "{amsterdam.typography.text-level.6.font-size}" }, + "line-height": { "value": "{amsterdam.typography.text-level.6.line-height}" } } } } diff --git a/proprietary/tokens/src/components/amsterdam/icon.tokens.json b/proprietary/tokens/src/components/amsterdam/icon.tokens.json index 89b7fa11c6..76f5e2648b 100644 --- a/proprietary/tokens/src/components/amsterdam/icon.tokens.json +++ b/proprietary/tokens/src/components/amsterdam/icon.tokens.json @@ -1,41 +1,21 @@ { "amsterdam": { "icon": { - "spacious": { - "size-3": { - "font-size": { "value": "{amsterdam.typography.text-level.3.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.3.line-height}" } - }, - "size-4": { - "font-size": { "value": "{amsterdam.typography.text-level.4.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.4.line-height}" } - }, - "size-5": { - "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" } - }, - "size-6": { - "font-size": { "value": "{amsterdam.typography.text-level.6.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.6.line-height}" } - } + "size-3": { + "font-size": { "value": "{amsterdam.typography.text-level.3.font-size}" }, + "line-height": { "value": "{amsterdam.typography.text-level.3.line-height}" } }, - "compact": { - "size-3": { - "font-size": { "value": "{amsterdam.typography.text-level.3.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.3.line-height}" } - }, - "size-4": { - "font-size": { "value": "{amsterdam.typography.text-level.4.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.4.line-height}" } - }, - "size-5": { - "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" } - }, - "size-6": { - "font-size": { "value": "{amsterdam.typography.text-level.6.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.6.line-height}" } - } + "size-4": { + "font-size": { "value": "{amsterdam.typography.text-level.4.font-size}" }, + "line-height": { "value": "{amsterdam.typography.text-level.4.line-height}" } + }, + "size-5": { + "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, + "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" } + }, + "size-6": { + "font-size": { "value": "{amsterdam.typography.text-level.6.font-size}" }, + "line-height": { "value": "{amsterdam.typography.text-level.6.line-height}" } } } } diff --git a/proprietary/tokens/src/components/amsterdam/link-list.tokens.json b/proprietary/tokens/src/components/amsterdam/link-list.tokens.json index 31e0a04591..17b5e15f99 100644 --- a/proprietary/tokens/src/components/amsterdam/link-list.tokens.json +++ b/proprietary/tokens/src/components/amsterdam/link-list.tokens.json @@ -11,33 +11,17 @@ "text-decoration-line": { "value": "{amsterdam.link-appearance.subtle.text-decoration-line}" }, "text-decoration-thickness": { "value": "{amsterdam.link-appearance.text-decoration-thickness}" }, "text-underline-offset": { "value": "{amsterdam.link-appearance.text-underline-offset}" }, - "spacious": { - "small": { - "font-size": { "value": "{amsterdam.typography.text-level.6.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.6.line-height}" } - }, - "medium": { - "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" } - }, - "large": { - "font-size": { "value": "{amsterdam.typography.text-level.4.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.4.line-height}" } - } + "small": { + "font-size": { "value": "{amsterdam.typography.text-level.6.font-size}" }, + "line-height": { "value": "{amsterdam.typography.text-level.6.line-height}" } }, - "compact": { - "small": { - "font-size": { "value": "{amsterdam.typography.text-level.6.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.6.line-height}" } - }, - "medium": { - "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" } - }, - "large": { - "font-size": { "value": "{amsterdam.typography.text-level.4.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.4.line-height}" } - } + "medium": { + "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, + "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" } + }, + "large": { + "font-size": { "value": "{amsterdam.typography.text-level.4.font-size}" }, + "line-height": { "value": "{amsterdam.typography.text-level.4.line-height}" } }, "hover": { "color": { "value": "{amsterdam.link-appearance.hover.color}" }, diff --git a/proprietary/tokens/src/components/amsterdam/link.tokens.json b/proprietary/tokens/src/components/amsterdam/link.tokens.json index a4c597c01a..08157579f4 100644 --- a/proprietary/tokens/src/components/amsterdam/link.tokens.json +++ b/proprietary/tokens/src/components/amsterdam/link.tokens.json @@ -26,23 +26,19 @@ } }, "in-list": { + "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, "gap": { "value": "0.5em" }, + "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" }, "text-decoration-line": { "value": "{amsterdam.link-appearance.subtle.text-decoration-line}" }, "text-decoration-thickness": { "value": "{amsterdam.link-appearance.text-decoration-thickness}" }, "text-underline-offset": { "value": "{amsterdam.link-appearance.text-underline-offset}" }, "hover": { "text-decoration-line": { "value": "{amsterdam.link-appearance.subtle.hover.text-decoration-line}" } - }, - "spacious": { - "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" } - }, - "compact": { - "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" } } }, "standalone": { + "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, + "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" }, "text-decoration-line": { "value": "{amsterdam.link-appearance.regular.text-decoration-line}" }, "text-decoration-thickness": { "value": "{amsterdam.link-appearance.text-decoration-thickness}" }, "text-underline-offset": { "value": "{amsterdam.link-appearance.text-underline-offset}" }, @@ -51,14 +47,6 @@ "value": "{amsterdam.link-appearance.regular.hover.text-decoration-thickness}" }, "text-underline-offset": { "value": "{amsterdam.link-appearance.regular.hover.text-underline-offset}" } - }, - "spacious": { - "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" } - }, - "compact": { - "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" } } }, "on-background-dark": { diff --git a/proprietary/tokens/src/components/amsterdam/ordered-list.tokens.json b/proprietary/tokens/src/components/amsterdam/ordered-list.tokens.json index 1383f21e1f..0032f02c09 100644 --- a/proprietary/tokens/src/components/amsterdam/ordered-list.tokens.json +++ b/proprietary/tokens/src/components/amsterdam/ordered-list.tokens.json @@ -3,17 +3,11 @@ "ordered-list": { "color": { "value": "{amsterdam.color.primary-black}" }, "font-family": { "value": "{amsterdam.typography.font-family}" }, + "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, "font-weight": { "value": "{amsterdam.typography.font-weight.normal}" }, "gap": { "value": "0.75rem" }, + "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" }, "list-style-type": { "value": "decimal" }, - "spacious": { - "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" } - }, - "compact": { - "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" } - }, "item": { "margin-inline-start": { "value": "2.25rem", diff --git a/proprietary/tokens/src/components/amsterdam/page-heading.tokens.json b/proprietary/tokens/src/components/amsterdam/page-heading.tokens.json index 1c304dd81c..05f4198b37 100644 --- a/proprietary/tokens/src/components/amsterdam/page-heading.tokens.json +++ b/proprietary/tokens/src/components/amsterdam/page-heading.tokens.json @@ -3,16 +3,10 @@ "page-heading": { "color": { "value": "{amsterdam.color.primary-black}" }, "font-family": { "value": "{amsterdam.typography.font-family}" }, + "font-size": { "value": "{amsterdam.typography.text-level.0.font-size}" }, "font-weight": { "value": "{amsterdam.typography.font-weight.bold}" }, "inverse-color": { "value": "{amsterdam.color.primary-white}" }, - "spacious": { - "font-size": { "value": "{amsterdam.typography.text-level.0.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.0.font-size}" } - }, - "compact": { - "font-size": { "value": "{amsterdam.typography.text-level.0.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.0.font-size}" } - } + "line-height": { "value": "{amsterdam.typography.text-level.0.font-size}" } } } } diff --git a/proprietary/tokens/src/components/amsterdam/page-menu.tokens.json b/proprietary/tokens/src/components/amsterdam/page-menu.tokens.json index c702c0e9fe..534d7df1be 100644 --- a/proprietary/tokens/src/components/amsterdam/page-menu.tokens.json +++ b/proprietary/tokens/src/components/amsterdam/page-menu.tokens.json @@ -6,20 +6,14 @@ "item": { "color": { "value": "{amsterdam.link-appearance.color}" }, "font-family": { "value": "{amsterdam.typography.font-family}" }, + "font-size": { "value": "{amsterdam.typography.text-level.6.font-size}" }, "font-weight": { "value": "{amsterdam.typography.font-weight.normal}" }, "gap": { "value": "0.5rem" }, + "line-height": { "value": "{amsterdam.typography.text-level.6.line-height}" }, "outline-offset": { "value": "{amsterdam.focus.outline-offset}" }, "text-decoration-line": { "value": "{amsterdam.link-appearance.subtle.text-decoration-line}" }, "text-decoration-thickness": { "value": "{amsterdam.link-appearance.text-decoration-thickness}" }, "text-underline-offset": { "value": "{amsterdam.link-appearance.text-underline-offset}" }, - "spacious": { - "font-size": { "value": "{amsterdam.typography.text-level.6.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.6.line-height}" } - }, - "compact": { - "font-size": { "value": "{amsterdam.typography.text-level.6.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.6.line-height}" } - }, "hover": { "color": { "value": "{amsterdam.link-appearance.hover.color}" }, "text-decoration-line": { "value": "{amsterdam.link-appearance.subtle.hover.text-decoration-line}" } diff --git a/proprietary/tokens/src/components/amsterdam/pagination.tokens.json b/proprietary/tokens/src/components/amsterdam/pagination.tokens.json index 9c958e5a0b..4360328976 100644 --- a/proprietary/tokens/src/components/amsterdam/pagination.tokens.json +++ b/proprietary/tokens/src/components/amsterdam/pagination.tokens.json @@ -3,15 +3,9 @@ "pagination": { "color": { "value": "{amsterdam.link-appearance.color}" }, "font-family": { "value": "{amsterdam.typography.font-family}" }, + "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, "font-weight": { "value": "{amsterdam.typography.font-weight.normal}" }, - "spacious": { - "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" } - }, - "compact": { - "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" } - }, + "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" }, "button": { "outline-offset": { "value": "{amsterdam.focus.outline-offset}" }, "text-decoration-line": { "value": "{amsterdam.link-appearance.subtle.text-decoration-line}" }, diff --git a/proprietary/tokens/src/components/amsterdam/paragraph.tokens.json b/proprietary/tokens/src/components/amsterdam/paragraph.tokens.json index d3118bd400..0b78d70f46 100644 --- a/proprietary/tokens/src/components/amsterdam/paragraph.tokens.json +++ b/proprietary/tokens/src/components/amsterdam/paragraph.tokens.json @@ -5,33 +5,17 @@ "font-family": { "value": "{amsterdam.typography.font-family}" }, "font-weight": { "value": "{amsterdam.typography.font-weight.normal}" }, "inverse-color": { "value": "{amsterdam.color.primary-white}" }, - "spacious": { - "small": { - "font-size": { "value": "{amsterdam.typography.text-level.6.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.6.line-height}" } - }, - "medium": { - "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" } - }, - "large": { - "font-size": { "value": "{amsterdam.typography.text-level.4.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.4.line-height}" } - } + "small": { + "font-size": { "value": "{amsterdam.typography.text-level.6.font-size}" }, + "line-height": { "value": "{amsterdam.typography.text-level.6.line-height}" } }, - "compact": { - "small": { - "font-size": { "value": "{amsterdam.typography.text-level.6.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.6.line-height}" } - }, - "medium": { - "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" } - }, - "large": { - "font-size": { "value": "{amsterdam.typography.text-level.4.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.4.line-height}" } - } + "medium": { + "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, + "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" } + }, + "large": { + "font-size": { "value": "{amsterdam.typography.text-level.4.font-size}" }, + "line-height": { "value": "{amsterdam.typography.text-level.4.line-height}" } } } } diff --git a/proprietary/tokens/src/components/amsterdam/search-field.tokens.json b/proprietary/tokens/src/components/amsterdam/search-field.tokens.json index 323ec53291..3e72d7401e 100644 --- a/proprietary/tokens/src/components/amsterdam/search-field.tokens.json +++ b/proprietary/tokens/src/components/amsterdam/search-field.tokens.json @@ -15,7 +15,9 @@ }, "color": { "value": "{amsterdam.color.primary-black}" }, "font-family": { "value": "{amsterdam.typography.font-family}" }, + "font-size": { "value": "{amsterdam.typography.text-level.6.font-size}" }, "font-weight": { "value": "{amsterdam.typography.font-weight.normal}" }, + "line-height": { "value": "{amsterdam.typography.text-level.6.line-height}" }, "outline-offset": { "value": "{amsterdam.focus.outline-offset}" }, "cancel-button": { "background-image": { @@ -32,14 +34,6 @@ }, "placeholder": { "color": { "value": "{amsterdam.color.neutral-grey3}" } - }, - "compact": { - "font-size": { "value": "{amsterdam.typography.text-level.6.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.6.line-height}" } - }, - "spacious": { - "font-size": { "value": "{amsterdam.typography.text-level.6.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.6.line-height}" } } } } diff --git a/proprietary/tokens/src/components/amsterdam/text-input.tokens.json b/proprietary/tokens/src/components/amsterdam/text-input.tokens.json index ee92822b7c..95c1e64dc3 100644 --- a/proprietary/tokens/src/components/amsterdam/text-input.tokens.json +++ b/proprietary/tokens/src/components/amsterdam/text-input.tokens.json @@ -4,7 +4,9 @@ "box-shadow": { "value": "inset 0 0 0 1px {amsterdam.color.primary-black}" }, "color": { "value": "{amsterdam.color.primary-black}" }, "font-family": { "value": "{amsterdam.typography.font-family}" }, + "font-size": { "value": "{amsterdam.typography.text-level.6.font-size}" }, "font-weight": { "value": "{amsterdam.typography.font-weight.normal}" }, + "line-height": { "value": "{amsterdam.typography.text-level.6.line-height}" }, "outline-offset": { "value": "{amsterdam.focus.outline-offset}" }, "disabled": { "background-color": { "value": "{amsterdam.color.primary-white}" }, @@ -22,14 +24,6 @@ }, "placeholder": { "color": { "value": "{amsterdam.color.neutral-grey3}" } - }, - "compact": { - "font-size": { "value": "{amsterdam.typography.text-level.6.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.6.line-height}" } - }, - "spacious": { - "font-size": { "value": "{amsterdam.typography.text-level.6.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.6.line-height}" } } } } diff --git a/proprietary/tokens/src/components/amsterdam/top-task-link.tokens.json b/proprietary/tokens/src/components/amsterdam/top-task-link.tokens.json index 0ff91cc4e3..bee69ba5a1 100644 --- a/proprietary/tokens/src/components/amsterdam/top-task-link.tokens.json +++ b/proprietary/tokens/src/components/amsterdam/top-task-link.tokens.json @@ -4,34 +4,22 @@ "description": { "color": { "value": "{amsterdam.color.primary-black}" }, "font-family": { "value": "{amsterdam.typography.font-family}" }, + "font-size": { "value": "{amsterdam.typography.text-level.6.font-size}" }, "font-weight": { "value": "{amsterdam.typography.font-weight.normal}" }, - "spacious": { - "font-size": { "value": "{amsterdam.typography.text-level.6.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.6.line-height}" } - }, - "compact": { - "font-size": { "value": "{amsterdam.typography.text-level.6.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.6.line-height}" } - } + "line-height": { "value": "{amsterdam.typography.text-level.6.line-height}" } }, "label": { "color": { "value": "{amsterdam.link-appearance.color}" }, "font-family": { "value": "{amsterdam.typography.font-family}" }, + "font-size": { "value": "{amsterdam.typography.text-level.4.font-size}" }, "font-weight": { "value": "{amsterdam.typography.font-weight.bold}" }, + "line-height": { "value": "{amsterdam.typography.text-level.4.line-height}" }, "text-decoration-line": { "value": "{amsterdam.link-appearance.subtle.text-decoration-line}" }, "text-decoration-thickness": { "value": "{amsterdam.link-appearance.text-decoration-thickness}" }, "text-underline-offset": { "value": "{amsterdam.link-appearance.text-underline-offset}" }, "hover": { "color": { "value": "{amsterdam.color.dark-blue}" }, "text-decoration-line": { "value": "{amsterdam.link-appearance.subtle.hover.text-decoration-line}" } - }, - "spacious": { - "font-size": { "value": "{amsterdam.typography.text-level.4.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.4.line-height}" } - }, - "compact": { - "font-size": { "value": "{amsterdam.typography.text-level.4.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.4.line-height}" } } }, "outline-offset": { "value": "{amsterdam.focus.outline-offset}" } diff --git a/proprietary/tokens/src/components/amsterdam/unordered-list.tokens.json b/proprietary/tokens/src/components/amsterdam/unordered-list.tokens.json index c8d016c66c..e4ad15e7c1 100644 --- a/proprietary/tokens/src/components/amsterdam/unordered-list.tokens.json +++ b/proprietary/tokens/src/components/amsterdam/unordered-list.tokens.json @@ -3,17 +3,11 @@ "unordered-list": { "color": { "value": "{amsterdam.color.primary-black}" }, "font-family": { "value": "{amsterdam.typography.font-family}" }, + "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, "font-weight": { "value": "{amsterdam.typography.font-weight.normal}" }, "gap": { "value": "0.75rem" }, + "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" }, "list-style-type": { "value": "'\\2022'" }, - "spacious": { - "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" } - }, - "compact": { - "font-size": { "value": "{amsterdam.typography.text-level.5.font-size}" }, - "line-height": { "value": "{amsterdam.typography.text-level.5.line-height}" } - }, "item": { "margin-inline-start": { "value": "1.625rem",