fix(toast): scope close button styles to toast

Author: cdransf

components/toast/dist/metadata.json

@@ -1,9 +1,9 @@
 {
   "sourceFile": "index.css",
   "selectors": [
-    ".spectrum-CloseButton",
     ".spectrum-Toast",
     ".spectrum-Toast .spectrum-Button",
+    ".spectrum-Toast .spectrum-CloseButton",
     ".spectrum-Toast--info",
     ".spectrum-Toast--negative",
     ".spectrum-Toast--positive",
@@ -18,6 +18,7 @@
     ".spectrum-Toast:not(:has(.spectrum-Button))"
   ],
   "modifiers": [
+    "--mod--spectrum-toast-spacing-block-close-button",
     "--mod-toast-background-color-default",
     "--mod-toast-corner-radius",
     "--mod-toast-font-family",
@@ -59,6 +60,7 @@
     "--spectrum-toast-min-block-size",
     "--spectrum-toast-negative-background-color-default",
     "--spectrum-toast-positive-background-color-default",
+    "--spectrum-toast-spacing-block-close-button",
     "--spectrum-toast-spacing-bottom-edge-to-text",
     "--spectrum-toast-spacing-button-to-close-button-horizontal",
     "--spectrum-toast-spacing-close-button-to-end-edge",

components/toast/index.css

@@ -79,6 +79,12 @@
 	&:not(:has(.spectrum-Button)) {
 		column-gap: var(--mod-toast-spacing-text-to-close-button, var(--spectrum-toast-spacing-text-to-close-button));
 	}
+
+	.spectrum-CloseButton {
+		margin-block: var(--mod--spectrum-toast-spacing-block-close-button, var(--spectrum-toast-spacing-block-close-button));
+		margin-inline-end: var(--mod-toast-spacing-close-button-to-end-edge, var(--spectrum-toast-spacing-close-button-to-end-edge));
+		flex-shrink: 0;
+	}
 }
 
 .spectrum-Toast--negative {
@@ -105,12 +111,6 @@
 	margin-inline-start: 0;
 }
 
-.spectrum-CloseButton {
-	margin-block: var(--mod--spectrum-toast-spacing-block-close-button, var(--spectrum-toast-spacing-block-close-button));
-	margin-inline-end: var(--mod-toast-spacing-close-button-to-end-edge, var(--spectrum-toast-spacing-close-button-to-end-edge));
-	flex-shrink: 0;
-}
-
 .spectrum-Toast .spectrum-Button {
 	margin-inline-end: var(--mod-toast-spacing-button-to-close-button-horizontal, var(--spectrum-toast-spacing-button-to-close-button-horizontal));
 }
@@ -122,7 +122,6 @@
 	flex: 1 1 auto;
 	padding-block: var(--mod-toast-spacing-text-to-button-vertical, var(--spectrum-toast-spacing-edge-to-button-vertical));
 	column-gap: var(--spectrum-toast-spacing-text-to-button-horizontal);
-
 }
 
 .spectrum-Toast-content {