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

fix: btn color theme #69

Merged
merged 1 commit into from
Oct 27, 2024
Merged

fix: btn color theme #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/components/displayHistoryButton/styles.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ export const Button = styled.button<{ state: boolean }>`
state
? theme.displayHistoryButton.iconActive
: theme.displayHistoryButton.icon};
${({ state }) =>
${({ state, theme }) =>
state &&
css`
box-shadow:
inset 3px 3px 5px #bbbbbb,
inset -3px -3px 5px #ffffff;
inset 3px 3px 5px ${theme.displayHistoryButton.shadow[0]},
inset -3px -3px 5px ${theme.displayHistoryButton.shadow[1]};
`}

&:hover {
Expand Down
1 change: 0 additions & 1 deletion src/components/mainContainer/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ export const MainContainer: FC = () => {
const resize = () => {
const style = window.getComputedStyle(ref);
const width = getPixel(style, "width") - 40;
console.log("onResize", width);
setGridProperties(
calcGridProperties(width, cardWidth, { gapRange: [x, x * 4] }),
);
Expand Down
1 change: 1 addition & 0 deletions src/configs/theme/dark.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,5 +69,6 @@ export const darkTheme: DefaultTheme = {
normal: "transparent",
hover: colors.grey[700],
},
shadow: [colors.grey[900], colors.grey[800]],
},
};
1 change: 1 addition & 0 deletions src/configs/theme/light.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,5 +69,6 @@ export const lightTheme: DefaultTheme = {
normal: "transparent",
hover: colors.grey[200],
},
shadow: [colors.grey[400], colors.grey[100]],
},
};
1 change: 1 addition & 0 deletions types/theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export type DropdownTheme = {

export type DisplayHistoryButtonTheme = ButtonTheme & {
iconActive: string;
shadow: [string, string];
};

declare module "styled-components" {
Expand Down
Loading