Skip to content

Commit

Permalink
Merge pull request #70 from go-cham/dev
Browse files Browse the repository at this point in the history
style: 배경 이미지 변경
  • Loading branch information
wildcatco authored Aug 9, 2023
2 parents 2e02021 + 5bc3d65 commit 641891a
Show file tree
Hide file tree
Showing 8 changed files with 3,781 additions and 17 deletions.
1 change: 1 addition & 0 deletions .env.local
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ REACT_APP_KAKAO_REDIRECT_API=http://localhost:3000/login/oauth/kakao
#REACT_APP_KAKAO_REDIRECT_API=http://192.168.43.23:3000/login/oauth/kakao
REACT_APP_BASE_URL=http://localhost:3000
REACT_APP_KAKAO_JAVASCRIPT_KEY=1a95ea62a617e7f7c689a4f71854b2d4
ESLINT_NO_DEV_ERRORS=true
18 changes: 12 additions & 6 deletions src/components/layout/Layout.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,24 @@
import BackgroundText from '@/images//backgroundText.svg';
import character from '@/images/background/character.svg';
import text from '@/images/background/text.svg';

interface LayoutProps {
children: React.ReactNode;
}

export default function Layout({ children }: LayoutProps) {
return (
<div className="flex h-full w-screen overflow-hidden bg-without-character bg-cover bg-center">
<div className="flex h-full w-screen overflow-hidden bg-[#f5f5f5] bg-cover bg-center ">
<img
src={BackgroundText}
alt="백그라운드 텍스트"
className="fixed left-[10rem] top-[10rem] hidden h-[39.3rem] w-[43.5rem] xl:block"
src={text}
alt="text"
className="fixed left-[5.5%] top-[8rem] z-10 hidden w-[40rem] xl:block"
/>
<div className="relative mx-auto h-full w-full max-w-[43rem] bg-background-mainBg-0 xl:left-[25rem]">
<img
src={character}
alt="character"
className="fixed bottom-0 left-0 hidden w-[45%] xl:block"
/>
<div className="relative mx-auto h-full w-full max-w-[43rem] bg-background-mainBg-0 xl:left-[25rem]">
{children}
</div>
</div>
Expand Down
Binary file removed src/images/background.png
Binary file not shown.
3,755 changes: 3,755 additions & 0 deletions src/images/background/character.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions src/images/background/text.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 0 additions & 7 deletions src/images/backgroundText.svg

This file was deleted.

Binary file removed src/images/background_nocharVer.png
Binary file not shown.
4 changes: 0 additions & 4 deletions tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,6 @@ module.exports = {
header: '0 0.33000001311302185px 0 0 rgba(34, 34, 34, 0.30)',
dropdown: '0 4px 16px 0 rgba(42, 45, 55, 0.12)',
},
backgroundImage: {
'with-character': "url('src/images/background.png')",
'without-character': "url('src/images/background_nocharVer.png')",
},
fontFamily: {
pretendard: ['Pretendard', ...fontFamily.sans],
},
Expand Down

0 comments on commit 641891a

Please sign in to comment.