Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Control color bug fixes #743

Merged
merged 3 commits into from
Sep 28, 2023
Merged

Control color bug fixes #743

merged 3 commits into from
Sep 28, 2023

Conversation

langermank
Copy link
Contributor

  • disabled state for transparent type controls is now transparent
  • Reverted the selected color for transparent type controls back to the original (pulled from old source file)
  • Fixed the disabled fgColor for ToggleSwitch

@langermank langermank requested a review from a team as a code owner September 27, 2023 22:51
@changeset-bot
Copy link

changeset-bot bot commented Sep 27, 2023 •
edited
Loading

🦋 Changeset detected

Latest commit: e27e5fa

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
Name Type
@primer/primitives Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@github-actions
Copy link
Contributor

github-actions bot commented Sep 27, 2023 •
edited
Loading

Variables changed 
No variables changed

@langermank langermank added the update snapshots Update visual regression test snapshots label Sep 27, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Sep 27, 2023 •
edited
Loading

Design Token Diff

/css/functional/themes/dark-colorblind.css

 
+++ /home/runner/work/primitives/primitives/tokens-next-private/css/functional/themes/dark-colorblind.css	2023-09-28 14:19:22.509463747 +0000
@@ -88,7 +88,7 @@
 --controlTrack-bgColor-active: #31363e;
 --controlTrack-bgColor-disabled: #8b949e;
 --controlTrack-fgColor-rest: #7d8590;
-  --controlTrack-fgColor-disabled: #7d8590;
+  --controlTrack-fgColor-disabled: #ffffff;
 --controlTrack-borderColor-rest: #00000000;
 --controlTrack-borderColor-disabled: #8b949e;
 --controlKnob-bgColor-rest: #010409;
@@ -130,7 +130,7 @@
 --button-invisible-bgColor-rest: #00000000;
 --button-invisible-bgColor-hover: #b1bac41f;
 --button-invisible-bgColor-active: #b1bac433;
-  --button-invisible-bgColor-disabled: #161b22;
+  --button-invisible-bgColor-disabled: #00000000;
 --button-invisible-borderColor-rest: #00000000;
 --button-invisible-borderColor-hover: #00000000;
 --button-invisible-borderColor-disabled: #161b22;
@@ -505,7 +505,7 @@
   --controlTrack-bgColor-active: #31363e;
   --controlTrack-bgColor-disabled: #8b949e;
   --controlTrack-fgColor-rest: #7d8590;
-    --controlTrack-fgColor-disabled: #7d8590;
+    --controlTrack-fgColor-disabled: #ffffff;
   --controlTrack-borderColor-rest: #00000000;
   --controlTrack-borderColor-disabled: #8b949e;
   --controlKnob-bgColor-rest: #010409;
@@ -547,7 +547,7 @@
   --button-invisible-bgColor-rest: #00000000;
   --button-invisible-bgColor-hover: #b1bac41f;
   --button-invisible-bgColor-active: #b1bac433;
-    --button-invisible-bgColor-disabled: #161b22;
+    --button-invisible-bgColor-disabled: #00000000;
   --button-invisible-borderColor-rest: #00000000;
   --button-invisible-borderColor-hover: #00000000;
   --button-invisible-borderColor-disabled: #161b22;

/css/functional/themes/dark-dimmed.css

 
+++ /home/runner/work/primitives/primitives/tokens-next-private/css/functional/themes/dark-dimmed.css	2023-09-28 14:19:21.617447200 +0000
@@ -88,7 +88,7 @@
 --controlTrack-bgColor-active: #434a54;
 --controlTrack-bgColor-disabled: #768390;
 --controlTrack-fgColor-rest: #6d7986;
-  --controlTrack-fgColor-disabled: #6d7986;
+  --controlTrack-fgColor-disabled: #cdd9e5;
 --controlTrack-borderColor-rest: #00000000;
 --controlTrack-borderColor-disabled: #768390;
 --controlKnob-bgColor-rest: #1c2128;
@@ -130,7 +130,7 @@
 --button-invisible-bgColor-rest: #00000000;
 --button-invisible-bgColor-hover: #909dab1f;
 --button-invisible-bgColor-active: #909dab33;
-  --button-invisible-bgColor-disabled: #2d333b;
+  --button-invisible-bgColor-disabled: #00000000;
 --button-invisible-borderColor-rest: #00000000;
 --button-invisible-borderColor-hover: #00000000;
 --button-invisible-borderColor-disabled: #2d333b;
@@ -505,7 +505,7 @@
   --controlTrack-bgColor-active: #434a54;
   --controlTrack-bgColor-disabled: #768390;
   --controlTrack-fgColor-rest: #6d7986;
-    --controlTrack-fgColor-disabled: #6d7986;
+    --controlTrack-fgColor-disabled: #cdd9e5;
   --controlTrack-borderColor-rest: #00000000;
   --controlTrack-borderColor-disabled: #768390;
   --controlKnob-bgColor-rest: #1c2128;
@@ -547,7 +547,7 @@
   --button-invisible-bgColor-rest: #00000000;
   --button-invisible-bgColor-hover: #909dab1f;
   --button-invisible-bgColor-active: #909dab33;
-    --button-invisible-bgColor-disabled: #2d333b;
+    --button-invisible-bgColor-disabled: #00000000;
   --button-invisible-borderColor-rest: #00000000;
   --button-invisible-borderColor-hover: #00000000;
   --button-invisible-borderColor-disabled: #2d333b;

/css/functional/themes/dark-high-contrast.css

 
+++ /home/runner/work/primitives/primitives/tokens-next-private/css/functional/themes/dark-high-contrast.css	2023-09-28 14:19:22.957472058 +0000
@@ -88,7 +88,7 @@
 --controlTrack-bgColor-active: #484e57;
 --controlTrack-bgColor-disabled: #bdc4cc;
 --controlTrack-fgColor-rest: #0a0c10;
-  --controlTrack-fgColor-disabled: #f0f3f6;
+  --controlTrack-fgColor-disabled: #0a0c10;
 --controlTrack-borderColor-rest: #00000000;
 --controlTrack-borderColor-disabled: #bdc4cc;
 --controlKnob-bgColor-rest: #010409;
@@ -130,7 +130,7 @@
 --button-invisible-bgColor-rest: #00000000;
 --button-invisible-bgColor-hover: #f0f3f6;
 --button-invisible-bgColor-active: #d9dee3;
-  --button-invisible-bgColor-disabled: #272b33;
+  --button-invisible-bgColor-disabled: #00000000;
 --button-invisible-borderColor-rest: #00000000;
 --button-invisible-borderColor-hover: #7a828e;
 --button-invisible-borderColor-disabled: #272b33;
@@ -505,7 +505,7 @@
   --controlTrack-bgColor-active: #484e57;
   --controlTrack-bgColor-disabled: #bdc4cc;
   --controlTrack-fgColor-rest: #0a0c10;
-    --controlTrack-fgColor-disabled: #f0f3f6;
+    --controlTrack-fgColor-disabled: #0a0c10;
   --controlTrack-borderColor-rest: #00000000;
   --controlTrack-borderColor-disabled: #bdc4cc;
   --controlKnob-bgColor-rest: #010409;
@@ -547,7 +547,7 @@
   --button-invisible-bgColor-rest: #00000000;
   --button-invisible-bgColor-hover: #f0f3f6;
   --button-invisible-bgColor-active: #d9dee3;
-    --button-invisible-bgColor-disabled: #272b33;
+    --button-invisible-bgColor-disabled: #00000000;
   --button-invisible-borderColor-rest: #00000000;
   --button-invisible-borderColor-hover: #7a828e;
   --button-invisible-borderColor-disabled: #272b33;

/css/functional/themes/dark-tritanopia.css

 
+++ /home/runner/work/primitives/primitives/tokens-next-private/css/functional/themes/dark-tritanopia.css	2023-09-28 14:19:22.069455585 +0000
@@ -88,7 +88,7 @@
 --controlTrack-bgColor-active: #31363e;
 --controlTrack-bgColor-disabled: #8b949e;
 --controlTrack-fgColor-rest: #7d8590;
-  --controlTrack-fgColor-disabled: #7d8590;
+  --controlTrack-fgColor-disabled: #ffffff;
 --controlTrack-borderColor-rest: #00000000;
 --controlTrack-borderColor-disabled: #8b949e;
 --controlKnob-bgColor-rest: #010409;
@@ -130,7 +130,7 @@
 --button-invisible-bgColor-rest: #00000000;
 --button-invisible-bgColor-hover: #b1bac41f;
 --button-invisible-bgColor-active: #b1bac433;
-  --button-invisible-bgColor-disabled: #161b22;
+  --button-invisible-bgColor-disabled: #00000000;
 --button-invisible-borderColor-rest: #00000000;
 --button-invisible-borderColor-hover: #00000000;
 --button-invisible-borderColor-disabled: #161b22;
@@ -505,7 +505,7 @@
   --controlTrack-bgColor-active: #31363e;
   --controlTrack-bgColor-disabled: #8b949e;
   --controlTrack-fgColor-rest: #7d8590;
-    --controlTrack-fgColor-disabled: #7d8590;
+    --controlTrack-fgColor-disabled: #ffffff;
   --controlTrack-borderColor-rest: #00000000;
   --controlTrack-borderColor-disabled: #8b949e;
   --controlKnob-bgColor-rest: #010409;
@@ -547,7 +547,7 @@
   --button-invisible-bgColor-rest: #00000000;
   --button-invisible-bgColor-hover: #b1bac41f;
   --button-invisible-bgColor-active: #b1bac433;
-    --button-invisible-bgColor-disabled: #161b22;
+    --button-invisible-bgColor-disabled: #00000000;
   --button-invisible-borderColor-rest: #00000000;
   --button-invisible-borderColor-hover: #00000000;
   --button-invisible-borderColor-disabled: #161b22;

/css/functional/themes/dark.css

 
+++ /home/runner/work/primitives/primitives/tokens-next-private/css/functional/themes/dark.css	2023-09-28 14:19:20.905433992 +0000
@@ -88,7 +88,7 @@
 --controlTrack-bgColor-active: #31363e;
 --controlTrack-bgColor-disabled: #8b949e;
 --controlTrack-fgColor-rest: #7d8590;
-  --controlTrack-fgColor-disabled: #7d8590;
+  --controlTrack-fgColor-disabled: #ffffff;
 --controlTrack-borderColor-rest: #00000000;
 --controlTrack-borderColor-disabled: #8b949e;
 --controlKnob-bgColor-rest: #010409;
@@ -130,7 +130,7 @@
 --button-invisible-bgColor-rest: #00000000;
 --button-invisible-bgColor-hover: #b1bac41f;
 --button-invisible-bgColor-active: #b1bac433;
-  --button-invisible-bgColor-disabled: #161b22;
+  --button-invisible-bgColor-disabled: #00000000;
 --button-invisible-borderColor-rest: #00000000;
 --button-invisible-borderColor-hover: #00000000;
 --button-invisible-borderColor-disabled: #161b22;
@@ -505,7 +505,7 @@
   --controlTrack-bgColor-active: #31363e;
   --controlTrack-bgColor-disabled: #8b949e;
   --controlTrack-fgColor-rest: #7d8590;
-    --controlTrack-fgColor-disabled: #7d8590;
+    --controlTrack-fgColor-disabled: #ffffff;
   --controlTrack-borderColor-rest: #00000000;
   --controlTrack-borderColor-disabled: #8b949e;
   --controlKnob-bgColor-rest: #010409;
@@ -547,7 +547,7 @@
   --button-invisible-bgColor-rest: #00000000;
   --button-invisible-bgColor-hover: #b1bac41f;
   --button-invisible-bgColor-active: #b1bac433;
-    --button-invisible-bgColor-disabled: #161b22;
+    --button-invisible-bgColor-disabled: #00000000;
   --button-invisible-borderColor-rest: #00000000;
   --button-invisible-borderColor-hover: #00000000;
   --button-invisible-borderColor-disabled: #161b22;

/css/functional/themes/light-colorblind.css

 
+++ /home/runner/work/primitives/primitives/tokens-next-private/css/functional/themes/light-colorblind.css	2023-09-28 14:19:19.933415960 +0000
@@ -64,8 +64,8 @@
 --control-transparent-bgColor-rest: #ffffff00;
 --control-transparent-bgColor-hover: #d0d7de33;
 --control-transparent-bgColor-active: #d0d7de66;
-  --control-transparent-bgColor-disabled: #f6f8fa;
-  --control-transparent-bgColor-selected: #f6f8fa;
+  --control-transparent-bgColor-disabled: #ffffff00;
+  --control-transparent-bgColor-selected: #d0d7de33;
 --control-transparent-borderColor-rest: #ffffff00;
 --control-transparent-borderColor-hover: #ffffff00;
 --control-transparent-borderColor-active: #ffffff00;
@@ -130,7 +130,7 @@
 --button-invisible-bgColor-rest: #ffffff00;
 --button-invisible-bgColor-hover: #d0d7de33;
 --button-invisible-bgColor-active: #d0d7de66;
-  --button-invisible-bgColor-disabled: #f6f8fa;
+  --button-invisible-bgColor-disabled: #ffffff00;
 --button-invisible-borderColor-rest: #ffffff00;
 --button-invisible-borderColor-hover: #ffffff00;
 --button-invisible-borderColor-disabled: #f6f8fa;
@@ -481,8 +481,8 @@
   --control-transparent-bgColor-rest: #ffffff00;
   --control-transparent-bgColor-hover: #d0d7de33;
   --control-transparent-bgColor-active: #d0d7de66;
-    --control-transparent-bgColor-disabled: #f6f8fa;
-    --control-transparent-bgColor-selected: #f6f8fa;
+    --control-transparent-bgColor-disabled: #ffffff00;
+    --control-transparent-bgColor-selected: #d0d7de33;
   --control-transparent-borderColor-rest: #ffffff00;
   --control-transparent-borderColor-hover: #ffffff00;
   --control-transparent-borderColor-active: #ffffff00;
@@ -547,7 +547,7 @@
   --button-invisible-bgColor-rest: #ffffff00;
   --button-invisible-bgColor-hover: #d0d7de33;
   --button-invisible-bgColor-active: #d0d7de66;
-    --button-invisible-bgColor-disabled: #f6f8fa;
+    --button-invisible-bgColor-disabled: #ffffff00;
   --button-invisible-borderColor-rest: #ffffff00;
   --button-invisible-borderColor-hover: #ffffff00;
   --button-invisible-borderColor-disabled: #f6f8fa;

/css/functional/themes/light-high-contrast.css

 
+++ /home/runner/work/primitives/primitives/tokens-next-private/css/functional/themes/light-high-contrast.css	2023-09-28 14:19:20.445425458 +0000
@@ -64,8 +64,8 @@
 --control-transparent-bgColor-rest: #ffffff00;
 --control-transparent-bgColor-hover: #e7ecf0;
 --control-transparent-bgColor-active: #ced5dc;
-  --control-transparent-bgColor-disabled: #e7ecf0;
-  --control-transparent-bgColor-selected: #ced5dc;
+  --control-transparent-bgColor-disabled: #ffffff00;
+  --control-transparent-bgColor-selected: #ced5dc33;
 --control-transparent-borderColor-rest: #ffffff00;
 --control-transparent-borderColor-hover: #20252c;
 --control-transparent-borderColor-active: #ffffff00;
@@ -130,7 +130,7 @@
 --button-invisible-bgColor-rest: #ffffff00;
 --button-invisible-bgColor-hover: #20252c;
 --button-invisible-bgColor-active: #4b535d;
-  --button-invisible-bgColor-disabled: #e7ecf0;
+  --button-invisible-bgColor-disabled: #ffffff00;
 --button-invisible-borderColor-rest: #ffffff00;
 --button-invisible-borderColor-hover: #20252c;
 --button-invisible-borderColor-disabled: #e7ecf0;
@@ -481,8 +481,8 @@
   --control-transparent-bgColor-rest: #ffffff00;
   --control-transparent-bgColor-hover: #e7ecf0;
   --control-transparent-bgColor-active: #ced5dc;
-    --control-transparent-bgColor-disabled: #e7ecf0;
-    --control-transparent-bgColor-selected: #ced5dc;
+    --control-transparent-bgColor-disabled: #ffffff00;
+    --control-transparent-bgColor-selected: #ced5dc33;
   --control-transparent-borderColor-rest: #ffffff00;
   --control-transparent-borderColor-hover: #20252c;
   --control-transparent-borderColor-active: #ffffff00;
@@ -547,7 +547,7 @@
   --button-invisible-bgColor-rest: #ffffff00;
   --button-invisible-bgColor-hover: #20252c;
   --button-invisible-bgColor-active: #4b535d;
-    --button-invisible-bgColor-disabled: #e7ecf0;
+    --button-invisible-bgColor-disabled: #ffffff00;
   --button-invisible-borderColor-rest: #ffffff00;
   --button-invisible-borderColor-hover: #20252c;
   --button-invisible-borderColor-disabled: #e7ecf0;

/css/functional/themes/light-tritanopia.css

 
+++ /home/runner/work/primitives/primitives/tokens-next-private/css/functional/themes/light-tritanopia.css	2023-09-28 14:19:19.357405275 +0000
@@ -64,8 +64,8 @@
 --control-transparent-bgColor-rest: #ffffff00;
 --control-transparent-bgColor-hover: #d0d7de33;
 --control-transparent-bgColor-active: #d0d7de66;
-  --control-transparent-bgColor-disabled: #f6f8fa;
-  --control-transparent-bgColor-selected: #f6f8fa;
+  --control-transparent-bgColor-disabled: #ffffff00;
+  --control-transparent-bgColor-selected: #d0d7de33;
 --control-transparent-borderColor-rest: #ffffff00;
 --control-transparent-borderColor-hover: #ffffff00;
 --control-transparent-borderColor-active: #ffffff00;
@@ -130,7 +130,7 @@
 --button-invisible-bgColor-rest: #ffffff00;
 --button-invisible-bgColor-hover: #d0d7de33;
 --button-invisible-bgColor-active: #d0d7de66;
-  --button-invisible-bgColor-disabled: #f6f8fa;
+  --button-invisible-bgColor-disabled: #ffffff00;
 --button-invisible-borderColor-rest: #ffffff00;
 --button-invisible-borderColor-hover: #ffffff00;
 --button-invisible-borderColor-disabled: #f6f8fa;
@@ -481,8 +481,8 @@
   --control-transparent-bgColor-rest: #ffffff00;
   --control-transparent-bgColor-hover: #d0d7de33;
   --control-transparent-bgColor-active: #d0d7de66;
-    --control-transparent-bgColor-disabled: #f6f8fa;
-    --control-transparent-bgColor-selected: #f6f8fa;
+    --control-transparent-bgColor-disabled: #ffffff00;
+    --control-transparent-bgColor-selected: #d0d7de33;
   --control-transparent-borderColor-rest: #ffffff00;
   --control-transparent-borderColor-hover: #ffffff00;
   --control-transparent-borderColor-active: #ffffff00;
@@ -547,7 +547,7 @@
   --button-invisible-bgColor-rest: #ffffff00;
   --button-invisible-bgColor-hover: #d0d7de33;
   --button-invisible-bgColor-active: #d0d7de66;
-    --button-invisible-bgColor-disabled: #f6f8fa;
+    --button-invisible-bgColor-disabled: #ffffff00;
   --button-invisible-borderColor-rest: #ffffff00;
   --button-invisible-borderColor-hover: #ffffff00;
   --button-invisible-borderColor-disabled: #f6f8fa;

/css/functional/themes/light.css

 
+++ /home/runner/work/primitives/primitives/tokens-next-private/css/functional/themes/light.css	2023-09-28 14:19:18.729393625 +0000
@@ -64,8 +64,8 @@
 --control-transparent-bgColor-rest: #ffffff00;
 --control-transparent-bgColor-hover: #d0d7de33;
 --control-transparent-bgColor-active: #d0d7de66;
-  --control-transparent-bgColor-disabled: #f6f8fa;
-  --control-transparent-bgColor-selected: #f6f8fa;
+  --control-transparent-bgColor-disabled: #ffffff00;
+  --control-transparent-bgColor-selected: #d0d7de33;
 --control-transparent-borderColor-rest: #ffffff00;
 --control-transparent-borderColor-hover: #ffffff00;
 --control-transparent-borderColor-active: #ffffff00;
@@ -130,7 +130,7 @@
 --button-invisible-bgColor-rest: #ffffff00;
 --button-invisible-bgColor-hover: #d0d7de33;
 --button-invisible-bgColor-active: #d0d7de66;
-  --button-invisible-bgColor-disabled: #f6f8fa;
+  --button-invisible-bgColor-disabled: #ffffff00;
 --button-invisible-borderColor-rest: #ffffff00;
 --button-invisible-borderColor-hover: #ffffff00;
 --button-invisible-borderColor-disabled: #f6f8fa;
@@ -481,8 +481,8 @@
   --control-transparent-bgColor-rest: #ffffff00;
   --control-transparent-bgColor-hover: #d0d7de33;
   --control-transparent-bgColor-active: #d0d7de66;
-    --control-transparent-bgColor-disabled: #f6f8fa;
-    --control-transparent-bgColor-selected: #f6f8fa;
+    --control-transparent-bgColor-disabled: #ffffff00;
+    --control-transparent-bgColor-selected: #d0d7de33;
   --control-transparent-borderColor-rest: #ffffff00;
   --control-transparent-borderColor-hover: #ffffff00;
   --control-transparent-borderColor-active: #ffffff00;
@@ -547,7 +547,7 @@
   --button-invisible-bgColor-rest: #ffffff00;
   --button-invisible-bgColor-hover: #d0d7de33;
   --button-invisible-bgColor-active: #d0d7de66;
-    --button-invisible-bgColor-disabled: #f6f8fa;
+    --button-invisible-bgColor-disabled: #ffffff00;
   --button-invisible-borderColor-rest: #ffffff00;
   --button-invisible-borderColor-hover: #ffffff00;
   --button-invisible-borderColor-disabled: #f6f8fa;

@langermank langermank temporarily deployed to github-pages September 27, 2023 22:54 — with GitHub Actions Inactive
@github-actions github-actions bot temporarily deployed to storybook-preview September 27, 2023 22:54 Inactive
@github-actions github-actions bot removed the update snapshots Update visual regression test snapshots label Sep 27, 2023
@github-actions github-actions bot temporarily deployed to storybook-preview September 28, 2023 14:21 Inactive
@langermank langermank merged commit 5125c62 into main Sep 28, 2023
@langermank langermank deleted the control-color-fixes branch September 28, 2023 14:25
@primer primer bot mentioned this pull request Sep 28, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lukasoppermann lukasoppermann lukasoppermann approved these changes

@broccolinisoup broccolinisoup Awaiting requested review from broccolinisoup

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@langermank @lukasoppermann