Skip to content

UI: Fix custom theme hover-color inconsistency #22262

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

Merged
ndelangen merged 5 commits into from
Sep 19, 2023
Merged

UI: Fix custom theme hover-color inconsistency #22262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d45f0bd
fix: use secondary-based color as background when BranchNode is hover…
yoshi2no Apr 26, 2023
9093fbb
fix: use secondary-based color as background when LeafNode is hovered…
yoshi2no Apr 26, 2023
0e4106b
Merge branch 'next' into fix/hover-color-inconsistency
yoshi2no Sep 16, 2023
7f98bff
fix: #22199 modify LeafNodeStyleWrapper hover and focus background
yoshi2no Sep 16, 2023
b3983c3
Merge branch 'next' into fix/hover-color-inconsistency
cdedreuille Sep 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/ui/manager/src/components/sidebar/Tree.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion code/ui/manager/src/components/sidebar/TreeNode.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
}));
Expand Down
2 changes: 1 addition & 1 deletion scripts/release/pick-patches.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand Down
2 changes: 1 addition & 1 deletion scripts/task.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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;

Expand Down