rm @ where it does not effect output (#977)

* rm @ where it does not effect output * reset * fix fgColor-accent
primer · Jun 21, 2024 · 86a263b · 86a263b
1 parent 6fd3f32
commit 86a263b
Show file tree

Hide file tree

Showing 10 changed files with 311 additions and 390 deletions.
diff --git a/.changeset/gold-owls-enjoy.md b/.changeset/gold-owls-enjoy.md
@@ -0,0 +1,5 @@
+---
+'@primer/primitives': patch
+---
+
+rm @ where it does not effect output
diff --git a/src/tokens/functional/color/dark/overrides/dark.protanopia-deuteranopia.json5 b/src/tokens/functional/color/dark/overrides/dark.protanopia-deuteranopia.json5
@@ -6,28 +6,20 @@
 {
   fgColor: {
     success: {
-      '@': {
-        $value: '{base.color.blue.3}',
-        $type: 'color',
-      },
+      $value: '{base.color.blue.3}',
+      $type: 'color',
     },
     danger: {
-      '@': {
-        $value: '{base.color.orange.4}',
-        $type: 'color',
-      },
+      $value: '{base.color.orange.4}',
+      $type: 'color',
     },
     open: {
-      '@': {
-        $value: '{base.color.orange.3}',
-        $type: 'color',
-      },
+      $value: '{base.color.orange.3}',
+      $type: 'color',
     },
     closed: {
-      '@': {
-        $value: '{base.color.neutral.3}',
-        $type: 'color',
-      },
+      $value: '{base.color.neutral.3}',
+      $type: 'color',
     },
   },
   bgColor: {

diff --git a/src/tokens/functional/color/dark/overrides/dark.tritanopia.json5 b/src/tokens/functional/color/dark/overrides/dark.tritanopia.json5
@@ -6,28 +6,20 @@
 {
   fgColor: {
     success: {
-      '@': {
-        $value: '{base.color.blue.3}',
-        $type: 'color',
-      },
+      $value: '{base.color.blue.3}',
+      $type: 'color',
     },
     severe: {
-      '@': {
-        $value: '{base.color.red.4}',
-        $type: 'color',
-      },
+      $value: '{base.color.red.4}',
+      $type: 'color',
     },
     open: {
-      '@': {
-        $value: '{base.color.red.4}',
-        $type: 'color',
-      },
+      $value: '{base.color.red.4}',
+      $type: 'color',
     },
     closed: {
-      '@': {
-        $value: '{base.color.neutral.4}',
-        $type: 'color',
-      },
+      $value: '{base.color.neutral.4}',
+      $type: 'color',
     },
   },
   bgColor: {
@@ -224,6 +216,6 @@
           },
         },
       },
-    }
+    },
   },
 }
diff --git a/src/tokens/functional/color/dark/patterns-dark.json5 b/src/tokens/functional/color/dark/patterns-dark.json5
@@ -381,7 +381,7 @@
     danger: {
       fgColor: {
         rest: {
-          $value: '{fgColor.danger.@}',
+          $value: '{fgColor.danger}',
           $type: 'color',
           $extensions: {
             'org.primer.figma': {
@@ -1070,7 +1070,7 @@
     invisible: {
       fgColor: {
         rest: {
-          $value: '{fgColor.accent.@}',
+          $value: '{fgColor.accent}',
           $type: 'color',
           $extensions: {
             'org.primer.figma': {
@@ -1272,7 +1272,7 @@
           },
         },
         disabled: {
-          $value: '{fgColor.accent.@}',
+          $value: '{fgColor.accent}',
           $type: 'color',
           $extensions: {
             'org.primer.figma': {
@@ -1366,7 +1366,7 @@
     danger: {
       fgColor: {
         rest: {
-          $value: '{fgColor.danger.@}',
+          $value: '{fgColor.danger}',
           $type: 'color',
           $extensions: {
             'org.primer.figma': {
@@ -1402,7 +1402,7 @@
           },
         },
         disabled: {
-          $value: '{fgColor.danger.@}',
+          $value: '{fgColor.danger}',
           $type: 'color',
           $extensions: {
             'org.primer.figma': {
@@ -1417,7 +1417,7 @@
       },
       iconColor: {
         rest: {
-          $value: '{fgColor.danger.@}',
+          $value: '{fgColor.danger}',
           $type: 'color',
           $extensions: {
             'org.primer.figma': {
@@ -1695,7 +1695,7 @@
           },
         },
         disabled: {
-          $value: '{fgColor.accent.@}',
+          $value: '{fgColor.accent}',
           $type: 'color',
           $extensions: {
             'org.primer.figma': {
@@ -1753,7 +1753,7 @@
       },
       fgColor: {
         rest: {
-          $value: '{fgColor.danger.@}',
+          $value: '{fgColor.danger}',
           $type: 'color',
           $extensions: {
             'org.primer.figma': {
@@ -1777,7 +1777,7 @@
           },
         },
         disabled: {
-          $value: '{fgColor.danger.@}',
+          $value: '{fgColor.danger}',
           $type: 'color',
           $extensions: {
             'org.primer.figma': {
@@ -1828,7 +1828,7 @@
       },
       fgColor: {
         rest: {
-          $value: '{fgColor.link.@}',
+          $value: '{fgColor.link}',
           $type: 'color',
           $extensions: {
             'org.primer.figma': {