From b187283a95cb666ceb8a682f164c67bfd8d0d2c9 Mon Sep 17 00:00:00 2001
From: Lukas Oppermann <lukasoppermann@github.com>
Date: Thu, 16 Jan 2025 14:44:46 +0100
Subject: [PATCH] add missing light overrides for fgColor

---
 src/tokens/functional/color/fgColor.json5     | 24 ++++++++++++++-----
 .../light.protanopia-deuteranopia.json5       | 18 --------------
 .../light/overrides/light.tritanopia.json5    | 18 --------------
 3 files changed, 18 insertions(+), 42 deletions(-)

diff --git a/src/tokens/functional/color/fgColor.json5 b/src/tokens/functional/color/fgColor.json5
index 9c60627a3..6c0fea39d 100644
--- a/src/tokens/functional/color/fgColor.json5
+++ b/src/tokens/functional/color/fgColor.json5
@@ -150,7 +150,7 @@
         },
         'org.primer.overrides': {
           dark: '#4493F8',
-          "light-high-contrast": "{base.color.blue.6}",
+          'light-high-contrast': '{base.color.blue.6}',
         },
       },
     },
@@ -169,6 +169,8 @@
         'org.primer.overrides': {
           dark: '{base.color.green.3}',
           'light-high-contrast': '{base.color.green.6}',
+          'light-protanopia-deuteranopia': '{base.color.blue.5}',
+          "light-tritanopia": '{base.color.blue.5}',
         },
       },
     },
@@ -184,6 +186,10 @@
             web: 'var(--fgColor-open) /* utility class: .color-fg-open */',
           },
         },
+        'org.primer.overrides': {
+          'light-protanopia-deuteranopia': '{base.color.blue.5}',
+          "light-tritanopia": '{base.color.red.5}',
+        },
       },
     },
     attention: {
@@ -200,7 +206,7 @@
         },
         'org.primer.overrides': {
           dark: '{base.color.yellow.3}',
-          "light-high-contrast": "{base.color.yellow.6}",
+          'light-high-contrast': '{base.color.yellow.6}',
         },
       },
     },
@@ -218,7 +224,8 @@
         },
         'org.primer.overrides': {
           dark: '{base.color.orange.4}',
-          "light-high-contrast": "{base.color.orange.6}",
+          'light-high-contrast': '{base.color.orange.6}',
+          "light-tritanopia": '{base.color.red.5}',
         },
       },
     },
@@ -236,7 +243,8 @@
         },
         'org.primer.overrides': {
           dark: '{base.color.red.4}',
-          "light-high-contrast": "{base.color.red.6}",
+          'light-high-contrast': '{base.color.red.6}',
+          'light-protanopia-deuteranopia': '{base.color.orange.5}',
         },
       },
     },
@@ -252,6 +260,10 @@
             web: 'var(--fgColor-closed) /* utility class: .color-fg-closed */',
           },
         },
+        'org.primer.overrides': {
+          'light-protanopia-deuteranopia': '{fgColor.muted}',
+          "light-tritanopia": '{fgColor.muted}',
+        },
       },
     },
     done: {
@@ -268,7 +280,7 @@
         },
         'org.primer.overrides': {
           dark: '{base.color.purple.4}',
-          "light-high-contrast": "{base.color.purple.6}",
+          'light-high-contrast': '{base.color.purple.6}',
         },
       },
     },
@@ -300,7 +312,7 @@
         },
         'org.primer.overrides': {
           dark: '{base.color.pink.4}',
-          "light-high-contrast": "{base.color.pink.6}",
+          'light-high-contrast': '{base.color.pink.6}',
         },
       },
     },
diff --git a/src/tokens/functional/color/light/overrides/light.protanopia-deuteranopia.json5 b/src/tokens/functional/color/light/overrides/light.protanopia-deuteranopia.json5
index 66964e805..ba941fab3 100644
--- a/src/tokens/functional/color/light/overrides/light.protanopia-deuteranopia.json5
+++ b/src/tokens/functional/color/light/overrides/light.protanopia-deuteranopia.json5
@@ -4,24 +4,6 @@
  * @description All overwrites for functional color tokens for light protanopia and deuteranopia color mode are in this file
  */
 {
-  fgColor: {
-    success: {
-      $value: '{base.color.blue.5}',
-      $type: 'color',
-    },
-    open: {
-      $value: '{base.color.blue.5}',
-      $type: 'color',
-    },
-    closed: {
-      $value: '{fgColor.muted}',
-      $type: 'color',
-    },
-    danger: {
-      $value: '{base.color.orange.5}',
-      $type: 'color',
-    },
-  },
   bgColor: {
     success: {
       muted: {
diff --git a/src/tokens/functional/color/light/overrides/light.tritanopia.json5 b/src/tokens/functional/color/light/overrides/light.tritanopia.json5
index 970e0c80d..08d3e2e13 100644
--- a/src/tokens/functional/color/light/overrides/light.tritanopia.json5
+++ b/src/tokens/functional/color/light/overrides/light.tritanopia.json5
@@ -4,24 +4,6 @@
  * @description All overwrites for functional color tokens for this theme are in this file
  */
 {
-  fgColor: {
-    success: {
-      $value: '{base.color.blue.5}',
-      $type: 'color',
-    },
-    severe: {
-      $value: '{base.color.red.5}',
-      $type: 'color',
-    },
-    open: {
-      $value: '{base.color.red.5}',
-      $type: 'color',
-    },
-    closed: {
-      $value: '{fgColor.muted}',
-      $type: 'color',
-    },
-  },
   bgColor: {
     success: {
       muted: {