Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 packages/loaders/src/elements/Progress.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ describe('Progress', () => {
describe('without a color set', () => {
it.each<['light' | 'dark', string, string]>([
['light', rgba(PALETTE.grey[700], DEFAULT_THEME.opacity[200]), PALETTE.green[700]],
['dark', rgba(PALETTE.grey[500], DEFAULT_THEME.opacity[200]), PALETTE.green[600]]
['dark', rgba(PALETTE.white, DEFAULT_THEME.opacity[200]), PALETTE.green[600]]
])('applies the default colors in "%s mode', (mode, bgColor, fgColor) => {
const { container } = getRenderFn(mode)(<Progress value={42} />);

Expand Down
2 changes: 1 addition & 1 deletion packages/loaders/src/elements/Skeleton.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ describe('Skeleton', () => {

it.each<Args>([
['light', rgba(PALETTE.grey[700], DEFAULT_THEME.opacity[200])],
['dark', rgba(PALETTE.grey[500], DEFAULT_THEME.opacity[200])]
['dark', rgba(PALETTE.white, DEFAULT_THEME.opacity[200])]
])('renders a Skeleton in "%s" mode', (mode, color) => {
const { container } = getRenderFn(mode)(<Skeleton />);

Expand Down
5 changes: 2 additions & 3 deletions packages/loaders/src/styled/StyledProgress.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,9 @@ const colorStyles = ({
}: IStyledProgressBackgroundProps & ThemeProps<DefaultTheme>) => {
const backgroundColor = getColor({
theme,
hue: 'neutralHue',
transparency: theme.opacity[200],
light: { shade: 700 },
dark: { shade: 500 }
light: { hue: 'neutralHue', shade: 700 },
dark: { hue: 'white' }
});
let options;

Expand Down
5 changes: 2 additions & 3 deletions packages/loaders/src/styled/StyledSkeleton.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,9 @@ const getBackgroundColor = ({
} else {
backgroundColor = getColor({
theme,
hue: 'neutralHue',
transparency: theme.opacity[200],
light: { shade: 700 },
dark: { shade: 500 }
light: { hue: 'neutralHue', shade: 700 },
dark: { hue: 'white' }
});
}
return backgroundColor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ exports[`DEFAULT_THEME matches snapshot 1`] = `
"danger": "dangerHue.1000",
"dangerEmphasis": "dangerHue.600",
"default": "neutralHue.1100",
"disabled": "rgba(neutralHue.500, 100)",
"disabled": "rgba(white, 100)",
"emphasis": "neutralHue.600",
"primaryEmphasis": "primaryHue.600",
"raised": "neutralHue.1000",
Expand Down
2 changes: 1 addition & 1 deletion packages/theming/src/elements/theme/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ const colors = {
successEmphasis: 'successHue.600',
warningEmphasis: 'warningHue.600',
dangerEmphasis: 'dangerHue.600',
disabled: 'rgba(neutralHue.500, 100)'
disabled: 'rgba(white, 100)'
},
border: {
default: 'neutralHue.800',
Expand Down
2 changes: 1 addition & 1 deletion packages/theming/src/utils/getColor.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ describe('getColor', () => {
variable: 'background.disabled'
});
const transparency = 0.08;
const expected = rgba(PALETTE.grey[mode === 'dark' ? 500 : 700], transparency);
const expected = rgba(mode === 'dark' ? PALETTE.white : PALETTE.grey[700], transparency);

expect(color).toBe(expected);
});
Expand Down