Skip to content

Commit

Permalink
Merge pull request #15 from JECT-Study/feature/design-system
Browse files Browse the repository at this point in the history
[TASK-49] style: Footer UI 깨짐 현상 해결, FollowButton 색상 변경
  • Loading branch information
dahyeo-n authored Dec 26, 2024
2 parents f5fbfff + 25cc4e0 commit b999cec
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 7 deletions.
6 changes: 3 additions & 3 deletions src/components/Button/FollowButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ const FollowButton = ({
onClick={toggleFollow}
aria-label={ariaLabel}
className={`
flex items-center justify-center rounded-full
button-s flex items-center justify-center rounded-full
w-[95px] h-[37px] gap-[3px]
${backgroundColor} ${textColor} ${textSize}
${
isFollowing
? 'border border-gray-900 text-gray-900 bg-white'
: 'bg-gray-900 text-white'
? 'border border-gray-300 text-gray-300 bg-transparent'
: 'bg-gray-800 text-white'
}
hover:bg-opacity-80 active:bg-opacity-60 active:scale-95
transition-all duration-300 ease-in-out
Expand Down
1 change: 1 addition & 0 deletions src/components/Input/EmailInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { useEffect, useState } from 'react';
import { useFormContext } from 'react-hook-form';

import useGetValidateEmail from '@/apis/auth/validateEmail';

import Icon from '../Icon/Icon';

const EMAIL_REGEX = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Layout/AppShell.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const AppShell = ({ children }: { children: ReactNode }) => {
dark: 'custom-dark',
}}
>
<div className='h-screen box-border'>
<div className='box-border'>
<Navbar />
<main className='pt-[60px] min-h-screen h-full'>{children}</main>
<Footer />
Expand Down
4 changes: 2 additions & 2 deletions src/styles/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
}

body {
width: 100vw;
height: 100vh;
width: 100%;
height: 100%;
}

.title-l {
Expand Down
2 changes: 1 addition & 1 deletion src/types/artwork.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ interface ArtworkInfoType {
postImage: string;
userId: number;
nickname: string;
view: number;
viewCount: number;
likeCount: number;
commentCount: number;
isLiked: boolean;
Expand Down

0 comments on commit b999cec

Please sign in to comment.