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

๐Ÿ’„ Style: ๋ณ€๊ฒฝ - footer ์•„์ด์ฝ˜ ์™ธ 1 #48

Merged
merged 2 commits into from
Aug 21, 2024
Merged

๐Ÿ’„ Style: ๋ณ€๊ฒฝ - footer ์•„์ด์ฝ˜ ์™ธ 1 #48

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
351936b
๐Ÿ’„ Style: ๋ณ€๊ฒฝ - footer ์•„์ด์ฝ˜
sobinibani Aug 20, 2024
32ddd73
รญยฒย„ Style: ์ˆ˜์ • - rounded class
sobinibani Aug 20, 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
Binary file added src/assets/Icon/Nav_Bottom/BK_BDplace.png
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.
Binary file added src/assets/Icon/Nav_Bottom/BK_Home.png
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.
Binary file added src/assets/Icon/Nav_Bottom/BK_Magazine.png
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.
Binary file added src/assets/Icon/Nav_Bottom/BK_Main.png
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.
Binary file added src/assets/Icon/Nav_Bottom/BK_My.png
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.
Binary file added src/assets/Icon/Nav_Bottom/OR_BDPlace.png
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.
Binary file added src/assets/Icon/Nav_Bottom/OR_Home.png
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.
Binary file added src/assets/Icon/Nav_Bottom/OR_Magazine.png
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.
Binary file added src/assets/Icon/Nav_Bottom/OR_Main.png
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.
Binary file added src/assets/Icon/Nav_Bottom/OR_My.png
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.
Binary file added src/assets/Icon/Nav_Bottom/logo 3.png
View file
Open in desktop
sobinibani marked this conversation as resolved.
Show resolved Hide resolved
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 10 additions & 10 deletions src/components/layout/FooterGnb.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import React from 'react';
import { useLocation, Link } from 'react-router-dom';
import { twMerge } from 'tailwind-merge';
import BKiconHome from '../../assets/Icon/Nav_Bottom/BK_Home.svg';
import BKiconPlace from '../../assets/Icon/Nav_Bottom/BK_BDplace.svg';
import BKiconMain from '../../assets/Icon/Nav_Bottom/BK_Main.svg';
import BKiconMag from '../../assets/Icon/Nav_Bottom/BK_Magazine.svg';
import BKiconMy from '../../assets/Icon/Nav_Bottom/BK_My.svg';
import ORiconHome from '../../assets/Icon/Nav_Bottom/OR_Home.svg';
import ORiconPlace from '../../assets/Icon/Nav_Bottom/OR_BDplace.svg';
import ORiconMain from '../../assets/Icon/Nav_Bottom/OR_Main.svg';
import ORiconMag from '../../assets/Icon/Nav_Bottom/OR_Magazine.svg';
import ORiconMy from '../../assets/Icon/Nav_Bottom/OR_My.svg';
import BKiconHome from '../../assets/Icon/Nav_Bottom/BK_Home.png';
import BKiconPlace from '../../assets/Icon/Nav_Bottom/BK_BDplace.png';
import BKiconMain from '../../assets/Icon/Nav_Bottom/BK_Main.png';
import BKiconMag from '../../assets/Icon/Nav_Bottom/BK_Magazine.png';
import BKiconMy from '../../assets/Icon/Nav_Bottom/BK_My.png';
import ORiconHome from '../../assets/Icon/Nav_Bottom/OR_Home.png';
import ORiconPlace from '../../assets/Icon/Nav_Bottom/OR_BDplace.png';
import ORiconMain from '../../assets/Icon/Nav_Bottom/OR_Main.png';
import ORiconMag from '../../assets/Icon/Nav_Bottom/OR_Magazine.png';
import ORiconMy from '../../assets/Icon/Nav_Bottom/OR_My.png';

interface LinkProps {
link: string;
Expand Down
4 changes: 2 additions & 2 deletions src/page/Home/BDInfoPopularItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ const BDInfoPopularItem: React.FC<BDInfoPopularItemProps> = ({ className }) => {

return (
<div className={borderClass}>
<span className='rounded-10px h-[16px] w-[16px] bg-primary text-center text-[10px] leading-[16px] text-white'>
<span className='h-[16px] w-[16px] rounded-[10px] bg-primary text-center text-[10px] leading-[16px] text-white'>
1
</span>
<div className='imgWrap rounded-10px ml-[8px] h-[47px] w-[47px] bg-background'></div>
<div className='imgWrap ml-[8px] h-[47px] w-[47px] rounded-[10px] bg-background'></div>
<div className='ml-[8px]'>
<p className='text-[14px] font-semibold'>๊ฐ•์•„์ง€ํ„ธ ์ด๋Œ€๋กœ ๊ดœ์ฐฎ์„๊นŒ์š”?</p>
<p className='text-[12px]'>๋„ˆ๋ฌด ๊ณ ๋ฏผํ•˜์ง€๋งˆ์„ธ์š”.</p>
Expand Down