Skip to content

design: 로그인 모달 글씨 크기 변경 #163

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

Merged
Yejiin21 merged 3 commits into from
Jun 2, 2025
Merged

design: 로그인 모달 글씨 크기 변경 #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c5ea63f
design: 로그인 모달 CSS 수정
Yejiin21 Jun 2, 2025
ef4979d
feat: 크롬탭 아이콘과 이름 설정
Yejiin21 Jun 2, 2025
9623dc7
refac: 사진 크기 1MB 제한으로 변경
Yejiin21 Jun 2, 2025
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
4 changes: 2 additions & 2 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<link rel="icon" type="image/svg+xml" href="/assets/MainLogo.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Vite + React + TS</title>
<title>같이가요</title>
</head>
<body>
<div id="root"></div>
Expand Down
70 changes: 70 additions & 0 deletions public/assets/MainLogo.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/features/event/ui/FileUpload.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const FileUpload = ({ value, onChange, setEventState, useDefaultImage, onValidat
return (
<div className="flex flex-col justify-start gap-1">
<h1 className="font-bold text-black text-lg">배너 사진 첨부</h1>
<h2 className="text-placeholderText text-xs md:text-sm">500kB 이하의 jpeg, png 파일만 등록할 수 있습니다.</h2>
<h2 className="text-placeholderText text-xs md:text-sm">1MB 이하의 jpeg, png 파일만 등록할 수 있습니다.</h2>
<div
className={`flex flex-col items-center justify-center h-44 border border-dashed ${
isDragging ? 'border-main bg-dropdown' : 'border-placeholderText bg-gray3'
Expand Down
4 changes: 2 additions & 2 deletions src/shared/hooks/useImageUpload.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ const useImageUpload = ({
}, [value, onSuccess, useDefaultImage, previewUrl]);

const validateFile = (file: File) => {
if (file.size > 500 * 1024) {
alert('파일 크기는 500KB를 초과할 수 없습니다.');
if (file.size > 1000 * 1024) {
alert('파일 크기는 1MB를 초과할 수 없습니다.');
return false;
}
if (!['image/jpg', 'image/jpeg', 'image/png'].includes(file.type)) {
Expand Down
16 changes: 8 additions & 8 deletions src/widgets/main/ui/LoginModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,23 @@ const LoginModal = ({ onClose }: LoginModalProps) => {
<div className="flex flex-col justify-center gap-16 w-full max-w-lg h-[85%] bg-gradient-to-br from-[#FF5593] to-[#FF7577] rounded-b-[40px] px-10 py-8 shadow-lg">
<div className="flex flex-col font-bold text-white">
<div className="flex items-end gap-2">
<p className="text-26">같이가자,</p>
<p className="text-22">더 많은 사람들과 함께해요.</p>
<p className="text-21 md:text-26">같이가자,</p>
<p className="text-18 md:text-21">더 많은 사람들과 함께해요.</p>
</div>
<p className="text-22">언제 어디서든 자유롭게 이벤트를 만들어보세요.👋🏻</p>
<p className="text-18 md:text-21">언제 어디서든 자유롭게 이벤트를 만들어보세요.👋🏻</p>
</div>
<div className="flex flex-col w-full gap-6 px-3">
<div className="flex items-center w-full h-12 bg-[#FEE500] gap-4 rounded-full">
<div className="flex flex-col w-full gap-4 md:gap-6 px-3">
<div className="flex items-center w-full h-10 md:h-12 bg-[#FEE500] gap-4 rounded-full">
<HorizontalCardButton
iconPath={<img src={kakao} alt="카카오 아이콘" className="" />}
iconPath={<img src={kakao} alt="카카오 아이콘" />}
label="카카오 로그인"
onClick={kakaoLogin}
className="mx-auto my-auto"
/>
</div>
<div className="flex items-center w-full h-12 bg-white gap-4 rounded-full">
<div className="flex items-center w-full h-10 md:h-12 bg-white gap-4 rounded-full">
<HorizontalCardButton
iconPath={<img src={google} alt="구글 아이콘" className="" />}
iconPath={<img src={google} alt="구글 아이콘" />}
label="Google 로그인"
onClick={gooleLogin}
className="mx-auto my-auto"
Expand Down
5 changes: 5 additions & 0 deletions tailwind.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,12 @@ export default {
14: '14px',
15: '15px',
16: '16px',
19: '19px',
20: '20px',
21: '21px',
22: '22px',
23: '23px',
24: '24px',
26: '26px',
},
colors: {
Expand Down
⚡