Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
hyuna committed Sep 25, 2024
2 parents 4e3a452 + 7f60a0b commit f9c1bc8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,4 @@ RUN yarn build

EXPOSE 3000

CMD ["yarn", "dev"]

CMD ["yarn", "dev"]
4 changes: 2 additions & 2 deletions src/components/button/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ const Button: React.FC<ButtonProp> = ({
}) => {
const getColorClass = () => {
switch (colorType) {
case "primary" || "secondary":
case "primary":
case "secondary":
return ` rounded-lg bg-primary-200 text-primary-1000 focus:bg-primary-500 focus:border focus:border-primary-800 active:bg-${colorType}-800`;

case "tertiary":
Expand All @@ -47,7 +48,6 @@ const Button: React.FC<ButtonProp> = ({

case "ghostDisabled":
return " rounded-lg border border-neutral-500 text-neutral-500 bg-neutral-1000";

case "red":
return " rounded-lg text-error-1000 bg-error-200 focus:bg-error-400 focus:border focus:border-error-800 active:bg-error-700";
}
Expand Down

0 comments on commit f9c1bc8

Please sign in to comment.