Skip to content

Commit

Permalink
fix : 폰트 에러
Browse files Browse the repository at this point in the history
fix : 폰트 에러
  • Loading branch information
phyuna0525 authored Apr 25, 2024
2 parents c4467b3 + 3616b70 commit eaf019c
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 15 deletions.
2 changes: 1 addition & 1 deletion src/components/background/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const BackGround: React.FC<Prop> = ({
<Header />
<div className="min-w-fit h-full min-h-dvh px-6 py-3 bg-primary-1200">
<div className="py-3 gap-5 flex flex-col">
<div className="flex items-center gap-3 font-sans">
<div className="flex items-center gap-3 ">
<div className="text-sub-title1-M">{title}</div>
<div className="text-sun-title3-M text-neutral-300">{subTitle}</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const Header: NextPage = ({}) => {
<Link href={"/main"}>
<Image src={pick} alt="" width={48} />
</Link>
<div className="flex font-sans text-nowrap text-sub-title4-M text-neutral-50">
<div className="flex text-nowrap text-sub-title4-M text-neutral-50">
{teacherName ? `${teacherName}선생님` : "선생님"}
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/components/input/auto.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const AutoInput: React.FC<AutoInputProps> = ({
const [selectedValues, setSelectedValues] = useState<string[]>([]);
const { data: GetStudentMutate } = AllStudent();

const containerClassName = `font-sans w-${width} h-auto border border-neutral-900 rounded flex justify-between items-center px-2 bg-neutral-900 hover:border-neutral-500 hover:bg-white active:border-secondary-500 caret-primary-500 focus:border-secondary-500`;
const containerClassName = ` w-${width} h-auto border border-neutral-900 rounded flex justify-between items-center px-2 bg-neutral-900 hover:border-neutral-500 hover:bg-white active:border-secondary-500 caret-primary-500 focus:border-secondary-500`;

const [data, setData] = useState<Type[]>([]);

Expand All @@ -64,7 +64,7 @@ const AutoInput: React.FC<AutoInputProps> = ({
const [student, setStudent] = useState<string[]>([]);

const inputClassName =
"h-10 px-2 border-none bg-transparent placeholder-neutral-500 focus:outline-none rounded font-sans w-full";
"h-10 px-2 border-none bg-transparent placeholder-neutral-500 focus:outline-none rounded w-full";

const handleInputChange = (inputText: string) => {
const filtered = student?.filter((item) =>
Expand Down
6 changes: 3 additions & 3 deletions src/components/input/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const Input: React.FC<InputProps> = ({
}) => {
const [showOpen, setShowOpen] = useState<boolean>(false);

const containerClassName = ` font-sans w-${width} h-${height} border border-neutral-900 rounded flex justify-between items-center px-2
const containerClassName = ` w-${width} h-${height} border border-neutral-900 rounded flex justify-between items-center px-2
${
error
? "border-error-500 bg-error-900"
Expand All @@ -50,12 +50,12 @@ const Input: React.FC<InputProps> = ({
`;

const inputClassName = ` h-10 w-full px-2 border-none bg-transparent placeholder-neutral-500
focus:outline-none rounded font-sans
focus:outline-none rounded
`;

return (
<div className=" flex flex-col items-start w-full">
<label className=" font-sans text-label1 text-neutral-50">{label}</label>
<label className=" text-label1 text-neutral-50">{label}</label>
<div className={containerClassName}>
<input
className={inputClassName}
Expand Down
4 changes: 2 additions & 2 deletions src/components/modal/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@ const Modal: React.FC<ModalProps> = ({
{type === "button" || type === "error" ? (
<div className=" z-10 bg-white rounded-xl px-5 py-6">
<div className="flex flex-col gap-8 items-center">
<div className="font-sans text-neutral-50 text-center text-sub-title2-M">
<div className=" text-neutral-50 text-center text-sub-title2-M">
{heading1 && <div className="max-w-none">{heading1}</div>}
{heading2 && <div className=" w-max">{heading2}</div>}
</div>
<div className="font-sans text-label2 text-neutral-400 text-center">
<div className=" text-label2 text-neutral-400 text-center">
{buttonMessage}하기 선택하면 다시 변경할 수 없습니다.
</div>
{renderButtons()}
Expand Down
4 changes: 2 additions & 2 deletions src/components/tab/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ const Tab: React.FC<Tab> = ({ firstText, SecondText, onClick }) => {

const selectTabClass = (tab: boolean) =>
selectedTab === tab
? "font-sans text-sub-title3-B w-full border-b-1 border-primary-500 py-3 flex items-center justify-center select-none"
: "font-sans text-sub-title3-B0 py-3 w-full flex items-center justify-center select-none";
? " text-sub-title3-B w-full border-b-1 border-primary-500 py-3 flex items-center justify-center select-none"
: " text-sub-title3-B0 py-3 w-full flex items-center justify-center select-none";

const handleTabClick = (tab: boolean) => {
setSelectedTab(tab);
Expand Down
4 changes: 0 additions & 4 deletions src/style/global.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
@tailwind base;
@tailwind components;
@tailwind utilities;

.font-sans {
font-family: "Noto Sans KR";
}

0 comments on commit eaf019c

Please sign in to comment.