Skip to content
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

Jump to bottom

Refactor/main #4

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Refactor/main #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdfd97b
[refactor / Main] header padding 수정
doyn511 Dec 29, 2023
b115c9c
[refactor / Main] header, main 디자인 수정
doyn511 Jan 25, 2024
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
7 changes: 3 additions & 4 deletions src/components/Main/Header.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/** Main page */
import React from 'react';
import styled from 'styled-components';
import { NavigationLeftIc } from '@assets';
import mainTitle from '@assets/images/mainTitle.png';
import React from 'react';
import { Link } from 'react-router-dom';
import styled from 'styled-components';

const Header = () => {
return (
Expand All @@ -25,8 +25,7 @@ const St = {
align-items: center;
gap: 7.78rem;
height: 4.9rem;
background-color: transparent;
padding: 0 1.8rem;
padding: 1.2rem 1.8rem;
`,

TitleImg: styled.img`
Expand Down
11 changes: 4 additions & 7 deletions src/pages/Main/Main.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import React, { useEffect, useState } from 'react';
import styled from 'styled-components';
import reqAPI from '@api/reqAPI';
import { MainWriteIc, NavigationRightIc } from '@assets';
import mainImg from '@assets/images/[email protected]';
import Header from '@components/Main/Header';
import useRouter from '@hooks/useRouter';
import calculateDate from '@utils/CalculateDate';
import reqAPI from '@api/reqAPI';
import React, { useEffect, useState } from 'react';
import styled from 'styled-components';

/** Main page */
const Main = () => {
Expand Down Expand Up @@ -37,7 +37,6 @@ const Main = () => {

return (
<St.MainWrapper>
<St.RemainContainer></St.RemainContainer>
<Header />
<St.CountWrapper>
내일을 기대하는 사람이
Expand Down Expand Up @@ -78,13 +77,11 @@ const St = {
flex-direction: column;
align-items: center;
background-image: url('background.png');
background-size: contain;
background-repeat: no-repeat;
background-color: ${({ theme }) => theme.colors.black};
`,

RemainContainer: styled.div`
height: 4.4rem;
`,
CountWrapper: styled.div`
display: flex;
justify-content: center;
Expand Down