Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions src/components/Dropdown/DropdownPopover.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ const DropdownPopover = ({
const isFilter = variant === "filter";

const sizeClass = isFilter
? "md:w-[24.375rem] md:h-[52.75rem]"
: "md:w-[23rem] md:h-[26.25rem]";
? "sm:w-[24.375rem] sm:h-[52.75rem]"
: "sm:w-[23rem] sm:h-[26.25rem]";

const colorClass = isFilter
? "bg-white border-gray-200"
Expand All @@ -76,7 +76,7 @@ const DropdownPopover = ({
"z-[9999]",
"rounded-2xl p-6 pr-5 pb-6 pl-5",
"shadow-[0px_2px_8px_0px_#78748640]",
"border fixed md:absolute w-full h-full left-0 top-0",
"border fixed sm:absolute w-full h-full left-0 top-0",
colorClass,
sizeClass,
);
Expand Down
8 changes: 4 additions & 4 deletions src/components/Modal/AlertModalLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ export default function AlertModalLayout({
bg-white rounded-lg text-center relative
${
type === "message"
? "w-[20.625rem] h-[13.75rem] md:w-[33.75rem] md:h-[15.625rem]"
: "w-[18.625rem] h-[11.5rem] md:w-[18.625rem] md:h-[11.5rem]"
? "w-[20.625rem] h-[13.75rem] sm:w-[33.75rem] sm:h-[15.625rem]"
: "w-[18.625rem] h-[11.5rem] sm:w-[19.625rem] sm:h-[11.5rem]"
}
p-6 flex flex-col justify-center items-center
`}
onClick={(e) => e.stopPropagation()}
>
{Icon && <Icon className="w-6 h-6 mb-6 mx-auto shrink-0" />}{" "}
<p className="text-gray-900 text-base md:text-lg mb-[1rem]">{message}</p>
{Icon && <Icon className="w-6 h-6 mb-3.5 mx-auto shrink-0" />}{" "}
<p className="text-gray-900 text-base sm:text-lg mb-[1rem]">{message}</p>
<div
className={
type === "message"
Expand Down
9 changes: 5 additions & 4 deletions src/components/Modal/ConfirmModalLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,22 @@ export default function ConfirmModalLayout({
const Icon = iconType !== "none" ? ICONS[iconType] : null;

return (
<div className="w-[18.625rem] md:w-[18.625rem] h-[11.5rem] bg-white rounded-lg p-6 text-center flex flex-col justify-center items-center">
<div className="w-[18.625rem] sm:w-[18.625rem] h-[11.5rem] bg-white rounded-lg p-6 text-center flex flex-col justify-center items-center">
{Icon && <Icon className="w-6 h-6 mb-3" />}
<p className="text-gray-900 text-base md:text-lg font-normal mb-6">

<p className="text-gray-900 text-base sm:text-lg font-normal mb-6">
{message}
</p>
<div className="flex justify-end gap-3">
<button
onClick={onClose}
className="w-[5rem] h-[2.375rem] border border-red-500 text-red-500 rounded-md cursor-pointer"
className="w-[5rem] h-[2.375rem] border border-red-500 text-red-500 rounded-[6px] cursor-pointer"
>
{cancelText}
</button>
<button
onClick={onConfirm}
className="w-[5rem] h-[2.375rem] bg-red-500 text-white rounded-md cursor-pointer"
className="w-[5rem] h-[2.375rem] bg-red-500 text-white rounded-[6px] cursor-pointer"
>
{confirmText}
</button>
Expand Down
10 changes: 7 additions & 3 deletions src/components/Modal/Modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import AlertModalLayout from "./AlertModalLayout";
import ConfirmModalLayout from "./ConfirmModalLayout";

import { useModalStore } from "@/store/useModalStore";

export default function Modal() {
const { isOpen, options, closeModal } = useModalStore();

Expand All @@ -13,8 +12,13 @@ export default function Modal() {

const handleKeyDown = (e: KeyboardEvent) => {
if (e.key === "Enter") {
e.preventDefault(); // 🔥 기본 엔터 동작 차단 (버튼 재실행 방지)
e.stopPropagation(); // 이벤트 버블링도 막기
e.preventDefault();
e.stopPropagation();

options?.onClose?.();
e.preventDefault();
e.stopPropagation();

if (options?.type === "confirm") {
options.onConfirm?.();
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/SearchInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export default function SearchInput() {
return (
<form
onSubmit={handleSubmit}
className="relative flex w-full md:max-w-[28.125rem] pl-10 rounded-[0.625rem] p-[0.625rem] bg-gray-10 border border-transparent"
className="relative flex w-full sm:max-w-[28.125rem] pl-10 rounded-[0.625rem] p-[0.625rem] bg-gray-10 border border-transparent"
>
<div className="flex items-center w-full">
<img
Expand Down
4 changes: 2 additions & 2 deletions src/layouts/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export default function Footer() {

<div className="flex flex-col gap-3 sm:hidden mt-4">
<div className="flex flex-wrap gap-4 text-sm justify-between">
<div className="flex flex-wrap gap-4 text-sm font-normal leading-[1.375rem] text-gray-50">
<div className="flex flex-wrap gap-6 text-sm font-normal leading-[1.375rem] text-gray-50">
<a href="/privacy">Privacy Policy</a>
<a href="/faq">FAQ</a>
</div>
Expand Down Expand Up @@ -72,7 +72,7 @@ export default function Footer() {
</div>
</div>

<div className="text-xs text-gray-50 leading-[1rem] font-normal">
<div className="text-xs text-gray-50 leading-[1rem] font-normal pt-[1rem]">
©codeit - 2025
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/NoticeListPage/NoticeListPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export default function NoticeListPage() {
};

return (
<section className="w-full">
<section className="w-full overflow-hidden">
{user?.type && customNotices.length > 0 && (
<CustomNoticeSection customNotices={customNotices} />
)}
Expand Down
4 changes: 2 additions & 2 deletions src/pages/NoticeListPage/TotalNoticeSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ export default function TotalNoticeSection({
};

return (
<section className="mt-10 lg:w-[60.25rem] md:w-[42.375rem] mx-auto ">
<section className="mt-10 lg:w-[60.25rem] sm:w-[42.375rem] mx-auto">
<div className="flex justify-between items-center mb-4">
<h2 className="font-bold text-[1.25rem] md:text-[1.75rem] tracking-[-0.02em] text-black p-4 pl-0">
<h2 className="font-bold text-[1.25rem] sm:text-[1.75rem] tracking-[-0.02em] text-black p-4 pl-0">
전체 공고
</h2>
<div className="flex px-4 pr-0 gap-[0.625rem]">
Expand Down