Merge pull request #108 from primer/update-mappings

Remap v2 variables
primer · May 26, 2021 · 077ff1f · 077ff1f
2 parents 3469ab5 + 0d44ce6
commit 077ff1f
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 21 deletions.
diff --git a/.changeset/tasty-steaks-heal.md b/.changeset/tasty-steaks-heal.md
@@ -0,0 +1,5 @@
+---
+"@primer/primitives": patch
+---
+
+Remap v2 variables
diff --git a/data/colors_v2/vars/deprecated.ts b/data/colors_v2/vars/deprecated.ts
@@ -434,7 +434,7 @@ export default {
     }
   },
   diffBlob: {
-    numText: get('neutral.fg'),
+    numText: get('fg.muted'),
     numHoverText: get('fg.default'),
     addition: {
       numText: get('success.fg'),

diff --git a/data/colors_v2/vars/global_dark.ts b/data/colors_v2/vars/global_dark.ts
@@ -25,25 +25,25 @@ export default {
 
   // Roles
   neutral: {
-    fg: get('scale.gray.4'),
+    emphasisPlus: get('scale.gray.4'),
     emphasis: get('scale.gray.5'),
     muted: alpha(get('scale.gray.4'), 0.4),
     subtle: alpha(get('scale.gray.4'), 0.1)
   },
   accent: {
-    fg: get('scale.blue.4'),
+    fg: get('scale.blue.3'),
     emphasis: get('scale.blue.5'),
     muted: alpha(get('scale.blue.4'), 0.4),
     subtle: alpha(get('scale.blue.4'), 0.1)
   },
   success: {
-    fg: get('scale.green.4'),
+    fg: get('scale.green.3'),
     emphasis: get('scale.green.5'),
     muted: alpha(get('scale.green.4'), 0.4),
     subtle: alpha(get('scale.green.4'), 0.1)
   },
   warning: {
-    fg: get('scale.yellow.4'),
+    fg: get('scale.yellow.3'),
     emphasis: get('scale.yellow.5'),
     muted: alpha(get('scale.yellow.4'), 0.4),
     subtle: alpha(get('scale.yellow.4'), 0.1)

diff --git a/data/colors_v2/vars/global_light.ts b/data/colors_v2/vars/global_light.ts
@@ -25,51 +25,51 @@ export default {
 
   // Roles
   neutral: {
-    fg: get('scale.gray.5'),
+    emphasisPlus: get('scale.gray.9'),
     emphasis: get('scale.gray.5'),
-    muted: get('scale.gray.3'),
-    subtle: get('scale.gray.1')
+    muted: alpha(get('scale.gray.3'), 0.4),
+    subtle: alpha(get('scale.gray.1'), 0.5)
   },
   accent: {
     fg: get('scale.blue.5'),
     emphasis: get('scale.blue.5'),
-    muted: get('scale.blue.2'),
+    muted: alpha(get('scale.blue.3'), 0.4),
     subtle: get('scale.blue.0')
   },
   success: {
-    fg: get('scale.green.6'),
+    fg: get('scale.green.5'),
     emphasis: get('scale.green.5'),
-    muted: get('scale.green.3'),
-    subtle: get('scale.green.1')
+    muted: alpha(get('scale.green.3'), 0.4),
+    subtle: get('scale.green.0')
   },
   warning: {
-    fg: get('scale.yellow.8'),
+    fg: get('scale.yellow.5'),
     emphasis: get('scale.yellow.5'),
-    muted: get('scale.yellow.3'),
-    subtle: get('scale.yellow.2')
+    muted: alpha(get('scale.yellow.3'), 0.4),
+    subtle: get('scale.yellow.0')
   },
   severe: {
     fg: get('scale.orange.5'),
     emphasis: get('scale.orange.5'),
-    muted: get('scale.orange.3'),
-    subtle: get('scale.orange.1')
+    muted: alpha(get('scale.orange.3'), 0.4),
+    subtle: get('scale.orange.0')
   },
   danger: {
-    fg: get('scale.red.6'),
+    fg: get('scale.red.5'),
     emphasis: get('scale.red.5'),
-    muted: get('scale.red.2'),
+    muted: alpha(get('scale.red.3'), 0.4),
     subtle: get('scale.red.0')
   },
   done: {
     fg: get('scale.purple.5'),
     emphasis: get('scale.purple.5'),
-    muted: get('scale.purple.2'),
+    muted: alpha(get('scale.purple.3'), 0.4),
     subtle: get('scale.purple.0')
   },
   sponsors: {
     fg: get('scale.pink.5'),
     emphasis: get('scale.pink.5'),
-    muted: get('scale.pink.2'),
+    muted: alpha(get('scale.pink.3'), 0.4),
     subtle: get('scale.pink.0')
   },