Merge branch 'beta' into ts-refactor

# Conflicts: # data/tokens/context/frozenproduct.json # data/tokens/modes/dark.json # data/tokens/modes/light.json # scripts/build.js # scripts/post-process-css/index.ts
Sage · Dec 2, 2024 · c06a598 · c06a598
2 parents 67d0ea3 + 02f5d5c
commit c06a598
Show file tree

Hide file tree

Showing 28 changed files with 2,211 additions and 1,407 deletions.
diff --git a/data/tokens/$themes.json b/data/tokens/$themes.json
diff --git a/data/tokens/components/button.json b/data/tokens/components/button.json
diff --git a/data/tokens/components/container.json b/data/tokens/components/container.json
@@ -16,7 +16,7 @@
           "description": "tile footer bg color "
         },
         "border-active": {
-          "value": "{modes.color.interactive.monochrome.active}",
+          "value": "{modes.color.interactive.monochrome.generic.active}",
           "type": "color"
         },
         "border-alt": {
@@ -85,7 +85,7 @@
       "interactive": {
         "detailedicon": {
           "bg": {
-            "value": "{modes.color.brandreference.custom1}",
+            "value": "{modes.color.custom.default}",
             "type": "color",
             "description": " "
           }
@@ -96,7 +96,7 @@
           "description": " "
         },
         "bgFooter-active": {
-          "value": "{modes.color.interactive.monochrome.active}",
+          "value": "{modes.color.interactive.monochrome.generic.active}",
           "type": "color"
         },
         "border-activated": {
@@ -117,12 +117,12 @@
           "type": "color"
         },
         "bg-hover": {
-          "value": "{modes.color.interactive.monochrome.hoverAlt}",
+          "value": "{modes.color.interactive.monochrome.generic.hoverAlt}",
           "type": "color",
           "description": "Used for accordion hover backgrounds "
         },
         "border-active": {
-          "value": "{modes.color.interactive.monochrome.active}",
+          "value": "{modes.color.interactive.monochrome.generic.active}",
           "type": "color"
         },
         "border-alt": {
@@ -154,35 +154,35 @@
           "type": "color"
         },
         "icon-active": {
-          "value": "{modes.color.interactive.monochrome.active}",
+          "value": "{modes.color.interactive.monochrome.generic.active}",
           "type": "color",
           "description": "Active chevron for any accordion."
         },
         "icon-enabled": {
-          "value": "{modes.color.interactive.monochrome.default}",
+          "value": "{modes.color.interactive.monochrome.generic.default}",
           "type": "color",
           "description": "Enabled chevron for any accordion."
         },
         "iconAlt-enabled": {
-          "value": "{modes.color.interactive.monochrome.defaultAlt}",
+          "value": "{modes.color.interactive.monochrome.generic.defaultAlt}",
           "type": "color",
           "description": "Enabled label for subtle accordion."
         },
         "icon-hover": {
-          "value": "{modes.color.interactive.monochrome.default}",
+          "value": "{modes.color.interactive.monochrome.generic.default}",
           "type": "color",
           "description": "Hover chevron for any accordion."
         },
         "labelFooter-active": {
-          "value": "{modes.color.interactive.monochrome.withActive}",
+          "value": "{modes.color.interactive.monochrome.generic.withActive}",
           "type": "color"
         },
         "labelFooter-activated": {
-          "value": "{modes.color.interactive.monochrome.withActive}",
+          "value": "{modes.color.interactive.monochrome.generic.withActive}",
           "type": "color"
         },
         "text-active": {
-          "value": "{modes.color.interactive.monochrome.active}",
+          "value": "{modes.color.interactive.monochrome.generic.active}",
           "type": "color",
           "description": "Active label for any accordion."
         },
@@ -201,7 +201,7 @@
           "description": "Enabled label for subtle accordion."
         },
         "text-hover": {
-          "value": "{modes.color.interactive.monochrome.default}",
+          "value": "{modes.color.interactive.monochrome.generic.default}",
           "type": "color",
           "description": "Hover label for any accordion."
         }
@@ -234,7 +234,7 @@
       },
       "chatbubble": {
         "maxwidth": {
-          "value": "{global.size.macro.XXXXL}* 5",
+          "value": "{global.size.macro.XXXXL} * 5",
           "type": "sizing",
           "description": "max width for chat bubbles"
         }
@@ -1161,7 +1161,7 @@
               "description": "bottom padding for each section title"
             },
             "L": {
-              "value": "{global.space.macro.XXL}",
+              "value": "{global.space.macro.L}",
               "type": "spacing",
               "description": "top padding for each section title"
             }
@@ -1585,19 +1585,19 @@
       "adaptive": {
         "heading": {
           "M": {
-            "value": "{global.typography.adaptive.heading.XS}",
+            "value": "{global.typography.adaptive.heading.S}",
             "type": "typography",
             "description": "Accordion, Subscription tile, Tile select and generic tile or card headings"
           },
           "L": {
-            "value": "{global.typography.adaptive.heading.S}",
+            "value": "{global.typography.adaptive.heading.M}",
             "type": "typography",
             "description": "Dialog, drawer and sidebar headings"
           }
         },
         "subheading": {
           "M": {
-            "value": "{global.typography.adaptive.subheading.S}",
+            "value": "{global.typography.adaptive.subheading.M}",
             "type": "typography",
             "description": "Accordion subheading,  Step flow subheading, tile select subheading, dialog, drawer and sidebar subheading"
           }
@@ -1634,19 +1634,19 @@
       "responsive": {
         "heading": {
           "M": {
-            "value": "{global.typography.responsive.heading.XS}",
+            "value": "{global.typography.responsive.heading.S}",
             "type": "typography",
             "description": "Accordion, Subscription tile, Tile select and generic tile or card headings"
           },
           "L": {
-            "value": "{global.typography.responsive.heading.S}",
+            "value": "{global.typography.responsive.heading.M}",
             "type": "typography",
             "description": "Dialog, drawer and sidebar headings"
           }
         },
         "subheading": {
           "M": {
-            "value": "{global.typography.responsive.subheading.S}",
+            "value": "{global.typography.responsive.subheading.M}",
             "type": "typography",
             "description": "Accordion subheading,  Step flow subheading, tile select subheading, dialog, drawer and sidebar subheading"
           }