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

[Design] #45 - 폰트 변경 및 개발자페이지에 상단바 추가 #90

Merged
merged 1 commit into from
Oct 5, 2024
Merged

[Design] #45 - 폰트 변경 및 개발자페이지에 상단바 추가 #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions src/pages/about/AboutPage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ import * as S from "./AboutPage.styled";
import { AboutCard } from "@components/about/AboutCard/AboutCard";
import { LikeLionLink } from "@components/about/LikeLionLink/LikeLionLink";
import { Review } from "@components/about/Review/Review";
import { TopBar } from "@components/topBar/TopBar";
export const AboutPage = () => {
return (
<S.MainWrapper>
< TopBar />
<LikeLionLink />
<AboutCard />
<Review />
Expand Down
22 changes: 11 additions & 11 deletions src/pages/booth/Styled.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export const DateSelector = styled.div`
export const DateButton = styled.div`
background-color: ${({ $active }) => ($active ? "#FFF3EA" : "#FFFFFF")};
color: ${({ $active, theme }) => ($active ? theme.colors.buttonFall : theme.colors.noneSelected)};
font-family: ${({ theme }) => theme.fonts.AppleSDGothicNeoB00['font-family']};
font-family: ${({ theme }) => theme.fonts.NanumSquareRoundB['font-family']};
padding: 0.625rem 1rem;
font-size: 14px;
border: none;
Expand Down Expand Up @@ -257,7 +257,7 @@ export const BoothList = styled.div`
export const NoticeTabling = styled.div`
padding: 0px 10px 5px 10px;
color: #5F5F5F;
font-family: ${({ theme }) => theme.fonts.AppleSDGothicNeoR00['font-family']};
font-family: ${({ theme }) => theme.fonts.NanumSquareRoundR['font-family']};
font-size: 11px;
font-style: normal;
font-weight: 400;
Expand Down Expand Up @@ -305,7 +305,7 @@ export const LocationButton = styled.div`
width: 50px;

color: #5F5F5F;
font-family: ${({ theme }) => theme.fonts.AppleSDGothicNeoL00['font-family']}; // R
font-family: ${({ theme }) => theme.fonts.NanumSquareRoundR['font-family']}; // R
font-size: 10px;
font-style: normal;
font-weight: 400;
Expand All @@ -320,7 +320,7 @@ export const BoothName = styled.div`

color: #000;

font-family: ${({ theme }) => theme.fonts.AppleSDGothicNeoM00['font-family']};
font-family: ${({ theme }) => theme.fonts.NanumSquareRoundB['font-family']};
font-size: 14.045px;
font-style: normal;
font-weight: 400;
Expand All @@ -334,7 +334,7 @@ export const HeartWrap = styled.div`
gap: 4px;

color: #000;
font-family: ${({ theme }) => theme.fonts.AppleSDGothicNeoR00['font-family']};
font-family: ${({ theme }) => theme.fonts.NanumSquareRoundR['font-family']};
font-size: 10px;
font-style: normal;
font-weight: 400;
Expand All @@ -346,7 +346,7 @@ export const BoothWho = styled.div`

color: #5F5F5F;

font-family: ${({ theme }) => theme.fonts.AppleSDGothicNeoR00['font-family']};
font-family: ${({ theme }) => theme.fonts.NanumSquareRoundR['font-family']};
font-size: 12px;
font-style: normal;
font-weight: 400;
Expand All @@ -361,7 +361,7 @@ export const NoBooth = styled.div`
height: 100%;

color: #5F5F5F;
font-family: ${({ theme }) => theme.fonts.AppleSDGothicNeoM00['font-family']};
font-family: ${({ theme }) => theme.fonts.NanumSquareRoundB['font-family']};
font-size: 13px;
font-style: normal;
font-weight: 400;
Expand Down Expand Up @@ -457,7 +457,7 @@ export const FilterTag = styled.div`
height: 16px;
border-radius: 5px;

font-family: ${({ theme }) => theme.fonts.AppleSDGothicNeoL00['font-family']};
font-family: ${({ theme }) => theme.fonts.NanumSquareRoundR['font-family']};
font-size: 10px;
font-style: normal;
font-weight: 400;
Expand All @@ -473,7 +473,7 @@ export const DetailTitle = styled.div`
display: flex;

color: #000;
font-family: ${({ theme }) => theme.fonts.AppleSDGothicNeoB00['font-family']};
font-family: ${({ theme }) => theme.fonts.NanumSquareRoundB['font-family']};
font-size: 10px;
font-style: normal;
font-weight: 400;
Expand All @@ -484,7 +484,7 @@ export const DetailContext = styled.div`
display: flex;

color: #000;
font-family: ${({ theme }) => theme.fonts.AppleSDGothicNeoR00['font-family']};
font-family: ${({ theme }) => theme.fonts.NanumSquareRoundR['font-family']};
font-size: 10px;
font-style: normal;
font-weight: 400;
Expand Down Expand Up @@ -521,7 +521,7 @@ export const LineNowBox = styled.div`

export const LineNowText = styled.div`
color: #333740;
font-family: ${({ theme }) => theme.fonts.AppleSDGothicNeoM00['font-family']};
font-family: ${({ theme }) => theme.fonts.NanumSquareRoundB['font-family']};
font-size: 10.5px;
font-style: normal;
font-weight: 400;
Expand Down