chore: release (s2-foundations) (#3194)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
adobe · Oct 4, 2024 · 635308a · 635308a
1 parent 693b128
commit 635308a
Show file tree

Hide file tree

Showing 21 changed files with 156 additions and 194 deletions.
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -141,6 +141,7 @@
     "rare-countries-sparkle",
     "real-beans-serve",
     "real-colts-perform",
+    "rude-rivers-crash",
     "selfish-singers-lie",
     "seven-pens-collect",
     "sharp-pianos-reply",

diff --git a/components/slider/CHANGELOG.md b/components/slider/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## 6.0.0-s2-foundations.15
+
+### Minor Changes
+
+- [#3154](https://github.com/adobe/spectrum-css/pull/3154) [`7735155`](https://github.com/adobe/spectrum-css/commit/77351552eac8a28cab316d984fee88dca61dc786) Thanks [@cdransf](https://github.com/cdransf)! - This applies a flex layout to the spectrum slider controls to consistently align the enclosed handle and ramp, while also removing the margins that might otherwise interfere with alignment. This aims to resolve the issues with the calc-based approach that exhibited variations in vertical alignment.
+
 ## 6.0.0-s2-foundations.14
 
 ### Major Changes

diff --git a/components/slider/package.json b/components/slider/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@spectrum-css/slider",
-	"version": "6.0.0-s2-foundations.14",
+	"version": "6.0.0-s2-foundations.15",
 	"description": "The Spectrum CSS slider component",
 	"license": "Apache-2.0",
 	"author": "Adobe",

diff --git a/components/typography/metadata/metadata.json b/components/typography/metadata/metadata.json
@@ -17,13 +17,13 @@
     ".spectrum-Body--serif em strong",
     ".spectrum-Body--serif strong",
     ".spectrum-Body--serif strong em",
-    ".spectrum-Body.spectrum-Body--sizeL",
-    ".spectrum-Body.spectrum-Body--sizeM",
-    ".spectrum-Body.spectrum-Body--sizeS",
-    ".spectrum-Body.spectrum-Body--sizeXL",
-    ".spectrum-Body.spectrum-Body--sizeXS",
-    ".spectrum-Body.spectrum-Body--sizeXXL",
-    ".spectrum-Body.spectrum-Body--sizeXXXL",
+    ".spectrum-Body--sizeL",
+    ".spectrum-Body--sizeM",
+    ".spectrum-Body--sizeS",
+    ".spectrum-Body--sizeXL",
+    ".spectrum-Body--sizeXS",
+    ".spectrum-Body--sizeXXL",
+    ".spectrum-Body--sizeXXXL",
     ".spectrum-Body:lang(ja)",
     ".spectrum-Body:lang(ja) .spectrum-Body-emphasized",
     ".spectrum-Body:lang(ja) .spectrum-Body-strong",
@@ -56,11 +56,11 @@
     ".spectrum-Code em strong",
     ".spectrum-Code strong",
     ".spectrum-Code strong em",
-    ".spectrum-Code.spectrum-Code--sizeL",
-    ".spectrum-Code.spectrum-Code--sizeM",
-    ".spectrum-Code.spectrum-Code--sizeS",
-    ".spectrum-Code.spectrum-Code--sizeXL",
-    ".spectrum-Code.spectrum-Code--sizeXS",
+    ".spectrum-Code--sizeL",
+    ".spectrum-Code--sizeM",
+    ".spectrum-Code--sizeS",
+    ".spectrum-Code--sizeXL",
+    ".spectrum-Code--sizeXS",
     ".spectrum-Code:lang(ja)",
     ".spectrum-Code:lang(ja) .spectrum-Code-emphasized",
     ".spectrum-Code:lang(ja) .spectrum-Code-strong",
@@ -135,10 +135,10 @@
     ".spectrum-Detail--serif.spectrum-Detail--light em strong",
     ".spectrum-Detail--serif.spectrum-Detail--light strong",
     ".spectrum-Detail--serif.spectrum-Detail--light strong em",
-    ".spectrum-Detail.spectrum-Detail--sizeL",
-    ".spectrum-Detail.spectrum-Detail--sizeM",
-    ".spectrum-Detail.spectrum-Detail--sizeS",
-    ".spectrum-Detail.spectrum-Detail--sizeXL",
+    ".spectrum-Detail--sizeL",
+    ".spectrum-Detail--sizeM",
+    ".spectrum-Detail--sizeS",
+    ".spectrum-Detail--sizeXL",
     ".spectrum-Detail:lang(ja)",
     ".spectrum-Detail:lang(ja) .spectrum-Detail-emphasized",
     ".spectrum-Detail:lang(ja) .spectrum-Detail-strong",
@@ -259,14 +259,14 @@
     ".spectrum-Heading--serif.spectrum-Heading--light em strong",
     ".spectrum-Heading--serif.spectrum-Heading--light strong",
     ".spectrum-Heading--serif.spectrum-Heading--light strong em",
-    ".spectrum-Heading.spectrum-Heading--sizeL",
-    ".spectrum-Heading.spectrum-Heading--sizeM",
-    ".spectrum-Heading.spectrum-Heading--sizeS",
-    ".spectrum-Heading.spectrum-Heading--sizeXL",
-    ".spectrum-Heading.spectrum-Heading--sizeXS",
-    ".spectrum-Heading.spectrum-Heading--sizeXXL",
-    ".spectrum-Heading.spectrum-Heading--sizeXXS",
-    ".spectrum-Heading.spectrum-Heading--sizeXXXL",
+    ".spectrum-Heading--sizeL",
+    ".spectrum-Heading--sizeM",
+    ".spectrum-Heading--sizeS",
+    ".spectrum-Heading--sizeXL",
+    ".spectrum-Heading--sizeXS",
+    ".spectrum-Heading--sizeXXL",
+    ".spectrum-Heading--sizeXXS",
+    ".spectrum-Heading--sizeXXXL",
     ".spectrum-Heading:lang(ja)",
     ".spectrum-Heading:lang(ja) .spectrum-Heading-emphasized",
     ".spectrum-Heading:lang(ja) .spectrum-Heading-strong",
@@ -578,7 +578,6 @@
     "--spectrum-code-strong-emphasized-font-weight",
     "--spectrum-code-strong-font-style",
     "--spectrum-code-strong-font-weight",
-    "--spectrum-default-font-style",
     "--spectrum-detail-cjk-emphasized-font-style",
     "--spectrum-detail-cjk-emphasized-font-weight",
     "--spectrum-detail-cjk-font-family",
@@ -648,7 +647,6 @@
     "--spectrum-font-family-ar",
     "--spectrum-font-family-he",
     "--spectrum-font-size",
-    "--spectrum-font-size-100",
     "--spectrum-font-style",
     "--spectrum-heading-cjk-emphasized-font-style",
     "--spectrum-heading-cjk-emphasized-font-weight",
@@ -787,11 +785,6 @@
     "--system-detail-size-m-font-size",
     "--system-detail-size-s-font-size",
     "--system-detail-size-xl-font-size",
-    "--system-font-family",
-    "--system-font-family-ar",
-    "--system-font-family-he",
-    "--system-font-size",
-    "--system-font-style",
     "--system-heading-cjk-font-family",
     "--system-heading-cjk-font-size",
     "--system-heading-cjk-letter-spacing",

diff --git a/components/typography/themes/spectrum-two.css b/components/typography/themes/spectrum-two.css
@@ -12,15 +12,6 @@
  */
 
 @container style(--system: spectrum) {
-	.spectrum {
-		--spectrum-font-family-ar: myriad-arabic, adobe-clean, "Source Sans Pro", -apple-system, blinkmacsystemfont, "Segoe UI", roboto, ubuntu, "Trebuchet MS", "Lucida Grande", sans-serif;
-		--spectrum-font-family-he: myriad-hebrew, adobe-clean, "Source Sans Pro", -apple-system, blinkmacsystemfont, "Segoe UI", roboto, ubuntu, "Trebuchet MS", "Lucida Grande", sans-serif;
-
-		--spectrum-font-family: var(--spectrum-sans-font-family-stack);
-		--spectrum-font-style: var(--spectrum-default-font-style);
-		--spectrum-font-size: var(--spectrum-font-size-100);
-	}
-
 	.spectrum-Heading {
 		--spectrum-heading-sans-serif-font-family: var(--spectrum-sans-font-family-stack);
 		--spectrum-heading-serif-font-family: var(--spectrum-serif-font-family-stack);
@@ -29,47 +20,47 @@
 		--spectrum-heading-cjk-letter-spacing: var(--spectrum-cjk-letter-spacing);
 
 		--spectrum-heading-font-color: var(--spectrum-heading-color);
+	}
 
-		&.spectrum-Heading--sizeXXS {
-			--spectrum-heading-font-size: var(--spectrum-heading-size-xxs);
-			--spectrum-heading-cjk-font-size: var(--spectrum-heading-cjk-size-xxs);
-		}
+	.spectrum-Heading--sizeXXS {
+		--spectrum-heading-font-size: var(--spectrum-heading-size-xxs);
+		--spectrum-heading-cjk-font-size: var(--spectrum-heading-cjk-size-xxs);
+	}
 
-		&.spectrum-Heading--sizeXS {
-			--spectrum-heading-font-size: var(--spectrum-heading-size-xs);
-			--spectrum-heading-cjk-font-size: var(--spectrum-heading-cjk-size-xs);
-		}
+	.spectrum-Heading--sizeXS {
+		--spectrum-heading-font-size: var(--spectrum-heading-size-xs);
+		--spectrum-heading-cjk-font-size: var(--spectrum-heading-cjk-size-xs);
+	}
 
-		&.spectrum-Heading--sizeS {
-			--spectrum-heading-font-size: var(--spectrum-heading-size-s);
-			--spectrum-heading-cjk-font-size: var(--spectrum-heading-cjk-size-s);
-		}
+	.spectrum-Heading--sizeS {
+		--spectrum-heading-font-size: var(--spectrum-heading-size-s);
+		--spectrum-heading-cjk-font-size: var(--spectrum-heading-cjk-size-s);
+	}
 
-		&,
-		&.spectrum-Heading--sizeM {
-			--spectrum-heading-font-size: var(--spectrum-heading-size-m);
-			--spectrum-heading-cjk-font-size: var(--spectrum-heading-cjk-size-m);
-		}
+	.spectrum-Heading,
+	.spectrum-Heading--sizeM {
+		--spectrum-heading-font-size: var(--spectrum-heading-size-m);
+		--spectrum-heading-cjk-font-size: var(--spectrum-heading-cjk-size-m);
+	}
 
-		&.spectrum-Heading--sizeL {
-			--spectrum-heading-font-size: var(--spectrum-heading-size-l);
-			--spectrum-heading-cjk-font-size: var(--spectrum-heading-cjk-size-l);
-		}
+	.spectrum-Heading--sizeL {
+		--spectrum-heading-font-size: var(--spectrum-heading-size-l);
+		--spectrum-heading-cjk-font-size: var(--spectrum-heading-cjk-size-l);
+	}
 
-		&.spectrum-Heading--sizeXL {
-			--spectrum-heading-font-size: var(--spectrum-heading-size-xl);
-			--spectrum-heading-cjk-font-size: var(--spectrum-heading-cjk-size-xl);
-		}
+	.spectrum-Heading--sizeXL {
+		--spectrum-heading-font-size: var(--spectrum-heading-size-xl);
+		--spectrum-heading-cjk-font-size: var(--spectrum-heading-cjk-size-xl);
+	}
 
-		&.spectrum-Heading--sizeXXL {
-			--spectrum-heading-font-size: var(--spectrum-heading-size-xxl);
-			--spectrum-heading-cjk-font-size: var(--spectrum-heading-cjk-size-xxl);
-		}
+	.spectrum-Heading--sizeXXL {
+		--spectrum-heading-font-size: var(--spectrum-heading-size-xxl);
+		--spectrum-heading-cjk-font-size: var(--spectrum-heading-cjk-size-xxl);
+	}
 
-		&.spectrum-Heading--sizeXXXL {
-			--spectrum-heading-font-size: var(--spectrum-heading-size-xxxl);
-			--spectrum-heading-cjk-font-size: var(--spectrum-heading-cjk-size-xxxl);
-		}
+	.spectrum-Heading--sizeXXXL {
+		--spectrum-heading-font-size: var(--spectrum-heading-size-xxxl);
+		--spectrum-heading-cjk-font-size: var(--spectrum-heading-cjk-size-xxxl);
 	}
 
 	.spectrum-Body {
@@ -80,35 +71,35 @@
 		--spectrum-body-cjk-letter-spacing: var(--spectrum-cjk-letter-spacing);
 
 		--spectrum-body-font-color: var(--spectrum-body-color);
+	}
 
-		&.spectrum-Body--sizeXS {
-			--spectrum-body-font-size: var(--spectrum-body-size-xs);
-		}
+	.spectrum-Body--sizeXS {
+		--spectrum-body-font-size: var(--spectrum-body-size-xs);
+	}
 
-		&.spectrum-Body--sizeS {
-			--spectrum-body-font-size: var(--spectrum-body-size-s);
-		}
+	.spectrum-Body--sizeS {
+		--spectrum-body-font-size: var(--spectrum-body-size-s);
+	}
 
-		&,
-		&.spectrum-Body--sizeM {
-			--spectrum-body-font-size: var(--spectrum-body-size-m);
-		}
+	.spectrum-Body,
+	.spectrum-Body--sizeM {
+		--spectrum-body-font-size: var(--spectrum-body-size-m);
+	}
 
-		&.spectrum-Body--sizeL {
-			--spectrum-body-font-size: var(--spectrum-body-size-l);
-		}
+	.spectrum-Body--sizeL {
+		--spectrum-body-font-size: var(--spectrum-body-size-l);
+	}
 
-		&.spectrum-Body--sizeXL {
-			--spectrum-body-font-size: var(--spectrum-body-size-xl);
-		}
+	.spectrum-Body--sizeXL {
+		--spectrum-body-font-size: var(--spectrum-body-size-xl);
+	}
 
-		&.spectrum-Body--sizeXXL {
-			--spectrum-body-font-size: var(--spectrum-body-size-xxl);
-		}
+	.spectrum-Body--sizeXXL {
+		--spectrum-body-font-size: var(--spectrum-body-size-xxl);
+	}
 
-		&.spectrum-Body--sizeXXXL {
-			--spectrum-body-font-size: var(--spectrum-body-size-xxxl);
-		}
+	.spectrum-Body--sizeXXXL {
+		--spectrum-body-font-size: var(--spectrum-body-size-xxxl);
 	}
 
 	.spectrum-Detail {
@@ -117,49 +108,49 @@
 		--spectrum-detail-cjk-font-family: var(--spectrum-cjk-font-family-stack);
 
 		--spectrum-detail-font-color: var(--spectrum-detail-color);
+	}
 
-		&.spectrum-Detail--sizeS {
-			--spectrum-detail-font-size: var(--spectrum-detail-size-s);
-		}
+	.spectrum-Detail--sizeS {
+		--spectrum-detail-font-size: var(--spectrum-detail-size-s);
+	}
 
-		&,
-		&.spectrum-Detail--sizeM {
-			--spectrum-detail-font-size: var(--spectrum-detail-size-m);
-		}
+	.spectrum-Detail,
+	.spectrum-Detail--sizeM {
+		--spectrum-detail-font-size: var(--spectrum-detail-size-m);
+	}
 
-		&.spectrum-Detail--sizeL {
-			--spectrum-detail-font-size: var(--spectrum-detail-size-l);
-		}
+	.spectrum-Detail--sizeL {
+		--spectrum-detail-font-size: var(--spectrum-detail-size-l);
+	}
 
-		&.spectrum-Detail--sizeXL {
-			--spectrum-detail-font-size: var(--spectrum-detail-size-xl);
-		}
+	.spectrum-Detail--sizeXL {
+		--spectrum-detail-font-size: var(--spectrum-detail-size-xl);
 	}
 
 	.spectrum-Code {
 		--spectrum-code-font-family: var(--spectrum-code-font-family-stack);
 		--spectrum-code-cjk-letter-spacing: var(--spectrum-cjk-letter-spacing);
 		--spectrum-code-font-color: var(--spectrum-code-color);
+	}
 
-		&.spectrum-Code--sizeXS {
-			--spectrum-code-font-size: var(--spectrum-code-size-xs);
-		}
+	.spectrum-Code--sizeXS {
+		--spectrum-code-font-size: var(--spectrum-code-size-xs);
+	}
 
-		&.spectrum-Code--sizeS {
-			--spectrum-code-font-size: var(--spectrum-code-size-s);
-		}
+	.spectrum-Code--sizeS {
+		--spectrum-code-font-size: var(--spectrum-code-size-s);
+	}
 
-		&,
-		&.spectrum-Code--sizeM {
-			--spectrum-code-font-size: var(--spectrum-code-size-m);
-		}
+	.spectrum-Code,
+	.spectrum-Code--sizeM {
+		--spectrum-code-font-size: var(--spectrum-code-size-m);
+	}
 
-		&.spectrum-Code--sizeL {
-			--spectrum-code-font-size: var(--spectrum-code-size-l);
-		}
+	.spectrum-Code--sizeL {
+		--spectrum-code-font-size: var(--spectrum-code-size-l);
+	}
 
-		&.spectrum-Code--sizeXL {
-			--spectrum-code-font-size: var(--spectrum-code-size-xl);
-		}
+	.spectrum-Code--sizeXL {
+		--spectrum-code-font-size: var(--spectrum-code-size-xl);
 	}
 }
diff --git a/tokens/custom/global-vars.css b/tokens/custom/global-vars.css
@@ -43,6 +43,13 @@
 
 	--spectrum-code-font-family-stack: "Source Code Pro", Monaco, monospace;
 
+	--spectrum-font-family-ar: myriad-arabic, adobe-clean, "Source Sans Pro", -apple-system, blinkmacsystemfont, "Segoe UI", roboto, ubuntu, "Trebuchet MS", "Lucida Grande", sans-serif;
+	--spectrum-font-family-he: myriad-hebrew, adobe-clean, "Source Sans Pro", -apple-system, blinkmacsystemfont, "Segoe UI", roboto, ubuntu, "Trebuchet MS", "Lucida Grande", sans-serif;
+
+	--spectrum-font-family: var(--spectrum-sans-font-family-stack);
+	--spectrum-font-style: var(--spectrum-default-font-style);
+	--spectrum-font-size: var(--spectrum-font-size-100);
+
 	--spectrum-cjk-font-family-stack: adobe-clean-han-japanese, var(--spectrum-cjk-font-family), sans-serif;
 	--spectrum-cjk-font: var(--spectrum-code-font-family-stack);
 

diff --git a/tokens/dist/css/components/bridge/index.css b/tokens/dist/css/components/bridge/index.css
@@ -1865,11 +1865,6 @@
 	--spectrum-treeview-indicator-padding: var(--system-tree-view-size-xl-indicator-padding);
 	--spectrum-treeview-item-min-block-size-thumbnail-offset: var(--system-tree-view-size-xl-item-min-block-size-thumbnail-offset);
 	--spectrum-treeview-indicator-animation-duration: var(--system-tree-view-indicator-animation-duration);
-	--spectrum-font-family-ar: var(--system-font-family-ar);
-	--spectrum-font-family-he: var(--system-font-family-he);
-	--spectrum-font-family: var(--system-font-family);
-	--spectrum-font-style: var(--system-font-style);
-	--spectrum-font-size: var(--system-font-size);
 	--spectrum-heading-sans-serif-font-family: var(--system-heading-sans-serif-font-family);
 	--spectrum-heading-serif-font-family: var(--system-heading-serif-font-family);
 	--spectrum-heading-cjk-font-family: var(--system-heading-cjk-font-family);

diff --git a/tokens/dist/css/components/bridge/slider.css b/tokens/dist/css/components/bridge/slider.css
@@ -28,6 +28,7 @@
 	--spectrum-slider-handle-border-color-key-focus: var(--system-slider-handle-border-color-key-focus);
 	--spectrum-slider-handle-focus-ring-color-key-focus: var(--system-slider-handle-focus-ring-color-key-focus);
 	--spectrum-slider-value-inline-size: var(--system-slider-size-xl-value-inline-size);
+	--spectrum-slider-ramp-track-block-size: var(--system-slider-ramp-track-block-size);
 	--spectrum-slider-cjk-line-height: var(--system-slider-cjk-line-height);
 	--spectrum-slider-min-size: var(--system-slider-min-size);
 	--spectrum-slider-track-corner-radius: var(--system-slider-track-corner-radius);