Merge pull request #22262 from yoshi2no/fix/hover-color-inconsistency

UI: Custom theme hover-color inconsistency
storybookjs · Sep 19, 2023 · b2c69ee · b2c69ee
2 parents 08ae741 + b3983c3
commit b2c69ee
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/code/ui/manager/src/components/sidebar/Tree.tsx b/code/ui/manager/src/components/sidebar/Tree.tsx
@@ -132,7 +132,7 @@ export const LeafNodeStyleWrapper = styled.div(({ theme }) => ({
   background: 'transparent',
   '&:hover, &:focus': {
     outline: 'none',
-    background: theme.background.hoverable,
+    background: transparentize(0.93, theme.color.secondary),
   },
   '&[data-selected="true"]': {
     color: theme.color.lightest,

diff --git a/code/ui/manager/src/components/sidebar/TreeNode.tsx b/code/ui/manager/src/components/sidebar/TreeNode.tsx
@@ -72,7 +72,7 @@ const BranchNode = styled.button<{
   fontSize: `${theme.typography.size.s2 - 1}px`,
   background: 'transparent',
   '&:hover, &:focus': {
-    background: theme.background.hoverable,
+    background: transparentize(0.93, theme.color.secondary),
     outline: 'none',
   },
 }));

diff --git a/scripts/release/pick-patches.ts b/scripts/release/pick-patches.ts
@@ -4,9 +4,9 @@ import program from 'commander';
 import chalk from 'chalk';
 import ora from 'ora';
 import { setOutput } from '@actions/core';
+import invariant from 'tiny-invariant';
 import { git } from './utils/git-client';
 import { getUnpickedPRs } from './utils/github-client';
-import invariant from 'tiny-invariant';
 
 program.name('pick-patches').description('Cherry pick patch PRs back to main');
 

diff --git a/scripts/task.ts b/scripts/task.ts
@@ -6,6 +6,7 @@ import { join, resolve } from 'path';
 import { prompt } from 'prompts';
 import { dedent } from 'ts-dedent';
 
+import invariant from 'tiny-invariant';
 import { CODE_DIRECTORY, JUNIT_DIRECTORY, SANDBOX_DIRECTORY } from './utils/constants';
 import type { OptionValues } from './utils/options';
 import { createOptions, getCommand, getOptionsOrPrompt } from './utils/options';
@@ -35,7 +36,6 @@ import {
 } from '../code/lib/cli/src/sandbox-templates';
 
 import { version } from '../code/package.json';
-import invariant from 'tiny-invariant';
 
 const sandboxDir = process.env.SANDBOX_ROOT || SANDBOX_DIRECTORY;