Remove compact and spacious from component level tokens

Amsterdam · Feb 7, 2024 · d75dd58 · d75dd58
1 parent 98e5068
commit d75dd58
Show file tree

Hide file tree

Showing 22 changed files with 102 additions and 302 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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,<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>\")"
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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}" },