lock + more color alignment

primer · May 1, 2024 · aa8bae5 · aa8bae5
1 parent 7df3549
commit aa8bae5
Show file tree

Hide file tree

Showing 9 changed files with 142 additions and 241 deletions.
diff --git a/docs/storybook/package-lock.json b/docs/storybook/package-lock.json
diff --git a/docs/storybook/stories/BorderTesting.css b/docs/storybook/stories/BorderTesting.css
@@ -52,3 +52,7 @@
 .TextInput-wrapper {
   /* border-width: var(--control-borderWidth) !important; */
 }
+
+[data-component='ButtonCounter'] {
+  background-color: var(--buttonCounter-default-bgColor-rest) !important;
+}
diff --git a/src/tokens/functional/color/dark/overrides/dark.high-contrast.json5 b/src/tokens/functional/color/dark/overrides/dark.high-contrast.json5
@@ -10,50 +10,63 @@
       $type: 'color',
     },
     onEmphasis: {
-      $value: '{base.color.neutral.14}',
+      $value: '{base.color.black}',
       $type: 'color',
     },
     muted: {
       $value: '{base.color.neutral.11}',
       $type: 'color',
-      mix: null,
-      alpha: 1,
+      // mix: null,
+      // alpha: 1,
     },
     disabled: {
       $value: '{base.color.neutral.7}',
       $type: 'color',
     },
   },
   bgColor: {
+    muted: {
+      $value: '{base.color.neutral.2}',
+      $type: 'color',
+      alpha: 1,
+    },
     emphasis: {
       $value: '{base.color.white}',
       $type: 'color',
     },
+    disabled: {
+      $value: '{base.color.neutral.3}',
+      $type: 'color',
+    },
     neutral: {
+      muted: {
+        $value: '{base.color.neutral.6}',
+        $type: 'color',
+      },
       emphasis: {
-        $value: '{base.color.neutral.4}',
+        $value: '{base.color.neutral.11}',
         $type: 'color',
       },
     },
   },
   borderColor: {
     default: {
-      $value: '{base.color.neutral.5}',
+      $value: '{borderColor.emphasis}',
       $type: 'color',
     },
     muted: {
-      $value: '{base.color.neutral.5}',
+      $value: '{borderColor.emphasis}',
       $type: 'color',
       alpha: 1,
     },
     neutral: {
       muted: {
-        $value: '{base.color.neutral.4}',
+        $value: '{borderColor.emphasis}',
         $type: 'color',
         alpha: 1,
       },
       emphasis: {
-        $value: '{base.color.neutral.4}',
+        $value: '{borderColor.emphasis}',
         $type: 'color',
       },
     },

diff --git a/src/tokens/functional/color/dark/primitives-dark.json5 b/src/tokens/functional/color/dark/primitives-dark.json5
@@ -394,7 +394,7 @@
       },
     },
     disabled: {
-      $value: '{base.color.neutral.1}',
+      $value: '{base.color.neutral.2}',
       $type: 'color',
       $extensions: {
         'org.primer.figma': {
@@ -404,7 +404,7 @@
           scopes: ['bgColor'],
         },
       },
-      alpha: 0.7,
+      // alpha: 0.7,
     },
     transparent: {
       $value: '{base.color.transparent}',