chore: corrected design tokens types

openedx · Sep 3, 2024 · 5843459 · 5843459
1 parent da00992
commit 5843459
Show file tree

Hide file tree

Showing 73 changed files with 95 additions and 76 deletions.
diff --git a/tokens/src/core/alias/size.json b/tokens/src/core/alias/size.json
@@ -1,6 +1,6 @@
 {
-  "$type": "dimension",
   "size": {
+    "$type": "dimension",
     "border": {
       "width": { "source": "$border-width", "$value": "1px", "$description": "Default border width." },
       "radius": {

diff --git a/tokens/src/core/components/ActionRow.json b/tokens/src/core/components/ActionRow.json
@@ -1,6 +1,6 @@
 {
-  "$type": "dimension",
   "spacing": {
+    "$type": "dimension",
     "action-row": {
       "gap": {
         "x": { "source": "$action-row-gap-x", "$value": ".5rem" },

diff --git a/tokens/src/core/components/Annotation.json b/tokens/src/core/components/Annotation.json
@@ -1,6 +1,6 @@
 {
-  "$type": "dimension",
   "spacing": {
+    "$type": "dimension",
     "annotation": {
       "padding": { "source": "$annotation-padding", "$value": ".5rem" },
       "arrow-side": {
@@ -10,11 +10,12 @@
   },
   "typography": {
     "annotation": {
-      "font-size": { "source": "$annotation-font-size", "$value": "{typography.font.size.sm}" },
-      "line-height": { "source": "$annotation-line-height", "$value": "{typography.line-height.sm}", "type": "number" }
+      "font-size": { "source": "$annotation-font-size", "$value": "{typography.font.size.sm}", "$type": "dimension" },
+      "line-height": { "source": "$annotation-line-height", "$value": "{typography.line-height.sm}", "$type": "number" }
     }
   },
   "size": {
+    "$type": "dimension",
     "annotation": {
       "arrow-border": {
         "width": { "source": "$annotation-arrow-border-width", "$value": ".5rem" }

diff --git a/tokens/src/core/components/AvatarButton.json b/tokens/src/core/components/AvatarButton.json
@@ -1,6 +1,6 @@
 {
-  "$type": "dimension",
   "spacing": {
+    "$type": "dimension",
     "avatar-button": {
       "padding-left": {
         "base": { "source": "$avatar-button-padding-left", "$value": ".25em" },

diff --git a/tokens/src/core/components/Breadcrumb.json b/tokens/src/core/components/Breadcrumb.json
@@ -1,13 +1,14 @@
 {
-  "$type": "dimension",
   "spacing": {
+    "$type": "dimension",
     "breadcrumb": {
       "margin": {
         "left": { "source": "$breadcrumb-margin-left", "$value": ".5rem" }
       }
     }
   },
   "size": {
+    "$type": "dimension",
     "breadcrumb": {
       "border": {
         "radius": {

diff --git a/tokens/src/core/components/Bubble.json b/tokens/src/core/components/Bubble.json
@@ -1,6 +1,6 @@
 {
-  "$type": "transition",
   "spacing": {
+    "$type": "transition",
     "bubble": {
       "expandable-padding": {
         "y": { "source": "$bubble-expandable-padding-y", "$value": "0" },

diff --git a/tokens/src/core/components/Card.json b/tokens/src/core/components/Card.json
@@ -1,6 +1,6 @@
 {
-  "$type": "dimension",
   "spacing": {
+    "$type": "dimension",
     "card": {
       "spacer": {
         "x": { "source": "$card-spacer-x", "$value": "1.25rem" },
@@ -40,6 +40,7 @@
     }
   },
   "size": {
+    "$type": "dimension",
     "card": {
       "border": {
         "width": { "source": "$card-border-width", "$value": "{size.border.width}" },
@@ -74,6 +75,7 @@
     }
   },
   "typography": {
+    "$type": "dimension",
     "footer": {
       "text": {
         "font-size": { "source": "$card-footer-text-font-size", "$value": "{typography.font.size.xs}" }

diff --git a/tokens/src/core/components/Chip.json b/tokens/src/core/components/Chip.json
@@ -1,6 +1,6 @@
 {
-  "$type": "dimension",
   "spacing": {
+    "$type": "dimension",
     "chip": {
       "margin": {
         "base": { "source": "$chip-margin", "$value": ".125rem" },
@@ -24,6 +24,7 @@
     }
   },
   "size": {
+    "$type": "dimension",
     "chip": {
       "border-radius": { "source": "$chip-border-radius", "$value": ".375rem" },
       "icon": { "source": "$chip-icon-size", "$value": "1.5rem" }

diff --git a/tokens/src/core/components/ChipCarousel.json b/tokens/src/core/components/ChipCarousel.json
@@ -1,6 +1,6 @@
 {
-  "$type": "dimension",
   "spacing": {
+    "$type": "dimension",
     "chip-carousel": {
       "controls-top-offset": { "source": "$chip-carousel-controls-top-offset", "$value": ".375rem" },
       "container": {

diff --git a/tokens/src/core/components/Collapsible.json b/tokens/src/core/components/Collapsible.json
@@ -1,6 +1,6 @@
 {
-  "$type": "dimension",
   "spacing": {
+    "$type": "dimension",
     "collapsible": {
       "card": {
         "spacer": {

diff --git a/tokens/src/core/components/ColorPicker.json b/tokens/src/core/components/ColorPicker.json
@@ -1,6 +1,6 @@
 {
-  "$type": "dimension",
   "size": {
+    "$type": "dimension",
     "color-picker": {
       "sm": { "source": "$picker-size-sm", "$value": "2rem" },
       "md": { "source": "$picker-size-md", "$value": "calc(1.3333em + 1.125rem + 2px)" }

diff --git a/tokens/src/core/components/Container.json b/tokens/src/core/components/Container.json
@@ -1,6 +1,6 @@
 {
-  "$type": "dimension",
   "size": {
+    "$type": "dimension",
     "container": {
       "max-width": {
         "xs": { "source": "$max-width-xs", "$value": "464px" },

diff --git a/tokens/src/core/components/Dropzone.json b/tokens/src/core/components/Dropzone.json
@@ -1,13 +1,14 @@
 {
-  "$type": "dimension",
   "typography": {
+    "$type": "dimension",
     "dropzone": {
       "restriction-msg": {
         "font-size": { "source": "$dropzone-restriction-msg-font-size", "$value": "{typography.font.size.xs}" }
       }
     }
   },
   "spacing": {
+    "$type": "dimension",
     "dropzone": {
       "padding": { "source": "$dropzone-padding", "$value": "1.5rem" },
       "border": {

diff --git a/tokens/src/core/components/Form/spacing.json b/tokens/src/core/components/Form/spacing.json
@@ -1,6 +1,6 @@
 {
-  "$type": "dimension",
   "spacing": {
+    "$type": "dimension",
     "form": {
       "input": {
         "padding": {

diff --git a/tokens/src/core/components/Form/transition.json b/tokens/src/core/components/Form/transition.json
@@ -1,6 +1,6 @@
 {
-  "$type": "transition",
   "transition": {
+    "$type": "transition",
     "form": {
       "input": {
         "source": "$input-transition",

diff --git a/tokens/src/core/components/Icon.json b/tokens/src/core/components/Icon.json
@@ -1,6 +1,6 @@
 {
-  "$type": "dimension",
   "size": {
+    "$type": "dimension",
     "icon": {
       "inline": { "source": "$icon-inline", "$value": ".8em" },
       "xs": { "source": "$icon-xs", "$value": "1rem" },

diff --git a/tokens/src/core/components/IconButton.json b/tokens/src/core/components/IconButton.json
@@ -1,6 +1,6 @@
 {
-  "$type": "dimension",
   "size": {
+    "$type": "dimension",
     "icon-button": {
       "diameter": {
         "md": { "source": "$btn-icon-diameter-md", "$value": "2.75rem" },

diff --git a/tokens/src/core/components/Navbar.json b/tokens/src/core/components/Navbar.json
@@ -1,6 +1,6 @@
 {
-  "$type": "dimension",
   "spacing": {
+    "$type": "dimension",
     "navbar": {
       "padding": {
         "y": { "source": "$navbar-padding-y", "$value": "calc({spacing.spacer.base} / 2)" },
@@ -23,6 +23,7 @@
     }
   },
   "typography": {
+    "$type": "dimension",
     "navbar": {
       "brand": {
         "font-size": { "source": "$navbar-brand-font-size", "$value": "{typography.font.size.lg}" }
@@ -36,6 +37,7 @@
     }
   },
   "size": {
+    "$type": "dimension",
     "navbar": {
       "nav": {
         "scroll": {

diff --git a/tokens/src/core/components/Pagination.json b/tokens/src/core/components/Pagination.json
@@ -1,14 +1,15 @@
 {
-  "$type": "dimension",
   "typography": {
     "pagination": {
       "font-size": {
+        "$type": "dimension",
         "sm": { "source": "$pagination-font-size-sm", "$value": ".875rem" }
       },
       "line-height": { "source": "$pagination-line-height", "$value": "1.5rem", "$type": "number" }
     }
   },
   "spacing": {
+    "$type": "dimension",
     "pagination": {
       "padding": {
         "y": {
@@ -25,6 +26,7 @@
     }
   },
   "size": {
+    "$type": "dimension",
     "pagination": {
       "icon": {
         "width": { "source": "$pagination-icon-width", "$value": "2.25rem" },

diff --git a/tokens/src/core/components/SearchField.json b/tokens/src/core/components/SearchField.json
@@ -1,6 +1,6 @@
 {
-  "$type": "dimension",
   "size": {
+    "$type": "dimension",
     "search-field": {
       "border": {
         "width": {
@@ -13,6 +13,7 @@
     }
   },
   "spacing": {
+    "$type": "dimension",
     "search-field": {
       "margin-button": { "source": "$search-button-margin", "$value": ".5rem" }
     }

diff --git a/tokens/src/core/components/SelectableBox.json b/tokens/src/core/components/SelectableBox.json
@@ -1,6 +1,6 @@
 {
-  "$type": "dimension",
   "spacing": {
+    "$type": "dimension",
     "selectable-box": {
       "padding": { "source": "$selectable-box-padding", "$value": "1rem" },
       "border-radius": { "source": "$selectable-box-border-radius", "$value": ".25rem" },

diff --git a/tokens/src/core/components/Sheet.json b/tokens/src/core/components/Sheet.json
@@ -1,6 +1,6 @@
 {
-  "$type": "ratio",
   "elevation": {
+    "$type": "ratio",
     "sheet": {
       "zindex": {
         "backdrop": { "source": "$zindex-sheet-backdrop", "$value": "1031" },

diff --git a/tokens/src/core/components/Spinner.json b/tokens/src/core/components/Spinner.json
@@ -1,6 +1,6 @@
 {
-  "$type": "dimension",
   "size": {
+    "$type": "dimension",
     "spinner": {
       "base": {
         "width": { "source": "$spinner-width", "$value": "2rem" },
@@ -15,6 +15,7 @@
     }
   },
   "spacing": {
+    "$type": "dimension",
     "vertical-align": { "source": "$spinner-vertical-align", "$value": ".125em" }
   }
 }
diff --git a/tokens/src/core/components/Stack.json b/tokens/src/core/components/Stack.json
@@ -1,6 +1,6 @@
 {
-  "$type": "dimension",
   "size": {
+    "$type": "dimension",
     "stack": {
       "gap": { "source": "$stack-gap", "$value": "0" }
     }

diff --git a/tokens/src/core/components/Stepper.json b/tokens/src/core/components/Stepper.json
@@ -1,6 +1,6 @@
 {
-  "$type": "dimension",
   "spacing": {
+    "$type": "dimension",
     "stepper": {
       "header": {
         "padding": {
@@ -21,6 +21,7 @@
     }
   },
   "size": {
+    "$type": "dimension",
     "stepper": {
       "header": {
         "height-min": { "source": "$stepper-header-min-height", "$value": "5.13rem" }

diff --git a/tokens/src/core/components/Sticky.json b/tokens/src/core/components/Sticky.json
@@ -1,6 +1,6 @@
 {
-  "$type": "dimension",
   "spacing": {
+    "$type": "dimension",
     "sticky": {
       "offset": { "source": "$sticky-offset", "$value": "0" }
     }

diff --git a/tokens/src/core/components/Tab.json b/tokens/src/core/components/Tab.json
@@ -1,6 +1,6 @@
 {
-  "$type": "dimension",
   "spacing": {
+    "$type": "dimension",
     "tab": {
       "more-link-dropdown-toggle": {
         "padding-x": { "source": "$tab-more-link-dropdown-toggle-padding-x", "$value": ".7rem" },

diff --git a/tokens/src/core/components/Tabs.json b/tokens/src/core/components/Tabs.json
@@ -1,6 +1,6 @@
 {
-  "$type": "dimension",
   "size": {
+    "$type": "dimension",
     "tabs": {
       "notification": {
         "height": { "source": "$tab-notification-height", "$value": "1rem" },
@@ -9,6 +9,7 @@
     }
   },
   "typography": {
+    "$type": "dimension",
     "tabs": {
       "notification": {
         "font-size": { "source": "$tab-notification-font-size", "$value": "{typography.font.size.xs}" }

diff --git a/tokens/src/core/components/Toast.json b/tokens/src/core/components/Toast.json
@@ -1,11 +1,12 @@
 {
-  "$type": "dimension",
   "typography": {
+    "$type": "dimension",
     "toast": {
       "font-size": { "source": "$toast-font-size", "$value": ".875rem" }
     }
   },
   "size": {
+    "$type": "dimension",
     "toast": {
       "max-width": { "source": "$toast-max-width", "$value": "400px" },
       "border": {
@@ -15,6 +16,7 @@
     }
   },
   "spacing": {
+    "$type": "dimension",
     "toast": {
       "padding": {
         "x": { "source": "$toast-padding-x", "$value": ".75rem" },

diff --git a/tokens/src/core/components/general/caret.json b/tokens/src/core/components/general/caret.json
@@ -1,11 +1,12 @@
 {
-  "$type": "dimension",
   "size": {
+    "$type": "dimension",
     "caret": {
       "width": { "source": "$caret-width", "$value": ".3em" }
     }
   },
   "spacing": {
+    "$type": "dimension",
     "caret": {
       "base": { "source": "$caret-spacing", "$value": ".255em" },
       "vertical-align": { "source": "$caret-vertical-align", "$value": ".255em" }

diff --git a/tokens/src/core/components/general/hr.json b/tokens/src/core/components/general/hr.json
@@ -1,6 +1,6 @@
 {
-  "$type": "dimension",
   "size": {
+    "$type": "dimension",
     "hr": {
       "border": {
         "width": { "source": "$hr-border-width", "$value": "{size.border.width}" },

diff --git a/tokens/src/core/components/general/link.json b/tokens/src/core/components/general/link.json
@@ -1,8 +1,8 @@
 {
-  "$type": "textDecoration",
   "typography": {
     "link": {
       "decoration": {
+        "$type": "textDecoration",
         "base": { "source": "$link-decoration", "$value": "none" },
         "hover": { "source": "$link-hover-decoration", "$value": "underline" },
         "inline": {