@adobe/spectrum-tokens 12.5.0-beta.0 → 12.5.0-beta.1

package/CHANGELOG.md

@@ -1,11 +1,54 @@
 # @adobe/spectrum-tokens
 
+## 12.5.0-beta.1
+
+### Minor Changes
+
+- 75d4661: Added color tokens for the table component
+
 ## 12.5.0-beta.0
 
 ### Minor Changes
 
 - beb4336: Added table tokens
 
+## 12.6.0
+
+### Minor Changes
+
+- ee5bfd8: Adding a couple tokens to floating action button that should have been included earlier.
+- 853d8c3: Removed express specific token data for color loupe and color handle
+- c9e76ab: Contextual help did not have any type specific tokens when it was initially defined.
+
+#### Token Diff
+
+_Tokens added (4):_
+
+- `floating-action-button-drop-shadow-y`
+- `floating-action-button-shadow-color`
+- `contextual-help-body-size`
+- `contextual-help-title-size`
+
+_Tokens values updated (7):_
+
+- `color-handle-drop-shadow-blur`
+- `color-handle-drop-shadow-x`
+- `color-handle-drop-shadow-y`
+- `color-handle-outer-border-opacity`
+- `color-handle-outer-border-width`
+- `color-handle-size`
+- `color-handle-size-key-focus`
+
+_Newly deprecated tokens (1):_
+
+- `color-handle-drop-shadow-color`
+
+## 12.5.0
+
+### Minor Changes
+
+- c1eaeee: Added new tokens for slider. Deprecated old slider tokens.
+
 ## 12.4.0
 
 ### Minor Changes

package/dist/json/drover.json

@@ -94,14 +94,10 @@
       "code-color": "rgb(34, 34, 34)",
       "color-area-border-color": "rgb(0, 0, 0)",
       "color-area-border-width": "1px",
-      "color-handle-drop-shadow-blur": "0",
-      "color-handle-drop-shadow-x": "0",
-      "color-handle-drop-shadow-y": "0",
       "color-handle-inner-border-color": "rgb(0, 0, 0)",
       "color-handle-inner-border-opacity": "0.42",
       "color-handle-outer-border-color": "rgb(0, 0, 0)",
       "color-handle-outer-border-opacity": "0.42",
-      "color-handle-outer-border-width": "1px",
       "color-loupe-bottom-to-color-handle": "12px",
       "color-loupe-drop-shadow-color": "rgba(0, 0, 0, 0.25)",
       "color-loupe-height": "64px",
@@ -138,6 +134,7 @@
       "disabled-static-white-content-color": "rgba(255, 255, 255, 0.55)",
       "drop-shadow-color": "rgba(0, 0, 0, 0.15)",
       "drop-zone-background-color": "rgb(20, 122, 243)",
+      "floating-action-button-shadow-color": "rgba(0, 0, 0, 0.25)",
       "focus-indicator-color": "rgb(20, 122, 243)",
       "fuchsia-100": "rgb(255, 233, 252)",
       "fuchsia-1000": "rgb(157, 3, 158)",
@@ -403,6 +400,9 @@
       "static-white-focus-indicator-color": "rgb(255, 255, 255)",
       "swatch-border-color": "rgb(0, 0, 0)",
       "swatch-disabled-icon-border-color": "rgb(0, 0, 0)",
+      "table-row-hover-color": "rgb(0, 0, 0)",
+      "table-selected-row-background-color": "rgb(2, 101, 220)",
+      "table-selected-row-background-color-non-emphasized": "rgb(70, 70, 70)",
       "thumbnail-border-color": "rgb(34, 34, 34)",
       "transparent-black-100": "rgba(0, 0, 0, 0)",
       "transparent-black-200": "rgba(0, 0, 0, 0.1)",
@@ -523,14 +523,10 @@
       "code-color": "rgb(235, 235, 235)",
       "color-area-border-color": "rgb(255, 255, 255)",
       "color-area-border-width": "1px",
-      "color-handle-drop-shadow-blur": "0",
-      "color-handle-drop-shadow-x": "0",
-      "color-handle-drop-shadow-y": "0",
       "color-handle-inner-border-color": "rgb(0, 0, 0)",
       "color-handle-inner-border-opacity": "0.42",
       "color-handle-outer-border-color": "rgb(0, 0, 0)",
       "color-handle-outer-border-opacity": "0.42",
-      "color-handle-outer-border-width": "1px",
       "color-loupe-bottom-to-color-handle": "12px",
       "color-loupe-drop-shadow-color": "rgba(0, 0, 0, 0.25)",
       "color-loupe-height": "64px",
@@ -567,6 +563,7 @@
       "disabled-static-white-content-color": "rgba(255, 255, 255, 0.55)",
       "drop-shadow-color": "rgba(0, 0, 0, 0.5)",
       "drop-zone-background-color": "rgb(114, 183, 249)",
+      "floating-action-button-shadow-color": "rgba(0, 0, 0, 0.25)",
       "focus-indicator-color": "rgb(84, 163, 246)",
       "fuchsia-100": "rgb(107, 3, 106)",
       "fuchsia-1000": "rgb(250, 168, 245)",
@@ -832,6 +829,9 @@
       "static-white-focus-indicator-color": "rgb(255, 255, 255)",
       "swatch-border-color": "rgb(255, 255, 255)",
       "swatch-disabled-icon-border-color": "rgb(0, 0, 0)",
+      "table-row-hover-color": "rgb(255, 255, 255)",
+      "table-selected-row-background-color": "rgb(3, 103, 224)",
+      "table-selected-row-background-color-non-emphasized": "rgb(209, 209, 209)",
       "thumbnail-border-color": "rgb(235, 235, 235)",
       "transparent-black-100": "rgba(0, 0, 0, 0)",
       "transparent-black-200": "rgba(0, 0, 0, 0.1)",
@@ -952,14 +952,10 @@
       "code-color": "rgb(235, 235, 235)",
       "color-area-border-color": "rgb(255, 255, 255)",
       "color-area-border-width": "1px",
-      "color-handle-drop-shadow-blur": "0",
-      "color-handle-drop-shadow-x": "0",
-      "color-handle-drop-shadow-y": "0",
       "color-handle-inner-border-color": "rgb(0, 0, 0)",
       "color-handle-inner-border-opacity": "0.42",
       "color-handle-outer-border-color": "rgb(0, 0, 0)",
       "color-handle-outer-border-opacity": "0.42",
-      "color-handle-outer-border-width": "1px",
       "color-loupe-bottom-to-color-handle": "12px",
       "color-loupe-drop-shadow-color": "rgba(0, 0, 0, 0.25)",
       "color-loupe-height": "64px",
@@ -996,6 +992,7 @@
       "disabled-static-white-content-color": "rgba(255, 255, 255, 0.55)",
       "drop-shadow-color": "rgba(0, 0, 0, 0.8)",
       "drop-zone-background-color": "rgb(94, 170, 247)",
+      "floating-action-button-shadow-color": "rgba(0, 0, 0, 0.25)",
       "focus-indicator-color": "rgb(64, 150, 243)",
       "fuchsia-100": "rgb(70, 14, 68)",
       "fuchsia-1000": "rgb(246, 149, 243)",
@@ -1261,6 +1258,9 @@
       "static-white-focus-indicator-color": "rgb(255, 255, 255)",
       "swatch-border-color": "rgb(255, 255, 255)",
       "swatch-disabled-icon-border-color": "rgb(0, 0, 0)",
+      "table-row-hover-color": "rgb(255, 255, 255)",
+      "table-selected-row-background-color": "rgb(6, 108, 231)",
+      "table-selected-row-background-color-non-emphasized": "rgb(208, 208, 208)",
       "thumbnail-border-color": "rgb(235, 235, 235)",
       "transparent-black-100": "rgba(0, 0, 0, 0)",
       "transparent-black-200": "rgba(0, 0, 0, 0.1)",
@@ -1438,9 +1438,6 @@
     "color-area-width": "192px",
     "color-control-track-width": "24px",
     "color-handle-border-width": "2px",
-    "color-handle-drop-shadow-blur": "0",
-    "color-handle-drop-shadow-x": "0",
-    "color-handle-drop-shadow-y": "0",
     "color-handle-inner-border-opacity": "0.42",
     "color-handle-inner-border-width": "1px",
     "color-handle-outer-border-color": "rgb(0, 0, 0)",
@@ -1522,7 +1519,9 @@
     "component-top-to-workflow-icon-300": "13px",
     "component-top-to-workflow-icon-50": "3px",
     "component-top-to-workflow-icon-75": "4px",
+    "contextual-help-body-size": "18px",
     "contextual-help-minimum-width": "268px",
+    "contextual-help-title-size": "16px",
     "corner-radius-100": "4px",
     "corner-radius-200": "8px",
     "corner-radius-75": "2px",
@@ -1618,6 +1617,7 @@
     "field-top-to-validation-icon-small": "7px",
     "field-width": "192px",
     "floating-action-button-drop-shadow-blur": "12px",
+    "floating-action-button-drop-shadow-y": "4px",
     "focus-indicator-gap": "2px",
     "focus-indicator-thickness": "2px",
     "font-size-100": "14px",
@@ -1750,6 +1750,10 @@
     "slider-control-height-large": "18px",
     "slider-control-height-medium": "16px",
     "slider-control-height-small": "14px",
+    "slider-control-to-field-label-extra-large": "14px",
+    "slider-control-to-field-label-large": "11px",
+    "slider-control-to-field-label-medium": "8px",
+    "slider-control-to-field-label-small": "5px",
     "slider-handle-border-width-down-extra-large": "8px",
     "slider-handle-border-width-down-large": "7px",
     "slider-handle-border-width-down-medium": "6px",
@@ -1853,6 +1857,7 @@
     "table-row-height-small-compact": "24px",
     "table-row-height-small-regular": "32px",
     "table-row-height-small-spacious": "40px",
+    "table-row-hover-opacity": "0.07",
     "table-row-top-to-text-extra-large-compact": "12px",
     "table-row-top-to-text-extra-large-regular": "17px",
     "table-row-top-to-text-extra-large-spacious": "21px",
@@ -1869,6 +1874,8 @@
     "table-section-header-row-height-large": "40px",
     "table-section-header-row-height-medium": "32px",
     "table-section-header-row-height-small": "24px",
+    "table-selected-row-background-opacity": "0.1",
+    "table-selected-row-background-opacity-non-emphasized": "0.1",
     "table-thumbnail-to-top-minimum-extra-large": "8px",
     "table-thumbnail-to-top-minimum-large": "7px",
     "table-thumbnail-to-top-minimum-medium": "5px",

package/dist/json/variables.json

@@ -6098,17 +6098,13 @@
     }
   },
   "color-handle-outer-border-opacity": {
+    "ref": "{color-handle-inner-border-opacity}",
     "sets": {
       "spectrum": {
-        "ref": "{color-handle-inner-border-opacity}",
-        "sets": {
-          "spectrum": {
-            "value": "0.42"
-          },
-          "express": {
-            "value": "0.15"
-          }
-        }
+        "value": "0.42"
+      },
+      "express": {
+        "value": "0.15"
       }
     }
   },
@@ -6133,6 +6129,148 @@
       }
     }
   },
+  "table-row-hover-color": {
+    "ref": "{gray-900}",
+    "sets": {
+      "light": {
+        "value": "rgb(0, 0, 0)"
+      },
+      "dark": {
+        "value": "rgb(255, 255, 255)"
+      },
+      "darkest": {
+        "value": "rgb(255, 255, 255)"
+      },
+      "wireframe": {
+        "value": "rgb(72, 110, 194)"
+      }
+    }
+  },
+  "table-row-hover-opacity": {
+    "value": "0.07"
+  },
+  "table-selected-row-background-color": {
+    "ref": "{informative-background-color-default}",
+    "sets": {
+      "light": {
+        "ref": "{informative-color-900}",
+        "sets": {
+          "light": {
+            "value": "rgb(2, 101, 220)"
+          },
+          "dark": {
+            "value": "rgb(114, 183, 249)"
+          },
+          "darkest": {
+            "value": "rgb(94, 170, 247)"
+          },
+          "wireframe": {
+            "value": "rgb(154, 177, 227)"
+          }
+        }
+      },
+      "dark": {
+        "ref": "{informative-color-500}",
+        "sets": {
+          "light": {
+            "value": "rgb(120, 187, 250)"
+          },
+          "dark": {
+            "value": "rgb(3, 103, 224)"
+          },
+          "darkest": {
+            "value": "rgb(0, 92, 200)"
+          },
+          "wireframe": {
+            "value": "rgb(216, 225, 244)"
+          }
+        }
+      },
+      "darkest": {
+        "ref": "{informative-color-600}",
+        "sets": {
+          "light": {
+            "value": "rgb(89, 167, 246)"
+          },
+          "dark": {
+            "value": "rgb(19, 121, 243)"
+          },
+          "darkest": {
+            "value": "rgb(6, 108, 231)"
+          },
+          "wireframe": {
+            "value": "rgb(203, 215, 241)"
+          }
+        }
+      },
+      "wireframe": {
+        "ref": "{informative-color-900}",
+        "sets": {
+          "light": {
+            "value": "rgb(2, 101, 220)"
+          },
+          "dark": {
+            "value": "rgb(114, 183, 249)"
+          },
+          "darkest": {
+            "value": "rgb(94, 170, 247)"
+          },
+          "wireframe": {
+            "value": "rgb(154, 177, 227)"
+          }
+        }
+      }
+    }
+  },
+  "table-selected-row-background-opacity": {
+    "value": "0.1"
+  },
+  "table-selected-row-background-color-non-emphasized": {
+    "ref": "{neutral-background-color-selected-default}",
+    "sets": {
+      "spectrum": {
+        "ref": "{gray-700}",
+        "sets": {
+          "light": {
+            "value": "rgb(70, 70, 70)"
+          },
+          "dark": {
+            "value": "rgb(209, 209, 209)"
+          },
+          "darkest": {
+            "value": "rgb(208, 208, 208)"
+          },
+          "wireframe": {
+            "value": "rgb(78, 112, 187)"
+          }
+        }
+      },
+      "express": {
+        "ref": "{gray-800}",
+        "sets": {
+          "light": {
+            "value": "rgb(34, 34, 34)"
+          },
+          "dark": {
+            "value": "rgb(235, 235, 235)"
+          },
+          "darkest": {
+            "value": "rgb(235, 235, 235)"
+          },
+          "wireframe": {
+            "value": "rgb(73, 110, 194)"
+          }
+        }
+      }
+    }
+  },
+  "table-selected-row-background-opacity-non-emphasized": {
+    "value": "0.1"
+  },
+  "floating-action-button-shadow-color": {
+    "ref": "{transparent-black-300}",
+    "value": "rgba(0, 0, 0, 0.25)"
+  },
   "white": {
     "value": "rgb(255, 255, 255)"
   },
@@ -11215,6 +11353,46 @@
       }
     }
   },
+  "slider-control-to-field-label-small": {
+    "sets": {
+      "desktop": {
+        "value": "5px"
+      },
+      "mobile": {
+        "value": "6px"
+      }
+    }
+  },
+  "slider-control-to-field-label-medium": {
+    "sets": {
+      "desktop": {
+        "value": "8px"
+      },
+      "mobile": {
+        "value": "10px"
+      }
+    }
+  },
+  "slider-control-to-field-label-large": {
+    "sets": {
+      "desktop": {
+        "value": "11px"
+      },
+      "mobile": {
+        "value": "14px"
+      }
+    }
+  },
+  "slider-control-to-field-label-extra-large": {
+    "sets": {
+      "desktop": {
+        "value": "14px"
+      },
+      "mobile": {
+        "value": "17px"
+      }
+    }
+  },
   "picker-minimum-width-multiplier": {
     "value": "2"
   },
@@ -11539,6 +11717,58 @@
   "contextual-help-minimum-width": {
     "value": "268px"
   },
+  "contextual-help-title-size": {
+    "sets": {
+      "desktop": {
+        "ref": "{heading-size-xs}",
+        "sets": {
+          "desktop": {
+            "value": "16px"
+          },
+          "mobile": {
+            "value": "19px"
+          }
+        }
+      },
+      "mobile": {
+        "ref": "{heading-size-xxs}",
+        "sets": {
+          "desktop": {
+            "value": "14px"
+          },
+          "mobile": {
+            "value": "17px"
+          }
+        }
+      }
+    }
+  },
+  "contextual-help-body-size": {
+    "sets": {
+      "desktop": {
+        "ref": "{heading-size-s}",
+        "sets": {
+          "desktop": {
+            "value": "18px"
+          },
+          "mobile": {
+            "value": "22px"
+          }
+        }
+      },
+      "mobile": {
+        "ref": "{heading-size-xs}",
+        "sets": {
+          "desktop": {
+            "value": "16px"
+          },
+          "mobile": {
+            "value": "19px"
+          }
+        }
+      }
+    }
+  },
   "breadcrumbs-height": {
     "ref": "{component-height-300}",
     "sets": {
@@ -12026,6 +12256,9 @@
   "floating-action-button-drop-shadow-blur": {
     "value": "12px"
   },
+  "floating-action-button-drop-shadow-y": {
+    "value": "4px"
+  },
   "illustrated-message-maximum-width": {
     "value": "380px"
   },
@@ -12671,49 +12904,21 @@
   },
   "color-handle-size": {
     "sets": {
-      "spectrum": {
-        "sets": {
-          "desktop": {
-            "value": "16px"
-          },
-          "mobile": {
-            "value": "20px"
-          }
-        }
+      "desktop": {
+        "value": "16px"
       },
-      "express": {
-        "sets": {
-          "desktop": {
-            "value": "20px"
-          },
-          "mobile": {
-            "value": "24px"
-          }
-        }
+      "mobile": {
+        "value": "20px"
       }
     }
   },
   "color-handle-size-key-focus": {
     "sets": {
-      "spectrum": {
-        "sets": {
-          "desktop": {
-            "value": "32px"
-          },
-          "mobile": {
-            "value": "40px"
-          }
-        }
+      "desktop": {
+        "value": "32px"
       },
-      "express": {
-        "sets": {
-          "desktop": {
-            "value": "40px"
-          },
-          "mobile": {
-            "value": "48px"
-          }
-        }
+      "mobile": {
+        "value": "40px"
       }
     }
   },
@@ -12725,50 +12930,16 @@
     "value": "1px"
   },
   "color-handle-outer-border-width": {
-    "sets": {
-      "spectrum": {
-        "value": "1px"
-      },
-      "express": {
-        "value": "0px"
-      }
-    }
+    "value": "1px"
   },
   "color-handle-drop-shadow-x": {
-    "sets": {
-      "spectrum": {
-        "value": "0"
-      },
-      "express": {
-        "ref": "{drop-shadow-x}",
-        "sets": {
-          "spectrum": {},
-          "express": {}
-        }
-      }
-    }
+    "value": "0"
   },
   "color-handle-drop-shadow-y": {
-    "sets": {
-      "spectrum": {
-        "value": "0"
-      },
-      "express": {
-        "ref": "{color-loupe-drop-shadow-y}",
-        "value": "2px"
-      }
-    }
+    "value": "0"
   },
   "color-handle-drop-shadow-blur": {
-    "sets": {
-      "spectrum": {
-        "value": "0"
-      },
-      "express": {
-        "ref": "{color-loupe-drop-shadow-blur}",
-        "value": "8px"
-      }
-    }
+    "value": "0"
   },
   "table-column-header-row-top-to-text-small": {
     "sets": {

package/manifest.json

@@ -1,9 +1,5 @@
 [
-  "src/color-aliases.json",
-  "src/color-component.json",
-  "src/color-palette.json",
-  "src/layout-component.json",
-  "src/layout.json",
-  "src/semantic-color-palette.json",
-  "src/typography.json"
-]
+  "src/color-aliases.json", "src/color-component.json",
+  "src/color-palette.json", "src/layout-component.json", "src/layout.json",
+  "src/semantic-color-palette.json", "src/typography.json"
+]

package/moon.yml

@@ -1,3 +1,13 @@
+# Copyright 2023 Adobe. All rights reserved.
+# This file is licensed to you under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License. You may obtain a copy
+# of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software distributed under
+# the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+# OF ANY KIND, either express or implied. See the License for the specific language
+# governing permissions and limitations under the License.
+
 fileGroups:
   sources:
     - "src/**/*"

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@adobe/spectrum-tokens",
-  "version": "12.5.0-beta.0",
+  "version": "12.5.0-beta.1",
   "description": "Design tokens for Spectrum, Adobe's design system",
   "type": "module",
-  "main": "config.js",
+  "main": "tasks/buildSpectrumTokens.js",
   "tokens": "dist/json/variables.json",
   "repository": {
     "type": "git",
@@ -17,7 +17,7 @@
   "bugs": {
     "url": "https://github.com/adobe/spectrum-tokens/issues"
   },
-  "homepage": "https://github.com/adobe/spectrum-tokens#readme",
+  "homepage": "https://github.com/adobe/spectrum-tokens/tree/main/packages/tokens#readme",
   "devDependencies": {
     "deep-object-diff": "^1.1.7",
     "glob": "^8.1.0",

package/src/color-component.json

@@ -136,20 +136,44 @@
   },
   "color-handle-outer-border-opacity": {
     "component": "color-handle",
-    "sets": {
-      "spectrum": {
-        "value": "{color-handle-inner-border-opacity}"
-      }
-    }
+    "value": "{color-handle-inner-border-opacity}"
   },
   "color-handle-drop-shadow-color": {
     "component": "color-handle",
+    "deprecated": true,
+    "deprecated_comment": "Express does not need a separate design for Color loupe and Color handle components",
     "sets": {
       "express": {
-        "value": "{drop-shadow-color}",
-        "deprecated": true,
-        "deprecated_comment": "Express will merge with Spectrum with the release of Spectrum 2."
+        "value": "{drop-shadow-color}"
       }
     }
+  },
+  "table-row-hover-color": {
+    "component": "table",
+    "value": "{gray-900}"
+  },
+  "table-row-hover-opacity": {
+    "component": "table",
+    "value": "0.07"
+  },
+  "table-selected-row-background-color": {
+    "component": "table",
+    "value": "{informative-background-color-default}"
+  },
+  "table-selected-row-background-opacity": {
+    "component": "table",
+    "value": "0.1"
+  },
+  "table-selected-row-background-color-non-emphasized": {
+    "component": "table",
+    "value": "{neutral-background-color-selected-default}"
+  },
+  "table-selected-row-background-opacity-non-emphasized": {
+    "component": "table",
+    "value": "0.1"
+  },
+  "floating-action-button-shadow-color": {
+    "component": "floating-action-button",
+    "value": "{transparent-black-300}"
   }
 }

package/src/layout-component.json

@@ -1775,6 +1775,8 @@
   },
   "slider-control-height-small": {
     "component": "slider",
+    "deprecated": true,
+    "deprecated_comment": "use `component-height-75` instead",
     "sets": {
       "spectrum": {
         "sets": {
@@ -1804,6 +1806,8 @@
   },
   "slider-control-height-medium": {
     "component": "slider",
+    "deprecated": true,
+    "deprecated_comment": "use `component-height-100` instead",
     "sets": {
       "spectrum": {
         "sets": {
@@ -1833,6 +1837,8 @@
   },
   "slider-control-height-large": {
     "component": "slider",
+    "deprecated": true,
+    "deprecated_comment": "use `component-height-200` instead",
     "sets": {
       "spectrum": {
         "sets": {
@@ -1862,6 +1868,8 @@
   },
   "slider-control-height-extra-large": {
     "component": "slider",
+    "deprecated": true,
+    "deprecated_comment": "use `component-height-300` instead",
     "sets": {
       "spectrum": {
         "sets": {
@@ -2136,6 +2144,8 @@
   },
   "slider-bottom-to-handle-small": {
     "component": "slider",
+    "deprecated": true,
+    "deprecated_comment": "no longer needed with the increased control height",
     "sets": {
       "spectrum": {
         "sets": {
@@ -2165,6 +2175,8 @@
   },
   "slider-bottom-to-handle-medium": {
     "component": "slider",
+    "deprecated": true,
+    "deprecated_comment": "no longer needed with the increased control height",
     "sets": {
       "spectrum": {
         "sets": {
@@ -2194,6 +2206,8 @@
   },
   "slider-bottom-to-handle-large": {
     "component": "slider",
+    "deprecated": true,
+    "deprecated_comment": "no longer needed with the increased control height",
     "sets": {
       "spectrum": {
         "sets": {
@@ -2223,6 +2237,8 @@
   },
   "slider-bottom-to-handle-extra-large": {
     "component": "slider",
+    "deprecated": true,
+    "deprecated_comment": "no longer needed with the increased control height",
     "sets": {
       "spectrum": {
         "sets": {
@@ -2250,6 +2266,50 @@
       }
     }
   },
+  "slider-control-to-field-label-small": {
+    "component": "slider",
+    "sets": {
+      "desktop": {
+        "value": "5px"
+      },
+      "mobile": {
+        "value": "6px"
+      }
+    }
+  },
+  "slider-control-to-field-label-medium": {
+    "component": "slider",
+    "sets": {
+      "desktop": {
+        "value": "8px"
+      },
+      "mobile": {
+        "value": "10px"
+      }
+    }
+  },
+  "slider-control-to-field-label-large": {
+    "component": "slider",
+    "sets": {
+      "desktop": {
+        "value": "11px"
+      },
+      "mobile": {
+        "value": "14px"
+      }
+    }
+  },
+  "slider-control-to-field-label-extra-large": {
+    "component": "slider",
+    "sets": {
+      "desktop": {
+        "value": "14px"
+      },
+      "mobile": {
+        "value": "17px"
+      }
+    }
+  },
   "picker-minimum-width-multiplier": {
     "component": "picker",
     "value": "2"
@@ -2569,6 +2629,28 @@
     "component": "contextual-help",
     "value": "268px"
   },
+  "contextual-help-title-size": {
+    "component": "contextual-help",
+    "sets": {
+      "desktop": {
+        "value": "{heading-size-xs}"
+      },
+      "mobile": {
+        "value": "{heading-size-xxs}"
+      }
+    }
+  },
+  "contextual-help-body-size": {
+    "component": "contextual-help",
+    "sets": {
+      "desktop": {
+        "value": "{heading-size-s}"
+      },
+      "mobile": {
+        "value": "{heading-size-xs}"
+      }
+    }
+  },
   "breadcrumbs-height": {
     "component": "breadcrumbs",
     "value": "{component-height-300}"
@@ -3064,6 +3146,10 @@
     "component": "floating-action-button",
     "value": "12px"
   },
+  "floating-action-button-drop-shadow-y": {
+    "component": "floating-action-button",
+    "value": "4px"
+  },
   "illustrated-message-maximum-width": {
     "component": "illustrated-message",
     "value": "380px"
@@ -3631,58 +3717,22 @@
   "color-handle-size": {
     "component": "color-handle",
     "sets": {
-      "spectrum": {
-        "sets": {
-          "desktop": {
-            "value": "16px"
-          },
-          "mobile": {
-            "value": "20px"
-          }
-        }
+      "desktop": {
+        "value": "16px"
       },
-      "express": {
-        "sets": {
-          "desktop": {
-            "value": "20px",
-            "deprecated": true,
-            "deprecated_comment": "Express will merge with Spectrum with the release of Spectrum 2."
-          },
-          "mobile": {
-            "value": "24px",
-            "deprecated": true,
-            "deprecated_comment": "Express will merge with Spectrum with the release of Spectrum 2."
-          }
-        }
+      "mobile": {
+        "value": "20px"
       }
     }
   },
   "color-handle-size-key-focus": {
     "component": "color-handle",
     "sets": {
-      "spectrum": {
-        "sets": {
-          "desktop": {
-            "value": "32px"
-          },
-          "mobile": {
-            "value": "40px"
-          }
-        }
+      "desktop": {
+        "value": "32px"
       },
-      "express": {
-        "sets": {
-          "desktop": {
-            "value": "40px",
-            "deprecated": true,
-            "deprecated_comment": "Express will merge with Spectrum with the release of Spectrum 2."
-          },
-          "mobile": {
-            "value": "48px",
-            "deprecated": true,
-            "deprecated_comment": "Express will merge with Spectrum with the release of Spectrum 2."
-          }
-        }
+      "mobile": {
+        "value": "40px"
       }
     }
   },
@@ -3696,55 +3746,19 @@
   },
   "color-handle-outer-border-width": {
     "component": "color-handle",
-    "sets": {
-      "spectrum": {
-        "value": "1px"
-      },
-      "express": {
-        "value": "0px",
-        "deprecated": true,
-        "deprecated_comment": "Express will merge with Spectrum with the release of Spectrum 2."
-      }
-    }
+    "value": "1px"
   },
   "color-handle-drop-shadow-x": {
     "component": "color-handle",
-    "sets": {
-      "spectrum": {
-        "value": "0"
-      },
-      "express": {
-        "value": "{drop-shadow-x}",
-        "deprecated": true,
-        "deprecated_comment": "Express will merge with Spectrum with the release of Spectrum 2."
-      }
-    }
+    "value": "0"
   },
   "color-handle-drop-shadow-y": {
     "component": "color-handle",
-    "sets": {
-      "spectrum": {
-        "value": "0"
-      },
-      "express": {
-        "value": "{color-loupe-drop-shadow-y}",
-        "deprecated": true,
-        "deprecated_comment": "Express will merge with Spectrum with the release of Spectrum 2."
-      }
-    }
+    "value": "0"
   },
   "color-handle-drop-shadow-blur": {
     "component": "color-handle",
-    "sets": {
-      "spectrum": {
-        "value": "0"
-      },
-      "express": {
-        "value": "{color-loupe-drop-shadow-blur}",
-        "deprecated": true,
-        "deprecated_comment": "Express will merge with Spectrum with the release of Spectrum 2."
-      }
-    }
+    "value": "0"
   },
   "table-column-header-row-top-to-text-small": {
     "component": "table",

package/tasks/buildManifest.js

@@ -1,3 +1,15 @@
+/*
+Copyright 2023 Adobe. All rights reserved.
+This file is licensed to you under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License. You may obtain a copy
+of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under
+the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+OF ANY KIND, either express or implied. See the License for the specific language
+governing permissions and limitations under the License.
+*/
+
 import glob from "glob-promise";
 import { writeFile } from "fs/promises";
 

package/tasks/buildSpectrumTokens.js

@@ -1,5 +1,5 @@
 /*
-Copyright 2022 Adobe. All rights reserved.
+Copyright 2023 Adobe. All rights reserved.
 This file is licensed to you under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License. You may obtain a copy
 of the License at http://www.apache.org/licenses/LICENSE-2.0

package/tasks/deprecateExpress.js

@@ -1,3 +1,15 @@
+/*
+Copyright 2023 Adobe. All rights reserved.
+This file is licensed to you under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License. You may obtain a copy
+of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under
+the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+OF ANY KIND, either express or implied. See the License for the specific language
+governing permissions and limitations under the License.
+*/
+
 import glob from "glob-promise";
 import { readFile, writeFile } from "fs/promises";
 import augmentExpressTokens from "./lib/augmentExpressTokens.js";

package/tasks/diff.js

@@ -1,3 +1,15 @@
+/*
+Copyright 2023 Adobe. All rights reserved.
+This file is licensed to you under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License. You may obtain a copy
+of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under
+the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+OF ANY KIND, either express or implied. See the License for the specific language
+governing permissions and limitations under the License.
+*/
+
 import { access, readFile, writeFile } from "fs/promises";
 import { join, dirname } from "path";
 import { fileURLToPath } from "url";

package/tasks/lib/augmentExpressTokens.js

@@ -1,3 +1,15 @@
+/*
+Copyright 2023 Adobe. All rights reserved.
+This file is licensed to you under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License. You may obtain a copy
+of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under
+the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+OF ANY KIND, either express or implied. See the License for the specific language
+governing permissions and limitations under the License.
+*/
+
 const deprecationObj = {
   deprecated: true,
   deprecated_comment:

package/test/deprecateExpress.test.js

@@ -1,3 +1,15 @@
+/*
+Copyright 2023 Adobe. All rights reserved.
+This file is licensed to you under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License. You may obtain a copy
+of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under
+the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+OF ANY KIND, either express or implied. See the License for the specific language
+governing permissions and limitations under the License.
+*/
+
 import test from "ava";
 import augmentExpressTokens from "../tasks/lib/augmentExpressTokens.js";
 

package/test/drover.test.js

@@ -1,3 +1,15 @@
+/*
+Copyright 2023 Adobe. All rights reserved.
+This file is licensed to you under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License. You may obtain a copy
+of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under
+the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+OF ANY KIND, either express or implied. See the License for the specific language
+governing permissions and limitations under the License.
+*/
+
 import test from "ava";
 import { readFile } from "fs/promises";