Skip to content

Commit

Permalink
💄Design - 폰트 중복 css 제거 #40
Browse files Browse the repository at this point in the history
  • Loading branch information
bianbbc87 committed May 5, 2024
1 parent 7757212 commit b1d7d08
Show file tree
Hide file tree
Showing 12 changed files with 23 additions and 23 deletions.
4 changes: 2 additions & 2 deletions src/components/seminar/header/SeminarHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ const SeminarHeader = () => {

return (
<>
<div className="w-full px-3 pt-10 H3 font-normal">Seminar</div>
<div className="px-3 pt-3 H6 font-medium">여러분과 함께 나누고싶은 이야기</div>
<div className="w-full px-3 pt-10 H3">Seminar</div>
<div className="px-3 pt-3 H6">여러분과 함께 나누고싶은 이야기</div>
<p className="mt-6 border border-solid text-mono_700 h-0"/>
<motion.section
whileHover={{ scale: 1.05 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ const OpenSeminarDetailHeader = ({ data }: { data: OpenSeminar }) => {
</button>
))}
</div>
<p className="w-full px-3 pt-8 H3 font-normal">
<p className="w-full px-3 pt-8 H3">
{data.seminar_month_date}{" "}{data.type}
</p>
<p className="w-full px-3 pt-3 H6 font-medium">
<p className="w-full px-3 pt-3 H6">
{data.description}
</p>
</>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const OpenSeminarDetailInformation = ({ data }: { data: OpenSeminar }) => {

return (
<div className="w-full flex mt-10 pt-6 flex-col inline-flex min-h-fit relative">
<p className="H4 font-normal px-2 pb-4">
<p className="H4 px-2 pb-4">
Information
</p>
<p className="mb-3 border border-solid text-mono_700 h-0"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const OpenSeminarDetailSeminars = ({ data }: { data: OpenSeminar }) => {

return (
<div className="w-full mt-10 pt-6 flex-col inline-flex min-h-fit relative">
<p className="H4 font-normal px-2 pb-4">
<p className="H4 px-2 pb-4">
Seminars
</p>
<p className="mb-3 border border-solid text-mono_700 h-0"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ const OpenSeminarsDetailBox = ({ data }: { data: SeminarThumnail }) => {
/>
</div>
<div className='flex flex-col justify-center'>
<div className="B1 font-medium flex gap-2">
{data.presenter_name} <p className="B1 font-normal text-mono_200">{data.presenter_role}</p>
<div className="B1 flex gap-2">
{data.presenter_name} <p className="B1 text-mono_200">{data.presenter_role}</p>
</div>
<p className='className="B1 font-normal'>{data.title}</p>
<p className='className="B1'>{data.title}</p>
</div>
</div>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@ const SeminarDetailBannerInform = ({ type, data, speaker_data }: { type: string,
>
{data === 'Speaker' ? (
<div>
<p className="H6 font-medium pointer-events-none">
<p className="H6 pointer-events-none">
{type}
</p>
<div className="B1 font-medium flex gap-2 pointer-events-none">
{data} <p className="B1 font-normal text-mono_200">{speaker_data}</p>
<div className="B1 flex gap-2 pointer-events-none">
{data} <p className="B1 text-mono_200">{speaker_data}</p>
</div>
</div>
)
:
(
<div>
<p className="H6 font-medium pointer-events-none">
<p className="H6 pointer-events-none">
{type}
</p>
<p className="B1 font-normal pointer-events-none">
<p className="B1 pointer-events-none">
{data}
</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ const SeminarDetailHeader = ({ data }: { data: SeminarThumnail }) => {
</button>
))}
</div>
<p className="w-full px-3 pt-8 H3 font-normal">
<p className="w-full px-3 pt-8 H3">
{data.title}
</p>
<p className="w-full px-3 pt-3 H6 font-medium">
<p className="w-full px-3 pt-3 H6">
{data.description}
</p>
</>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const SeminarDetailPdf = () => {
className="flex gap-2 cursor-pointer"
>
<PinImg />
<p className='B1 font-normal'>세미나 자료 보기</p>
<p className='B1'>세미나 자료 보기</p>
</motion.section>
</motion.section>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ const SeminarDetailReviewDetail = ({ data }: { data: SeminarReview }) => {

return (
<div className="mt-5 flex flex-col p-5 bg-mono_900 rounded-xl">
<p className='B1 font-bold font-medium pointer-events-none'>사람 이름</p>
<p className='B1 pointer-events-none'>사람 이름</p>
<motion.section
viewport={{ once: true, amount: 0.9 }}
variants={seminarCardVariants}
style={{ transformOrigin: '10% 60%' }}
whileHover={{ scale: 1.05, transition: { duration: 0.2 } }}
whileTap={{ scale: 0.8 }}
>
<p className='mt-3 B1 font-normal pointer-events-none'>리뷰 내용</p>
<p className='mt-3 B1 pointer-events-none'>리뷰 내용</p>
</motion.section>
</div>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const SeminarDetailReview = () => {

return (
<div className="w-full flex mt-10 flex-col inline-flex min-h-fit relative">
<p className="H4 font-normal px-2 py-3 pointer-events-none">
<p className="H4 px-2 py-3 pointer-events-none">
Review
</p>
<p className="mb-3 border border-solid text-mono_700 h-0"/>
Expand Down
2 changes: 1 addition & 1 deletion src/components/seminar/toggle/SeminarToggle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const SeminarToggle = () => {
whileTap={{ scale: 0.8 }}
transition={{ duration: 0.2 }}
onClick={toggleMenuVisibility}
className="flex B2 font-medium"
className="flex B2"
>
목록 보기
<ChervonDownIcon className={`self-center ${isMenuVisible ? 'rotate-180' : 'rotate-0'}`} />
Expand Down
4 changes: 2 additions & 2 deletions src/components/seminar/toggle/SeminarToggleMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ const SeminarToggleMenu = ({data}: {data:OpenSeminar}) => {
<div
className="p-3 flex justify-between items-center">
<div className="flex-col">
<p className="H6 font-medium">{data.seminar_month_date}{" "}{data.type}</p>
<p className="Cap font-normal">{data.seminar_opening_date}</p>
<p className="H6">{data.seminar_month_date}{" "}{data.type}</p>
<p className="Cap">{data.seminar_opening_date}</p>
</div>
<p className={`text-[0.75rem] font-medium py-2 px-3 border border-solid rounded-lg ${data.status === false ? "text-mono_500 border-mono_500" : "text-mono_white border-mono_white"}`}>
{data.status === false ? "종료" : "진행중"}
Expand Down

0 comments on commit b1d7d08

Please sign in to comment.