Skip to content

Commit

Permalink
feat: Fix minor changes in header (#165)
Browse files Browse the repository at this point in the history
  • Loading branch information
juntaepark authored and jinoosss committed Aug 14, 2023
1 parent 5c858b0 commit 4883f2a
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 4 deletions.
7 changes: 6 additions & 1 deletion packages/web/src/components/common/button/Button.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export interface ButtonStyleProps {
textColor?: ThemeColorKeyTypes;
bgColor?: ThemeColorKeyTypes;
fullWidth?: boolean;
gap?: CSSProperties["gap"];
width?: CSSProperties["width"];
height?: CSSProperties["height"];
radius?: CSSProperties["borderRadius"];
Expand All @@ -20,6 +21,10 @@ export interface ButtonStyleProps {

export const ButtonWrapper = styled.button<ButtonStyleProps>`
${({ justify }) => mixins.flexbox("row", "center", justify ?? "center")};
gap: ${({ gap }) => {
if (gap) return typeof gap === "number" ? gap + "px" : gap;
return "";
}};
width: ${({ width, fullWidth }) => {
if (width) return typeof width === "number" ? width + "px" : width;
if (fullWidth) return "100%";
Expand Down Expand Up @@ -65,7 +70,7 @@ export const ButtonWrapper = styled.button<ButtonStyleProps>`
& .arrow-icon path {
fill: ${({ theme, textColor, hierarchy }) => {
if (hierarchy === ButtonHierarchy.Primary) return theme.color.text09;
return theme.color[textColor ?? "text12"];
return theme.color[textColor ?? "text18"];
}};
}
`;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,8 @@ import styled from "@emotion/styled";

export const WalletConnectorButtonWrapper = styled.div`
position: relative;
.arrow-icon {
width: 16px;
height: 16px;
}
`;
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,11 @@ const WalletConnectorButton = ({ isConnected }: { isConnected: boolean }) => {
style={{
hierarchy: ButtonHierarchy.Dark,
fontType: "p1",
width: 165,
height: 36,
textColor: "text19",
// width: 165,
// height: 36,
padding: "10px 16px",
justify: "space-between",
gap: "8px",
}}
onClick={onMenuToggle}
/>
Expand Down
4 changes: 4 additions & 0 deletions packages/web/src/constants/theme.constant.ts
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,8 @@ export const DARK_THEME_COLORS: ThemeColorType = {
text15: colors.global.brand100,
text16: colors.dark.gray200Text3,
text17: colors.dark.gray400Text5,
text18: colors.dark.whiteText1,
text19: colors.dark.gray100Text2,
icon01: colors.dark.gray100Icon2,
icon02: colors.dark.gray200Icon3,
icon03: colors.dark.gray400Icon5,
Expand Down Expand Up @@ -224,6 +226,8 @@ export const LIGHT_THEME_COLORS: ThemeColorType = {
text15: colors.white.gray100Text1,
text16: colors.white.gray500Text3,
text17: colors.white.gray200Text1,
text18: colors.white.gray300Text1,
text19: colors.white.gray400Text2,
icon01: colors.white.gray300Icon1,
icon02: colors.white.gray300Icon1,
icon03: colors.white.gray300Icon1,
Expand Down
2 changes: 2 additions & 0 deletions packages/web/src/styles/ThemeTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ export interface ThemeColorType {
text15: string;
text16: string;
text17: string;
text18: string;
text19: string;
icon01: string;
icon02: string;
icon03: string;
Expand Down

0 comments on commit 4883f2a

Please sign in to comment.