Remove ‘common’ from typography token names

Amsterdam · Feb 1, 2025 · 5325582 · 5325582
1 parent 3f48741
commit 5325582
Show file tree

Hide file tree

Showing 43 changed files with 258 additions and 258 deletions.
diff --git a/proprietary/tokens/src/common/ams/body-text.tokens.json b/proprietary/tokens/src/common/ams/body-text.tokens.json
@@ -0,0 +1,25 @@
+{
+  "ams": {
+    "body-text": {
+      "font-family": { "value": "{ams.typography.font-family.body-text}" },
+      "font-size": { "value": "{ams.typography.font-size.md}" },
+      "font-weight": { "value": "{ams.typography.font-weight.normal}" },
+      "line-height": { "value": "{ams.typography.line-height.5xl}" },
+      "sm": {
+        "font-size": { "value": "{ams.typography.font-size.sm}" },
+        "line-height": { "value": "{ams.typography.line-height.2xl}" }
+      },
+      "lg": {
+        "font-size": { "value": "{ams.typography.font-size.lg}" },
+        "line-height": { "value": "{ams.typography.line-height.2xl}" }
+      },
+      "xl": {
+        "font-size": { "value": "{ams.typography.font-size.xl}" },
+        "line-height": { "value": "{ams.typography.line-height.2xl}" }
+      },
+      "bold": {
+        "font-weight": { "value": "{ams.typography.font-weight.bold}" }
+      }
+    }
+  }
+}
diff --git a/proprietary/tokens/src/common/ams/headings.tokens.json b/proprietary/tokens/src/common/ams/headings.tokens.json
@@ -0,0 +1,36 @@
+{
+  "ams": {
+    "headings": {
+      "font-family": { "value": "{ams.typography.font-family.headings}" },
+      "font-weight": { "value": "{ams.typography.font-weight.x-bold}" },
+      "level-0": {
+        "font-size": { "value": "{ams.typography.font-size.4xl}" },
+        "line-height": { "value": "{ams.typography.line-height.5xs}" }
+      },
+      "level-1": {
+        "font-size": { "value": "{ams.typography.font-size.3xl}" },
+        "line-height": { "value": "{ams.typography.line-height.4xs}" }
+      },
+      "level-2": {
+        "font-size": { "value": "{ams.typography.font-size.2xl}" },
+        "line-height": { "value": "{ams.typography.line-height.3xs}" }
+      },
+      "level-3": {
+        "font-size": { "value": "{ams.typography.font-size.xl}" },
+        "line-height": { "value": "{ams.typography.line-height.2xs}" }
+      },
+      "level-4": {
+        "font-size": { "value": "{ams.typography.font-size.lg}" },
+        "line-height": { "value": "{ams.typography.line-height.xs}" }
+      },
+      "level-5": {
+        "font-size": { "value": "{ams.typography.font-size.md}" },
+        "line-height": { "value": "{ams.typography.line-height.sm}" }
+      },
+      "level-6": {
+        "font-size": { "value": "{ams.typography.font-size.sm}" },
+        "line-height": { "value": "{ams.typography.line-height.md}" }
+      }
+    }
+  }
+}
diff --git a/proprietary/tokens/src/common/ams/typography.tokens.json b/proprietary/tokens/src/common/ams/typography.tokens.json
diff --git a/proprietary/tokens/src/components/ams/accordion.tokens.json b/proprietary/tokens/src/components/ams/accordion.tokens.json
@@ -4,11 +4,11 @@
       "gap": { "value": "{ams.space.md}" },
       "button": {
         "color": { "value": "{ams.color.interactive.default}" },
-        "font-family": { "value": "{ams.common.typography.headings.font-family}" },
-        "font-size": { "value": "{ams.common.typography.headings.level-5.font-size}" },
-        "font-weight": { "value": "{ams.common.typography.headings.font-weight}" },
+        "font-family": { "value": "{ams.headings.font-family}" },
+        "font-size": { "value": "{ams.headings.level-5.font-size}" },
+        "font-weight": { "value": "{ams.headings.font-weight}" },
         "gap": { "value": "{ams.space.sm}" },
-        "line-height": { "value": "{ams.common.typography.headings.level-5.line-height}" },
+        "line-height": { "value": "{ams.headings.level-5.line-height}" },
         "padding-block": { "value": "{ams.space.sm}" },
         "padding-inline": { "value": "0" },
         "focus": {

diff --git a/proprietary/tokens/src/components/ams/avatar.tokens.json b/proprietary/tokens/src/components/ams/avatar.tokens.json
@@ -4,10 +4,10 @@
       "aspect-ratio": { "value": "{ams.aspect-ratio.square}" },
       "background-color": { "value": "{ams.color.highlight.purple}" },
       "color": { "value": "{ams.color.text.inverse}" },
-      "font-family": { "value": "{ams.common.typography.body-text.font-family}" },
-      "font-size": { "value": "{ams.common.typography.body-text.sm.font-size}" },
-      "font-weight": { "value": "{ams.common.typography.body-text.font-weight}" },
-      "line-height": { "value": "{ams.common.typography.body-text.sm.line-height}" },
+      "font-family": { "value": "{ams.body-text.font-family}" },
+      "font-size": { "value": "{ams.body-text.sm.font-size}" },
+      "font-weight": { "value": "{ams.body-text.font-weight}" },
+      "line-height": { "value": "{ams.body-text.sm.line-height}" },
       "padding-block": { "value": "{ams.space.xs}" },
       "padding-inline": { "value": "{ams.space.xs}" },
       "dark-green": {

diff --git a/proprietary/tokens/src/components/ams/badge.tokens.json b/proprietary/tokens/src/components/ams/badge.tokens.json
@@ -3,10 +3,10 @@
     "badge": {
       "background-color": { "value": "{ams.color.highlight.green}" },
       "color": { "value": "{ams.color.text.inverse}" },
-      "font-family": { "value": "{ams.common.typography.body-text.font-family}" },
-      "font-size": { "value": "{ams.common.typography.body-text.font-size}" },
-      "font-weight": { "value": "{ams.common.typography.bold.font-weight}" },
-      "line-height": { "value": "{ams.common.typography.body-text.line-height}" },
+      "font-family": { "value": "{ams.body-text.font-family}" },
+      "font-size": { "value": "{ams.body-text.font-size}" },
+      "font-weight": { "value": "{ams.body-text.bold.font-weight}" },
+      "line-height": { "value": "{ams.body-text.line-height}" },
       "padding-inline": { "value": "{ams.space.xs}" },
       "green": {
         "background-color": { "value": "{ams.color.highlight.lime}" },

diff --git a/proprietary/tokens/src/components/ams/blockquote.tokens.json b/proprietary/tokens/src/components/ams/blockquote.tokens.json
@@ -2,11 +2,11 @@
   "ams": {
     "blockquote": {
       "color": { "value": "{ams.color.text.default}" },
-      "font-family": { "value": "{ams.common.typography.body-text.font-family}" },
-      "font-size": { "value": "{ams.common.typography.body-text.xl.font-size}" },
-      "font-weight": { "value": "{ams.common.typography.bold.font-weight}" },
+      "font-family": { "value": "{ams.body-text.font-family}" },
+      "font-size": { "value": "{ams.body-text.xl.font-size}" },
+      "font-weight": { "value": "{ams.body-text.bold.font-weight}" },
       "inverse-color": { "value": "{ams.color.text.inverse}" },
-      "line-height": { "value": "{ams.common.typography.body-text.xl.line-height}" }
+      "line-height": { "value": "{ams.body-text.xl.line-height}" }
     }
   }
 }
diff --git a/proprietary/tokens/src/components/ams/breadcrumb.tokens.json b/proprietary/tokens/src/components/ams/breadcrumb.tokens.json
@@ -1,10 +1,10 @@
 {
   "ams": {
     "breadcrumb": {
-      "font-family": { "value": "{ams.common.typography.body-text.font-family}" },
-      "font-size": { "value": "{ams.common.typography.body-text.sm.font-size}" },
-      "font-weight": { "value": "{ams.common.typography.body-text.font-weight}" },
-      "line-height": { "value": "{ams.common.typography.body-text.sm.line-height}" },
+      "font-family": { "value": "{ams.body-text.font-family}" },
+      "font-size": { "value": "{ams.body-text.sm.font-size}" },
+      "font-weight": { "value": "{ams.body-text.font-weight}" },
+      "line-height": { "value": "{ams.body-text.sm.line-height}" },
       "separator": {
         "background-image": {
           "value": "url(\"data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32'><path fill='%23000000' fill-rule='evenodd' d='m9.757 32-2.9-2.91L19.937 16 6.857 2.91 9.757 0l16 16z'/></svg>\")"

diff --git a/proprietary/tokens/src/components/ams/button.tokens.json b/proprietary/tokens/src/components/ams/button.tokens.json
@@ -2,9 +2,9 @@
   "ams": {
     "button": {
       "cursor": { "value": "{ams.action.activate.cursor}" },
-      "font-family": { "value": "{ams.common.typography.body-text.font-family}" },
-      "font-size": { "value": "{ams.common.typography.body-text.font-size}" },
-      "line-height": { "value": "{ams.common.typography.body-text.line-height}" },
+      "font-family": { "value": "{ams.body-text.font-family}" },
+      "font-size": { "value": "{ams.body-text.font-size}" },
+      "line-height": { "value": "{ams.body-text.line-height}" },
       "gap": { "value": "{ams.space.sm}" },
       "outline-offset": { "value": "{ams.focus.outline-offset}" },
       "padding-block": { "value": "{ams.space.sm}" },

diff --git a/proprietary/tokens/src/components/ams/character-count.tokens.json b/proprietary/tokens/src/components/ams/character-count.tokens.json
@@ -2,10 +2,10 @@
   "ams": {
     "character-count": {
       "color": { "value": "{ams.color.text.default}" },
-      "font-family": { "value": "{ams.common.typography.body-text.font-family}" },
-      "font-size": { "value": "{ams.common.typography.body-text.sm.font-size}" },
-      "font-weight": { "value": "{ams.common.typography.body-text.font-weight}" },
-      "line-height": { "value": "{ams.common.typography.body-text.sm.line-height}" },
+      "font-family": { "value": "{ams.body-text.font-family}" },
+      "font-size": { "value": "{ams.body-text.sm.font-size}" },
+      "font-weight": { "value": "{ams.body-text.font-weight}" },
+      "line-height": { "value": "{ams.body-text.sm.line-height}" },
       "error": {
         "color": { "value": "{ams.color.feedback.error}" }
       }

diff --git a/proprietary/tokens/src/components/ams/checkbox.tokens.json b/proprietary/tokens/src/components/ams/checkbox.tokens.json
@@ -2,11 +2,11 @@
   "ams": {
     "checkbox": {
       "color": { "value": "{ams.color.text.default}" },
-      "font-family": { "value": "{ams.common.typography.body-text.font-family}" },
-      "font-size": { "value": "{ams.common.typography.body-text.font-size}" },
-      "font-weight": { "value": "{ams.common.typography.body-text.font-weight}" },
+      "font-family": { "value": "{ams.body-text.font-family}" },
+      "font-size": { "value": "{ams.body-text.font-size}" },
+      "font-weight": { "value": "{ams.body-text.font-weight}" },
       "gap": { "value": "{ams.space.sm}" },
-      "line-height": { "value": "{ams.common.typography.body-text.line-height}" },
+      "line-height": { "value": "{ams.body-text.line-height}" },
       "outline-offset": { "value": "{ams.focus.outline-offset}" },
       "checkmark": {
         "border-color": { "value": "{ams.color.interactive.default}" },

diff --git a/proprietary/tokens/src/components/ams/date-input.tokens.json b/proprietary/tokens/src/components/ams/date-input.tokens.json
@@ -4,10 +4,10 @@
       "background-color": { "value": "{ams.color.background}" },
       "box-shadow": { "value": "inset 0 0 0 {ams.border.width.sm} {ams.color.interactive.secondary}" },
       "color": { "value": "{ams.color.text.default}" },
-      "font-family": { "value": "{ams.common.typography.body-text.font-family}" },
-      "font-size": { "value": "{ams.common.typography.body-text.font-size}" },
-      "font-weight": { "value": "{ams.common.typography.body-text.font-weight}" },
-      "line-height": { "value": "{ams.common.typography.body-text.line-height}" },
+      "font-family": { "value": "{ams.body-text.font-family}" },
+      "font-size": { "value": "{ams.body-text.font-size}" },
+      "font-weight": { "value": "{ams.body-text.font-weight}" },
+      "line-height": { "value": "{ams.body-text.line-height}" },
       "outline-offset": { "value": "{ams.focus.outline-offset}" },
       "padding-block": { "value": "{ams.space.sm}" },
       "padding-inline": { "value": "{ams.space.md}" },

diff --git a/proprietary/tokens/src/components/ams/description-list.tokens.json b/proprietary/tokens/src/components/ams/description-list.tokens.json
@@ -3,16 +3,16 @@
     "description-list": {
       "color": { "value": "{ams.color.text.default}" },
       "column-gap": { "value": "{ams.space.lg}" },
-      "font-family": { "value": "{ams.common.typography.body-text.font-family}" },
-      "font-size": { "value": "{ams.common.typography.body-text.font-size}" },
+      "font-family": { "value": "{ams.body-text.font-family}" },
+      "font-size": { "value": "{ams.body-text.font-size}" },
       "inverse-color": { "value": "{ams.color.text.inverse}" },
-      "line-height": { "value": "{ams.common.typography.body-text.line-height}" },
+      "line-height": { "value": "{ams.body-text.line-height}" },
       "row-gap": { "value": "{ams.space.sm}" },
       "term": {
-        "font-weight": { "value": "{ams.common.typography.bold.font-weight}" }
+        "font-weight": { "value": "{ams.body-text.bold.font-weight}" }
       },
       "description": {
-        "font-weight": { "value": "{ams.common.typography.body-text.font-weight}" },
+        "font-weight": { "value": "{ams.body-text.font-weight}" },
         "padding-inline-start": { "value": "{ams.space.lg}" }
       }
     }

diff --git a/proprietary/tokens/src/components/ams/error-message.tokens.json b/proprietary/tokens/src/components/ams/error-message.tokens.json
@@ -2,11 +2,11 @@
   "ams": {
     "error-message": {
       "color": { "value": "{ams.color.feedback.error}" },
-      "font-family": { "value": "{ams.common.typography.body-text.font-family}" },
-      "font-size": { "value": "{ams.common.typography.body-text.sm.font-size}" },
-      "font-weight": { "value": "{ams.common.typography.body-text.font-weight}" },
+      "font-family": { "value": "{ams.body-text.font-family}" },
+      "font-size": { "value": "{ams.body-text.sm.font-size}" },
+      "font-weight": { "value": "{ams.body-text.font-weight}" },
       "gap": { "value": "{ams.space.xs}" },
-      "line-height": { "value": "{ams.common.typography.body-text.sm.line-height}" }
+      "line-height": { "value": "{ams.body-text.sm.line-height}" }
     }
   }
 }
diff --git a/proprietary/tokens/src/components/ams/field-set.tokens.json b/proprietary/tokens/src/components/ams/field-set.tokens.json
@@ -7,10 +7,10 @@
       },
       "legend": {
         "color": { "value": "{ams.color.text.default}" },
-        "font-family": { "value": "{ams.common.typography.headings.font-family}" },
-        "font-size": { "value": "{ams.common.typography.headings.level-4.font-size}" },
-        "font-weight": { "value": "{ams.common.typography.headings.font-weight}" },
-        "line-height": { "value": "{ams.common.typography.headings.level-4.line-height}" },
+        "font-family": { "value": "{ams.headings.font-family}" },
+        "font-size": { "value": "{ams.headings.level-4.font-size}" },
+        "font-weight": { "value": "{ams.headings.font-weight}" },
+        "line-height": { "value": "{ams.headings.level-4.line-height}" },
         "margin-block-end": { "value": "{ams.space.md}" }
       }
     }

diff --git a/proprietary/tokens/src/components/ams/figure.tokens.json b/proprietary/tokens/src/components/ams/figure.tokens.json
@@ -4,10 +4,10 @@
       "gap": { "value": "{ams.space.sm}" },
       "caption": {
         "color": { "value": "{ams.color.text.default}" },
-        "font-family": { "value": "{ams.common.typography.body-text.font-family}" },
-        "font-size": { "value": "{ams.common.typography.body-text.sm.font-size}" },
-        "font-weight": { "value": "{ams.common.typography.body-text.font-weight}" },
-        "line-height": { "value": "{ams.common.typography.body-text.sm.line-height}" },
+        "font-family": { "value": "{ams.body-text.font-family}" },
+        "font-size": { "value": "{ams.body-text.sm.font-size}" },
+        "font-weight": { "value": "{ams.body-text.font-weight}" },
+        "line-height": { "value": "{ams.body-text.sm.line-height}" },
         "inverse-color": { "value": "{ams.color.text.inverse}" }
       }
     }

diff --git a/proprietary/tokens/src/components/ams/file-input.tokens.json b/proprietary/tokens/src/components/ams/file-input.tokens.json
@@ -5,10 +5,10 @@
       "border": { "value": "{ams.border.width.sm} dashed {ams.color.interactive.secondary}" },
       "color": { "value": "{ams.color.text.default}" },
       "cursor": { "value": "{ams.action.activate.cursor}" },
-      "font-family": { "value": "{ams.common.typography.body-text.font-family}" },
-      "font-size": { "value": "{ams.common.typography.body-text.font-size}" },
-      "font-weight": { "value": "{ams.common.typography.body-text.font-weight}" },
-      "line-height": { "value": "{ams.common.typography.body-text.line-height}" },
+      "font-family": { "value": "{ams.body-text.font-family}" },
+      "font-size": { "value": "{ams.body-text.font-size}" },
+      "font-weight": { "value": "{ams.body-text.font-weight}" },
+      "line-height": { "value": "{ams.body-text.line-height}" },
       "outline-offset": { "value": "{ams.focus.outline-offset}" },
       "padding-block": { "value": "{ams.space.md}" },
       "padding-inline": { "value": "{ams.space.md}" },

diff --git a/proprietary/tokens/src/components/ams/file-list.tokens.json b/proprietary/tokens/src/components/ams/file-list.tokens.json
@@ -4,11 +4,11 @@
       "gap": { "value": "{ams.space.md}" },
       "padding-block": { "value": "{ams.space.md}" },
       "file": {
-        "font-family": { "value": "{ams.common.typography.body-text.font-family}" },
-        "font-size": { "value": "{ams.common.typography.body-text.sm.font-size}" },
-        "font-weight": { "value": "{ams.common.typography.body-text.font-weight}" },
+        "font-family": { "value": "{ams.body-text.font-family}" },
+        "font-size": { "value": "{ams.body-text.sm.font-size}" },
+        "font-weight": { "value": "{ams.body-text.font-weight}" },
         "gap": { "value": "{ams.space.sm}" },
-        "line-height": { "value": "{ams.common.typography.body-text.sm.line-height}" },
+        "line-height": { "value": "{ams.body-text.sm.line-height}" },
         "details": {
           "color": { "value": "{ams.color.text.secondary}" }
         },

diff --git a/proprietary/tokens/src/components/ams/header.tokens.json b/proprietary/tokens/src/components/ams/header.tokens.json
@@ -28,10 +28,10 @@
         "item": {
           "color": { "value": "{ams.link-appearance.color}" },
           "column-gap": { "value": "{ams.space.xs}" },
-          "font-family": { "value": "{ams.common.typography.body-text.font-family}" },
-          "font-size": { "value": "{ams.common.typography.body-text.font-size}" },
-          "font-weight": { "value": "{ams.common.typography.body-text.font-weight}" },
-          "line-height": { "value": "{ams.common.typography.body-text.line-height}" },
+          "font-family": { "value": "{ams.body-text.font-family}" },
+          "font-size": { "value": "{ams.body-text.font-size}" },
+          "font-weight": { "value": "{ams.body-text.font-weight}" },
+          "line-height": { "value": "{ams.body-text.line-height}" },
           "outline-offset": { "value": "{ams.focus.outline-offset}" },
           "padding-block": { "value": "{ams.space.xs}" },
           "hover": {