[Major] Swap fgColor-onEmphasis to white in dark HC (#1023)

* copy * Create dull-actors-pay.md * github-actions[bot] Regenerated snapshots * update disabled control border * github-actions[bot] Regenerated snapshots --------- Co-authored-by: langermank <langermank@users.noreply.github.com>
primer · Aug 6, 2024 · 0f5625e · 0f5625e
1 parent 39862e9
commit 0f5625e
Show file tree

Hide file tree

Showing 54 changed files with 129 additions and 102 deletions.
diff --git a/.changeset/dull-actors-pay.md b/.changeset/dull-actors-pay.md
@@ -0,0 +1,5 @@
+---
+"@primer/primitives": major
+---
+
+Change `fgColor-onEmphasis` to white in dark high contrast theme
diff --git a/...orybook-all-color-swatches-dark-high-contrast-bgColor-accent-emphasis-linux.png b/...orybook-all-color-swatches-dark-high-contrast-bgColor-accent-emphasis-linux.png
diff --git a/...book-all-color-swatches-dark-high-contrast-bgColor-attention-emphasis-linux.png b/...book-all-color-swatches-dark-high-contrast-bgColor-attention-emphasis-linux.png
diff --git a/...orybook-all-color-swatches-dark-high-contrast-bgColor-closed-emphasis-linux.png b/...orybook-all-color-swatches-dark-high-contrast-bgColor-closed-emphasis-linux.png
diff --git a/...orybook-all-color-swatches-dark-high-contrast-bgColor-danger-emphasis-linux.png b/...orybook-all-color-swatches-dark-high-contrast-bgColor-danger-emphasis-linux.png
diff --git a/...storybook-all-color-swatches-dark-high-contrast-bgColor-done-emphasis-linux.png b/...storybook-all-color-swatches-dark-high-contrast-bgColor-done-emphasis-linux.png
diff --git a/...hots/storybook-all-color-swatches-dark-high-contrast-bgColor-emphasis-linux.png b/...hots/storybook-all-color-swatches-dark-high-contrast-bgColor-emphasis-linux.png
diff --git a/...rybook-all-color-swatches-dark-high-contrast-bgColor-neutral-emphasis-linux.png b/...rybook-all-color-swatches-dark-high-contrast-bgColor-neutral-emphasis-linux.png
diff --git a/...storybook-all-color-swatches-dark-high-contrast-bgColor-open-emphasis-linux.png b/...storybook-all-color-swatches-dark-high-contrast-bgColor-open-emphasis-linux.png
diff --git a/...orybook-all-color-swatches-dark-high-contrast-bgColor-severe-emphasis-linux.png b/...orybook-all-color-swatches-dark-high-contrast-bgColor-severe-emphasis-linux.png
diff --git a/...ybook-all-color-swatches-dark-high-contrast-bgColor-sponsors-emphasis-linux.png b/...ybook-all-color-swatches-dark-high-contrast-bgColor-sponsors-emphasis-linux.png
diff --git a/...rybook-all-color-swatches-dark-high-contrast-bgColor-success-emphasis-linux.png b/...rybook-all-color-swatches-dark-high-contrast-bgColor-success-emphasis-linux.png
diff --git a/...orybook-all-color-swatches-dark-high-contrast-bgColor-upsell-emphasis-linux.png b/...orybook-all-color-swatches-dark-high-contrast-bgColor-upsell-emphasis-linux.png
diff --git a/...ok-all-color-swatches-dark-high-contrast-button-danger-bgColor-active-linux.png b/...ok-all-color-swatches-dark-high-contrast-button-danger-bgColor-active-linux.png
diff --git a/...ook-all-color-swatches-dark-high-contrast-button-danger-bgColor-hover-linux.png b/...ook-all-color-swatches-dark-high-contrast-button-danger-bgColor-hover-linux.png
diff --git a/...l-color-swatches-dark-high-contrast-button-invisible-fgColor-disabled-linux.png b/...l-color-swatches-dark-high-contrast-button-invisible-fgColor-disabled-linux.png
diff --git a/...color-swatches-dark-high-contrast-button-invisible-iconColor-disabled-linux.png b/...color-swatches-dark-high-contrast-button-invisible-iconColor-disabled-linux.png
diff --git a/...ook-all-color-swatches-dark-high-contrast-button-primary-bgColor-rest-linux.png b/...ook-all-color-swatches-dark-high-contrast-button-primary-bgColor-rest-linux.png
diff --git a/...all-color-swatches-dark-high-contrast-button-primary-fgColor-disabled-linux.png b/...all-color-swatches-dark-high-contrast-button-primary-fgColor-disabled-linux.png
diff --git a/...ook-all-color-swatches-dark-high-contrast-button-primary-fgColor-rest-linux.png b/...ook-all-color-swatches-dark-high-contrast-button-primary-fgColor-rest-linux.png
diff --git a/...k-all-color-swatches-dark-high-contrast-button-primary-iconColor-rest-linux.png b/...k-all-color-swatches-dark-high-contrast-button-primary-iconColor-rest-linux.png
diff --git a/...ll-color-swatches-dark-high-contrast-control-checked-bgColor-disabled-linux.png b/...ll-color-swatches-dark-high-contrast-control-checked-bgColor-disabled-linux.png
diff --git a/...k-all-color-swatches-dark-high-contrast-control-checked-bgColor-hover-linux.png b/...k-all-color-swatches-dark-high-contrast-control-checked-bgColor-hover-linux.png
diff --git a/...ok-all-color-swatches-dark-high-contrast-control-checked-bgColor-rest-linux.png b/...ok-all-color-swatches-dark-high-contrast-control-checked-bgColor-rest-linux.png
diff --git a/...olor-swatches-dark-high-contrast-control-checked-borderColor-disabled-linux.png b/...olor-swatches-dark-high-contrast-control-checked-borderColor-disabled-linux.png
diff --git a/...ok-all-color-swatches-dark-high-contrast-control-checked-fgColor-rest-linux.png b/...ok-all-color-swatches-dark-high-contrast-control-checked-fgColor-rest-linux.png
diff --git a/...k-all-color-swatches-dark-high-contrast-control-danger-bgColor-active-linux.png b/...k-all-color-swatches-dark-high-contrast-control-danger-bgColor-active-linux.png
diff --git a/...ok-all-color-swatches-dark-high-contrast-control-danger-bgColor-hover-linux.png b/...ok-all-color-swatches-dark-high-contrast-control-danger-bgColor-hover-linux.png
diff --git a/...ok-all-color-swatches-dark-high-contrast-control-danger-fgColor-hover-linux.png b/...ok-all-color-swatches-dark-high-contrast-control-danger-fgColor-hover-linux.png
diff --git a/...rybook-all-color-swatches-dark-high-contrast-control-fgColor-disabled-linux.png b/...rybook-all-color-swatches-dark-high-contrast-control-fgColor-disabled-linux.png
diff --git a/...all-color-swatches-dark-high-contrast-controlKnob-borderColor-checked-linux.png b/...all-color-swatches-dark-high-contrast-controlKnob-borderColor-checked-linux.png
diff --git a/...k-all-color-swatches-dark-high-contrast-controlTrack-bgColor-disabled-linux.png b/...k-all-color-swatches-dark-high-contrast-controlTrack-bgColor-disabled-linux.png
diff --git a/...l-color-swatches-dark-high-contrast-controlTrack-borderColor-disabled-linux.png b/...l-color-swatches-dark-high-contrast-controlTrack-borderColor-disabled-linux.png
diff --git a/...k-all-color-swatches-dark-high-contrast-controlTrack-fgColor-disabled-linux.png b/...k-all-color-swatches-dark-high-contrast-controlTrack-fgColor-disabled-linux.png
diff --git a/...-all-color-swatches-dark-high-contrast-diffBlob-addition-bgColor-word-linux.png b/...-all-color-swatches-dark-high-contrast-diffBlob-addition-bgColor-word-linux.png
diff --git a/...-all-color-swatches-dark-high-contrast-diffBlob-addition-fgColor-text-linux.png b/...-all-color-swatches-dark-high-contrast-diffBlob-addition-fgColor-text-linux.png
diff --git a/...-all-color-swatches-dark-high-contrast-diffBlob-deletion-bgColor-word-linux.png b/...-all-color-swatches-dark-high-contrast-diffBlob-deletion-bgColor-word-linux.png
diff --git a/...-all-color-swatches-dark-high-contrast-diffBlob-deletion-fgColor-text-linux.png b/...-all-color-swatches-dark-high-contrast-diffBlob-deletion-fgColor-text-linux.png
diff --git a/...all-color-swatches-dark-high-contrast-display-indigo-bgColor-emphasis-linux.png b/...all-color-swatches-dark-high-contrast-display-indigo-bgColor-emphasis-linux.png
diff --git a/...k-all-color-swatches-dark-high-contrast-display-plum-bgColor-emphasis-linux.png b/...k-all-color-swatches-dark-high-contrast-display-plum-bgColor-emphasis-linux.png
diff --git a/...all-color-swatches-dark-high-contrast-display-purple-bgColor-emphasis-linux.png b/...all-color-swatches-dark-high-contrast-display-purple-bgColor-emphasis-linux.png
diff --git a/...ok-all-color-swatches-dark-high-contrast-display-red-bgColor-emphasis-linux.png b/...ok-all-color-swatches-dark-high-contrast-display-red-bgColor-emphasis-linux.png
diff --git a/...hots/storybook-all-color-swatches-dark-high-contrast-fgColor-disabled-linux.png b/...hots/storybook-all-color-swatches-dark-high-contrast-fgColor-disabled-linux.png
diff --git a/...ts/storybook-all-color-swatches-dark-high-contrast-fgColor-onEmphasis-linux.png b/...ts/storybook-all-color-swatches-dark-high-contrast-fgColor-onEmphasis-linux.png
diff --git a/blob-report/report.zip b/blob-report/report.zip
diff --git a/contributor-docs/adrs/adr-002-fgColor-onEmphasis.md b/contributor-docs/adrs/adr-002-fgColor-onEmphasis.md
@@ -2,10 +2,10 @@
 
 ## Status
 
-| Stage    | Status        |
-| -------- | ------------- |
-| Approved | ✅<!-- ✅ --> |
-| Adopted  | 🚧<!-- 🚧 --> |
+| Stage    | Status |
+| -------- | ------ |
+| Approved | ✅     |
+| Adopted  | ✅     |
 
 ## Context
 

diff --git a/...butor-docs/adrs/adr-002-neutral-scales.md → ...butor-docs/adrs/adr-003-neutral-scales.md b/...butor-docs/adrs/adr-002-neutral-scales.md → ...butor-docs/adrs/adr-003-neutral-scales.md
@@ -2,10 +2,10 @@
 
 ## Status
 
-| Stage    | Status      |
-| -------- | ----------- |
-| Approved | <!-- ✅ --> |
-| Adopted  | <!-- 🚧 --> |
+| Stage    | Status |
+| -------- | ------ |
+| Approved | ✅     |
+| Adopted  | ✅     |
 
 ## Decision
 

diff --git a/src/tokens/functional/color/dark/overrides/dark.dimmed.json5 b/src/tokens/functional/color/dark/overrides/dark.dimmed.json5
@@ -30,13 +30,18 @@
   },
   fgColor: {
     default: {
-      $value: '{base.color.neutral.9}',
+      $value: '{base.color.neutral.10}',
       $type: 'color',
     },
     onEmphasis: {
       $value: '{base.color.neutral.11}',
       $type: 'color',
     },
+    disabled: {
+      $value: '{base.color.neutral.7}',
+      $type: 'color',
+      alpha: 1,
+    },
   },
   control: {
     bgColor: {
@@ -95,6 +100,22 @@
       },
     },
   },
+  controlKnob: {
+    bgColor: {
+      rest: {
+        $value: '{bgColor.inset}',
+        $type: 'color',
+        $extensions: {
+          'org.primer.figma': {
+            collection: 'mode',
+            mode: 'dark',
+            group: 'component (internal)',
+            scopes: ['bgColor'],
+          },
+        },
+      },
+    },
+  },
   diffBlob: {
     expander: {
       iconColor: {