Skip to content

Commit

Permalink
version 1.1.7 변경 및 theme 미적용 파일 수정 (#918)
Browse files Browse the repository at this point in the history
  • Loading branch information
healim01 authored Nov 15, 2024
1 parent 1c8b12a commit 844a8b7
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "code-zap",
"version": "1.1.6",
"version": "1.1.7",
"description": "",
"main": "index.js",
"scripts": {
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/pages/LoginPage/LoginPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { useTrackPageViewed } from '@/service/amplitude';

import { useLoginForm } from './hooks';
import * as S from './LoginPage.style';
import { theme } from '@/style/theme';

const LoginPage = () => {
useTrackPageViewed({ eventName: '[Viewed] 로그인 페이지' });
Expand All @@ -21,7 +22,7 @@ const LoginPage = () => {
<S.LoginPageContainer direction='column' justify='center' align='center' gap='3.5rem' width='27.5rem'>
<Flex direction='column' justify='center' align='center' gap='1rem'>
<ZapzapLogo width={100} height={100} />
<S.ResponsiveHeading color='#F79037'>환영하잽</S.ResponsiveHeading>
<S.ResponsiveHeading color={theme.color.light.primary_800}>환영하잽</S.ResponsiveHeading>
</Flex>

<S.LoginForm
Expand Down Expand Up @@ -61,7 +62,7 @@ const LoginPage = () => {
로그인
</Button>
<Flex justify='flex-end' align='center' width='100%' gap='0.5rem'>
<Text.XSmall color='#6B7079'>계정이 없으신가요?</Text.XSmall>
<Text.XSmall color={theme.color.light.secondary_600}>계정이 없으신가요?</Text.XSmall>

<Link to={END_POINTS.SIGNUP}>
<Button variant='text' size='small'>
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/pages/SignupPage/SignupPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { useTrackPageViewed } from '@/service/amplitude';

import { useSignupForm } from './hooks';
import * as S from './SignupPage.style';
import { theme } from '@/style/theme';

const SignupPage = () => {
useTrackPageViewed({ eventName: '[Viewed] 회원가입 페이지' });
Expand All @@ -33,7 +34,7 @@ const SignupPage = () => {
<S.SignupPageContainer direction='column' justify='center' align='center' width='27.5rem' gap='3.5rem'>
<Flex direction='column' justify='center' align='center' gap='1rem'>
<ZapzapLogo width={100} height={100} />
<S.ResponsiveHeading color='#F79037'>환영하잽</S.ResponsiveHeading>
<S.ResponsiveHeading color={theme.color.light.primary_800}>환영하잽</S.ResponsiveHeading>
</Flex>

<S.SignupForm
Expand Down Expand Up @@ -89,7 +90,7 @@ const SignupPage = () => {
</Button>

<Flex justify='flex-end' align='center' width='100%' gap='0.5rem'>
<Text.XSmall color='#6B7079'>이미 계정이 있으신가요?</Text.XSmall>
<Text.XSmall color={theme.color.light.secondary_600}>이미 계정이 있으신가요?</Text.XSmall>
<Link to={'/login'}>
<Button variant='text' size='small'>
로그인
Expand Down

0 comments on commit 844a8b7

Please sign in to comment.