From 1bca2e05f16024732411fa2f5cae73d6095cb49d Mon Sep 17 00:00:00 2001
From: jessicawoodin <82840483+jessicawoodin@users.noreply.github.com>
Date: Tue, 10 Sep 2024 09:41:19 -0400
Subject: [PATCH 1/9] Update semantic-light.json

---
 .../src/tokens/color/semantic-light.json      | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/packages/tokens/src/tokens/color/semantic-light.json b/packages/tokens/src/tokens/color/semantic-light.json
index d8dbdbbd..2300dc6e 100644
--- a/packages/tokens/src/tokens/color/semantic-light.json
+++ b/packages/tokens/src/tokens/color/semantic-light.json
@@ -27,6 +27,20 @@
       "category": "color"
     }
   },
+  "vads-color-foreground-subtle-on-light": {
+    "name": "vads-color-foreground-subtle-on-light",
+    "value": "{vads-color-base-dark.*.value}",
+    "attributes": {
+      "category": "color"
+    }
+  },
+  "vads-color-foreground-error-on-light": {
+    "name": "vads-color-foreground-error-on-light",
+    "value": "{vads-color-secondary-dark.*.value}",
+    "attributes": {
+      "category": "color"
+    }
+  },
   "vads-color-surface-secondary-on-light": {
     "name": "vads-color-surface-secondary-on-light",
     "value": "{vads-color-base-lighter.*.value}",
@@ -201,5 +215,40 @@
     "attributes": {
       "category": "color"
     }
+  },
+  "vads-color-forms-border-default-on-light": {
+    "name": "vads-color-forms-border-default-on-light",
+    "value": "{vads-color-base-dark.*.value}",
+    "attributes": {
+      "category": "color"
+    }
+  },
+  "vads-color-forms-border-error-on-light": {
+    "name": "vads-color-forms-border-error-on-light",
+    "value": "{vads-color-secondary-dark.*.value}",
+    "attributes": {
+      "category": "color"
+    }
+  },
+  "vads-color-forms-border-subtle-on-light": {
+    "name": "vads-color-forms-border-subtle-on-light",
+    "value": "{vads-color-base-light.*.value}",
+    "attributes": {
+      "category": "color"
+    }
+  },
+  "vads-color-forms-border-active-on-light": {
+    "name": "vads-color-forms-border-active-on-light",
+    "value": "{vads-color-primary.*.value}",
+    "attributes": {
+      "category": "color"
+    }
+  },
+  "vads-color-forms-foreground-active-on-light": {
+    "name": "vads-color-forms-foreground-active-on-light",
+    "value": "{vads-color-primary.*.value}",
+    "attributes": {
+      "category": "color"
+    }
   }
 }

From 31a3004d1f3be0a3ca229617dd1ab4892c79854a Mon Sep 17 00:00:00 2001
From: jessicawoodin <82840483+jessicawoodin@users.noreply.github.com>
Date: Tue, 10 Sep 2024 09:44:49 -0400
Subject: [PATCH 2/9] Update semantic-dark.json

---
 .../src/tokens/color/semantic-dark.json       | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/packages/tokens/src/tokens/color/semantic-dark.json b/packages/tokens/src/tokens/color/semantic-dark.json
index d04e3e9a..e215f433 100644
--- a/packages/tokens/src/tokens/color/semantic-dark.json
+++ b/packages/tokens/src/tokens/color/semantic-dark.json
@@ -20,6 +20,20 @@
       "category": "color"
     }
   },
+  "vads-color-foreground-subtle-on-dark": {
+    "name": "vads-color-foreground-subtle-on-dark",
+    "value": "{vads-color-base-light.*.value}",
+    "attributes": {
+      "category": "color"
+    }
+  },
+  "vads-color-foreground-error-on-dark": {
+    "name": "vads-color-foreground-error-on-dark",
+    "value": "{uswds-system-color-red-vivid-40}",
+    "attributes": {
+      "category": "color"
+    }
+  },
   "vads-color-surface-secondary-on-dark": {
     "name": "vads-color-surface-secondary-on-dark",
     "value": "{vads-color-base-darker.*.value}",
@@ -145,5 +159,40 @@
     "attributes": {
       "category": "color"
     }
+  },
+  "vads-color-forms-border-default-on-dark": {
+    "name": "vads-color-forms-border-default-on-dark",
+    "value": "{vads-color-base-light.*.value}",
+    "attributes": {
+      "category": "color"
+    }
+  },
+  "vads-color-forms-border-error-on-dark": {
+    "name": "vads-color-forms-border-error-on-dark",
+    "value": "{uswds-system-color-red-vivid-40}",
+    "attributes": {
+      "category": "color"
+    }
+  },
+  "vads-color-forms-border-subtle-on-dark": {
+    "name": "vads-color-forms-border-subtle-on-dark",
+    "value": "{vads-color-base-dark.*.value}",
+    "attributes": {
+      "category": "color"
+    }
+  },
+  "vads-color-forms-border-active-on-dark": {
+    "name": "vads-color-forms-border-active-on-dark",
+    "value": "{uswds-system-color-blue-vivid-30}",
+    "attributes": {
+      "category": "color"
+    }
+  },
+  "vads-color-forms-foreground-active-on-dark": {
+    "name": "vads-color-forms-foreground-active-on-dark",
+    "value": "{uswds-system-color-blue-vivid-30}",
+    "attributes": {
+      "category": "color"
+    }
   }
 }

From 28bda06cb4a133c2eac2479e9b49d1b386678258 Mon Sep 17 00:00:00 2001
From: jessicawoodin <82840483+jessicawoodin@users.noreply.github.com>
Date: Tue, 10 Sep 2024 09:51:31 -0400
Subject: [PATCH 3/9] Update colors.stories.mdx

---
 packages/components/storybook/colors.stories.mdx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/components/storybook/colors.stories.mdx b/packages/components/storybook/colors.stories.mdx
index 5997200d..17205b2c 100644
--- a/packages/components/storybook/colors.stories.mdx
+++ b/packages/components/storybook/colors.stories.mdx
@@ -47,7 +47,9 @@ Our color palette is organized into semantic color tokens, which have specific m
     colors={{
       Gray90: colors.uswdsSystemColorGray90,
       Gray80: colors.uswdsSystemColorGray80,
+      Gray60: colors.uswdsSystemColorGray60,
       Gray30: colors.uswdsSystemColorGray30,
+      Gray2: colors.uswdsSystemColorGray2,
     }}
   />
 </ColorPalette>

From b66e920d68efee9c3c87eaee72787ee947caf368 Mon Sep 17 00:00:00 2001
From: jessicawoodin <82840483+jessicawoodin@users.noreply.github.com>
Date: Tue, 10 Sep 2024 10:05:02 -0400
Subject: [PATCH 4/9] Update colors.stories.mdx

---
 .../components/storybook/colors.stories.mdx   | 77 +++++++++++++++++++
 1 file changed, 77 insertions(+)

diff --git a/packages/components/storybook/colors.stories.mdx b/packages/components/storybook/colors.stories.mdx
index 17205b2c..4b74c786 100644
--- a/packages/components/storybook/colors.stories.mdx
+++ b/packages/components/storybook/colors.stories.mdx
@@ -183,6 +183,14 @@ Our color palette is organized into semantic color tokens, which have specific m
       OnDark: colors.vadsColorForegroundDefaultOnDark,
     }}
   />
+  <ColorItem
+    title="Subtle"
+    subtitle="vadsColorForegroundSubtle"
+    colors={{
+      OnLight: colors.vadsColorForegroundSubtleOnLight,
+      OnDark: colors.vadsColorForegroundSubtleOnDark,
+    }}
+  />
   <ColorItem
     title="Inverse"
     subtitle="vadsColorForegroundInverse"
@@ -191,6 +199,14 @@ Our color palette is organized into semantic color tokens, which have specific m
       OnDark: colors.vadsColorForegroundInverseOnDark,
     }}
   />
+  <ColorItem
+    title="Error"
+    subtitle="vadsColorForegroundError"
+    colors={{
+      OnLight: colors.vadsColorForegroundErrorOnLight,
+      OnDark: colors.vadsColorForegroundErrorOnDark,
+    }}
+  />
 </ColorPalette>
 
 ### Surface
@@ -447,6 +463,67 @@ Our color palette is organized into semantic color tokens, which have specific m
   />
 </ColorPalette>
 
+### Forms
+
+#### Foreground
+<ColorPalette>
+  <ColorItem
+    title="Active"
+    subtitle="vadsColorFormsForegroundActive"
+    colors={{
+      OnLight: colors.vadsColorFormsForegroundActiveOnLight,
+      OnDark: colors.vadsColorFormsForegroundActiveOnDark,
+    }}
+  />
+</ColorPalette>
+
+#### Surface
+<ColorPalette>
+  <ColorItem
+    title="Active"
+    subtitle="vadsColorFormsSurfaceActive"
+    colors={{
+      OnLight: colors.vadsColorFormsSurfaceActiveOnLight,
+      OnDark: colors.vadsColorFormsSurfaceActiveOnDark,
+    }}
+  />
+</ColorPalette>
+
+#### Border
+<ColorPalette>
+  <ColorItem
+    title="Default"
+    subtitle="vadsColorFormsBorderDefault"
+    colors={{
+      OnLight: colors.vadsColorFormsBorderDefaultOnLight,
+      OnDark: colors.vadsColorFormsBorderDefaultOnDark,
+    }}
+  />
+  <ColorItem
+    title="Subtle"
+    subtitle="vadsColorFormsBorderSubtle"
+    colors={{
+      OnLight: colors.vadsColorFormsBorderSubtleOnLight,
+      OnDark: colors.vadsColorFormsBorderSubtleOnDark,
+    }}
+  />
+  <ColorItem
+    title="Active"
+    subtitle="vadsColorFormsBorderActive"
+    colors={{
+      OnLight: colors.vadsColorFormsBorderActiveOnLight,
+      OnDark: colors.vadsColorFormsBorderActiveOnDark,
+    }}
+  />
+  <ColorItem
+    title="Error"
+    subtitle="vadsColorFormsBorderError"
+    colors={{
+      OnLight: colors.vadsColorFormsBorderErrorOnLight,
+      OnDark: colors.vadsColorFormsBorderErrorOnDark,
+    }}
+  />
+</ColorPalette>
 
 ## Component
 

From 1219d3edfce7a77503bcbc4871e2d9e3c85f7ec8 Mon Sep 17 00:00:00 2001
From: jessicawoodin <82840483+jessicawoodin@users.noreply.github.com>
Date: Tue, 10 Sep 2024 10:08:50 -0400
Subject: [PATCH 5/9] Build tokens

---
 packages/tokens/figma/dark.json  | 28 ++++++++++++++++++++++++++++
 packages/tokens/figma/light.json | 28 ++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)

diff --git a/packages/tokens/figma/dark.json b/packages/tokens/figma/dark.json
index 3fe40bb0..2a16f460 100644
--- a/packages/tokens/figma/dark.json
+++ b/packages/tokens/figma/dark.json
@@ -611,10 +611,38 @@
     "$value": "{vads-color-base-lightest}",
     "$type": "color"
   },
+  "vads-color-foreground-error-on-dark": {
+    "$value": "{uswds-system-color-red-vivid-40}",
+    "$type": "color"
+  },
   "vads-color-foreground-inverse-on-dark": {
     "$value": "{vads-color-base-darkest}",
     "$type": "color"
   },
+  "vads-color-foreground-subtle-on-dark": {
+    "$value": "{vads-color-base-light}",
+    "$type": "color"
+  },
+  "vads-color-forms-border-active-on-dark": {
+    "$value": "{uswds-system-color-blue-vivid-30}",
+    "$type": "color"
+  },
+  "vads-color-forms-border-default-on-dark": {
+    "$value": "{vads-color-base-light}",
+    "$type": "color"
+  },
+  "vads-color-forms-border-error-on-dark": {
+    "$value": "{uswds-system-color-red-vivid-40}",
+    "$type": "color"
+  },
+  "vads-color-forms-border-subtle-on-dark": {
+    "$value": "{vads-color-base-dark}",
+    "$type": "color"
+  },
+  "vads-color-forms-foreground-active-on-dark": {
+    "$value": "{uswds-system-color-blue-vivid-30}",
+    "$type": "color"
+  },
   "vads-color-gibill-accent": {
     "$value": "{uswds-system-color-gold-vivid-5}",
     "$type": "color"
diff --git a/packages/tokens/figma/light.json b/packages/tokens/figma/light.json
index f912bbba..39d5755b 100644
--- a/packages/tokens/figma/light.json
+++ b/packages/tokens/figma/light.json
@@ -631,10 +631,38 @@
     "$value": "{vads-color-base}",
     "$type": "color"
   },
+  "vads-color-foreground-error-on-light": {
+    "$value": "{vads-color-secondary-dark}",
+    "$type": "color"
+  },
   "vads-color-foreground-inverse-on-light": {
     "$value": "{vads-color-base-lightest}",
     "$type": "color"
   },
+  "vads-color-foreground-subtle-on-light": {
+    "$value": "{vads-color-base-dark}",
+    "$type": "color"
+  },
+  "vads-color-forms-border-active-on-light": {
+    "$value": "{vads-color-primary}",
+    "$type": "color"
+  },
+  "vads-color-forms-border-default-on-light": {
+    "$value": "{vads-color-base-dark}",
+    "$type": "color"
+  },
+  "vads-color-forms-border-error-on-light": {
+    "$value": "{vads-color-secondary-dark}",
+    "$type": "color"
+  },
+  "vads-color-forms-border-subtle-on-light": {
+    "$value": "{vads-color-base-light}",
+    "$type": "color"
+  },
+  "vads-color-forms-foreground-active-on-light": {
+    "$value": "{vads-color-primary}",
+    "$type": "color"
+  },
   "vads-color-gibill-accent": {
     "$value": "{uswds-system-color-gold-vivid-5}",
     "$type": "color"

From 022699de13d608d0eaf718df7b6e9ca66688f2bb Mon Sep 17 00:00:00 2001
From: jessicawoodin <82840483+jessicawoodin@users.noreply.github.com>
Date: Tue, 10 Sep 2024 13:35:14 -0400
Subject: [PATCH 6/9] Update colors.stories.mdx

---
 .../components/storybook/colors.stories.mdx   | 78 -------------------
 1 file changed, 78 deletions(-)

diff --git a/packages/components/storybook/colors.stories.mdx b/packages/components/storybook/colors.stories.mdx
index 4b74c786..9801e039 100644
--- a/packages/components/storybook/colors.stories.mdx
+++ b/packages/components/storybook/colors.stories.mdx
@@ -183,14 +183,6 @@ Our color palette is organized into semantic color tokens, which have specific m
       OnDark: colors.vadsColorForegroundDefaultOnDark,
     }}
   />
-  <ColorItem
-    title="Subtle"
-    subtitle="vadsColorForegroundSubtle"
-    colors={{
-      OnLight: colors.vadsColorForegroundSubtleOnLight,
-      OnDark: colors.vadsColorForegroundSubtleOnDark,
-    }}
-  />
   <ColorItem
     title="Inverse"
     subtitle="vadsColorForegroundInverse"
@@ -199,14 +191,6 @@ Our color palette is organized into semantic color tokens, which have specific m
       OnDark: colors.vadsColorForegroundInverseOnDark,
     }}
   />
-  <ColorItem
-    title="Error"
-    subtitle="vadsColorForegroundError"
-    colors={{
-      OnLight: colors.vadsColorForegroundErrorOnLight,
-      OnDark: colors.vadsColorForegroundErrorOnDark,
-    }}
-  />
 </ColorPalette>
 
 ### Surface
@@ -463,68 +447,6 @@ Our color palette is organized into semantic color tokens, which have specific m
   />
 </ColorPalette>
 
-### Forms
-
-#### Foreground
-<ColorPalette>
-  <ColorItem
-    title="Active"
-    subtitle="vadsColorFormsForegroundActive"
-    colors={{
-      OnLight: colors.vadsColorFormsForegroundActiveOnLight,
-      OnDark: colors.vadsColorFormsForegroundActiveOnDark,
-    }}
-  />
-</ColorPalette>
-
-#### Surface
-<ColorPalette>
-  <ColorItem
-    title="Active"
-    subtitle="vadsColorFormsSurfaceActive"
-    colors={{
-      OnLight: colors.vadsColorFormsSurfaceActiveOnLight,
-      OnDark: colors.vadsColorFormsSurfaceActiveOnDark,
-    }}
-  />
-</ColorPalette>
-
-#### Border
-<ColorPalette>
-  <ColorItem
-    title="Default"
-    subtitle="vadsColorFormsBorderDefault"
-    colors={{
-      OnLight: colors.vadsColorFormsBorderDefaultOnLight,
-      OnDark: colors.vadsColorFormsBorderDefaultOnDark,
-    }}
-  />
-  <ColorItem
-    title="Subtle"
-    subtitle="vadsColorFormsBorderSubtle"
-    colors={{
-      OnLight: colors.vadsColorFormsBorderSubtleOnLight,
-      OnDark: colors.vadsColorFormsBorderSubtleOnDark,
-    }}
-  />
-  <ColorItem
-    title="Active"
-    subtitle="vadsColorFormsBorderActive"
-    colors={{
-      OnLight: colors.vadsColorFormsBorderActiveOnLight,
-      OnDark: colors.vadsColorFormsBorderActiveOnDark,
-    }}
-  />
-  <ColorItem
-    title="Error"
-    subtitle="vadsColorFormsBorderError"
-    colors={{
-      OnLight: colors.vadsColorFormsBorderErrorOnLight,
-      OnDark: colors.vadsColorFormsBorderErrorOnDark,
-    }}
-  />
-</ColorPalette>
-
 ## Component
 
 ### Segmented Control

From 7c48b72f5b71a95a1ee099984ff69e8e101f10e7 Mon Sep 17 00:00:00 2001
From: VA Automation Bot <va-mobileapp@adhocteam.us>
Date: Tue, 10 Sep 2024 17:37:43 +0000
Subject: [PATCH 7/9] Version bump: tokens-v0.14.1-alpha.2

---
 packages/tokens/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/tokens/package.json b/packages/tokens/package.json
index 079dfd66..e5e93a80 100644
--- a/packages/tokens/package.json
+++ b/packages/tokens/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@department-of-veterans-affairs/mobile-tokens",
-  "version": "0.14.0",
+  "version": "0.14.1-alpha.2",
   "description": "VA Design System Mobile Token Library",
   "main": "dist/js/index.js",
   "types": "dist/index.d.ts",

From a145ab5ce2c5e79d74d98f678ab96dbc137a97d8 Mon Sep 17 00:00:00 2001
From: jessicawoodin <82840483+jessicawoodin@users.noreply.github.com>
Date: Tue, 10 Sep 2024 13:49:33 -0400
Subject: [PATCH 8/9] Update colors.stories.mdx

---
 packages/components/storybook/colors.stories.mdx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/components/storybook/colors.stories.mdx b/packages/components/storybook/colors.stories.mdx
index 9801e039..090fa4db 100644
--- a/packages/components/storybook/colors.stories.mdx
+++ b/packages/components/storybook/colors.stories.mdx
@@ -47,9 +47,7 @@ Our color palette is organized into semantic color tokens, which have specific m
     colors={{
       Gray90: colors.uswdsSystemColorGray90,
       Gray80: colors.uswdsSystemColorGray80,
-      Gray60: colors.uswdsSystemColorGray60,
       Gray30: colors.uswdsSystemColorGray30,
-      Gray2: colors.uswdsSystemColorGray2,
     }}
   />
 </ColorPalette>

From 599a03f67ccb2cca54a42302eb1d497f68187cca Mon Sep 17 00:00:00 2001
From: jessicawoodin <82840483+jessicawoodin@users.noreply.github.com>
Date: Tue, 10 Sep 2024 13:54:22 -0400
Subject: [PATCH 9/9] Update colors.stories.mdx

---
 packages/components/storybook/colors.stories.mdx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/components/storybook/colors.stories.mdx b/packages/components/storybook/colors.stories.mdx
index 090fa4db..5997200d 100644
--- a/packages/components/storybook/colors.stories.mdx
+++ b/packages/components/storybook/colors.stories.mdx
@@ -445,6 +445,7 @@ Our color palette is organized into semantic color tokens, which have specific m
   />
 </ColorPalette>
 
+
 ## Component
 
 ### Segmented Control