Skip to content

Commit 57bd5e3

Browse files
ozen0718ozen0718
authored
Merge pull request #219 from part3-4team-Taskify/minji
[Refactor] FormModal, TaskModal: 모바일 확대 방지 input text 최소 size 16px 변경
2 parents 396db15 + 21f9bd2 commit 57bd5e3

File tree

9 files changed

+18
-18
lines changed

9 files changed

+18
-18
lines changed

‎src/components/modal/FormModal.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ export default function FormModal({
6161
labelClassName="font-medium text-black3 sm:text-[18px] text-[16px] mt-6"
6262
placeholder={inputPlaceholder}
6363
className="max-w-[620px] mb-1 pr-14
64-
text-black3 font-normal sm:text-[16px] text-[14px]
65-
placeholder:sm:text-[16px] placeholder:text-[14px]"
64+
text-black3 font-normal sm:text-[18px] text-[16px]
65+
placeholder:sm:text-[18px] placeholder:text-[16px]"
6666
/>
6767
{charCount && (
6868
<span

‎src/components/modal/NewDashboard.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ export default function NewDashboard({ onClose, onCreate }: NewDashboardProps) {
7373
labelClassName="font-medium text-black3 sm:text-[18px] text-[16px] mt-6"
7474
placeholder="뉴 프로젝트"
7575
className="max-w-[620px] mb-1 pr-14
76-
text-black3 font-normal sm:text-[16px] text-[14px]
77-
placeholder:sm:text-[16px] placeholder:text-[14px]"
76+
text-black3 font-normal sm:text-[18px] text-[16px]
77+
placeholder:sm:text-[18px] placeholder:text-[16px]"
7878
/>
7979
<span
8080
className="absolute right-3 top-2/5 translate-y-6.5 font-light

‎src/components/modalInput/AssigneeSelect.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export default function AssigneeSelect({
3434
return (
3535
<div className="inline-flex flex-col items-start gap-2.5 w-full max-w-[520px]">
3636
{label && (
37-
<p className="text-black3 font-medium text-[14px] sm:text-[18px]">
37+
<p className="text-black3 font-medium text-[16px] sm:text-[18px]">
3838
{label}
3939
{required && <span className="text-[var(--primary)]"> *</span>}
4040
</p>
@@ -67,7 +67,7 @@ export default function AssigneeSelect({
6767
</span>
6868
</>
6969
) : (
70-
<span className="font-normal text-[14px] sm:text-[16px] text-[var(--color-gray2)]">
70+
<span className="font-normal text-[16px] sm:text-[18px] text-[var(--color-gray2)]">
7171
담당자를 선택해 주세요
7272
</span>
7373
)}

‎src/components/modalInput/InputClassNames.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export const inputClassNames = {
66
"flex flex-col items-start gap-[10px] p-4 text-sm sm:text-xs font-normal",
77
dropdownOptions:
88
"absolute z-10 mt-0.5 flex w-[217px] flex-col rounded-md border border-solid border-gray3 bg-white shadow-[0_4px_20px_0_rgba(0,0,0,0.08)]",
9-
label: "text-black3 font-medium text-[14px] sm:text-[18px]",
9+
label: "text-black3 font-medium text-[16px] sm:text-[18px]",
1010
// 사이즈를 결정하는 키워드
1111
type: {
1212
dropdown: "h-12 w-[217px]",

‎src/components/modalInput/ModalInput.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ export default function ModalInput({
138138
placeholder="제목을 입력해 주세요"
139139
defaultValue={defaultValue}
140140
className="w-full max-w-[520px] h-[48px] rounded-md pl-4 pr-18
141-
text-black3 text-[14px] sm:text-[16px] font:normal
141+
text-black3 text-[16px] sm:text-[18px] font:normal
142142
outline-none border border-[var(--color-gray3)] focus:border-[var(--primary)]"
143143
onChange={handleTitleValue}
144144
maxLength={maxTitleLength}
@@ -169,7 +169,7 @@ export default function ModalInput({
169169
timeIntervals={15}
170170
dateFormat="yyyy-MM-dd HH:mm"
171171
placeholderText="날짜를 입력해 주세요"
172-
className="w-full h-full text-black3 text-[14px] sm:text-[16px] font:normal outline-none bg-transparent"
172+
className="w-full h-full text-black3 text-[16px] sm:text-[18px] font:normal outline-none bg-transparent"
173173
calendarClassName="text-[14px]"
174174
popperPlacement="bottom-start"
175175
popperContainer={({ children }) => <div>{children}</div>}
@@ -209,8 +209,8 @@ export default function ModalInput({
209209
onKeyDown={handleKeydown}
210210
className="flex-grow min-w-[100px] h-full
211211
border-none outline-none
212-
font-normal text-[14px] sm:text-[16px]
213-
placeholder:sm:text-[14px] placeholder:text-[12px]"
212+
font-normal text-[16px] sm:text-[18px]
213+
placeholder:sm:text-[16px] placeholder:text-[14px]"
214214
/>
215215
</div>
216216
);

‎src/components/modalInput/ModalTextarea.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export default function ModalTextarea({
4848
<div className="inline-flex flex-col items-start gap-2.5 w-full">
4949
<label
5050
htmlFor="comment"
51-
className="font-medium text-black3 text-[14px] sm:text-[18px]"
51+
className="font-medium text-black3 text-[16px] sm:text-[18px]"
5252
>
5353
{label} {required && <span className="text-[var(--primary)]"> *</span>}
5454
</label>
@@ -71,7 +71,7 @@ export default function ModalTextarea({
7171
onChange={handleTextareaChange}
7272
className={`
7373
w-full resize-none rounded-md border-none px-4 py-3
74-
text-black3 text-[14px] sm:text-[16px] font:normal
74+
text-black3 text-[16px] sm:text-[18px] font:normal
7575
outline-none bg-transparent overflow-hidden
7676
${small ? "h-[50px]" : "min-h-[110px]"}
7777
`}

‎src/components/modalInput/StatusSelect.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export default function StatusSelect({
6666
return (
6767
<div className="inline-flex flex-col items-start gap-2.5 w-full max-w-[520px]">
6868
{label && (
69-
<p className="text-black3 font-medium text-[14px] sm:text-[18px]">
69+
<p className="text-black3 font-medium text-[16px] sm:text-[18px]">
7070
{label}
7171
{required && <span className="text-[var(--primary)]"> *</span>}
7272
</p>

‎src/components/modalInput/TaskModal.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,14 @@ export default function TaskModal({
6363
});
6464
return (
6565
<div className="fixed inset-0 flex items-center justify-center bg-black/35 z-50">
66-
<div className="sm:w-[584px] w-[327px] h-[calc(var(--vh)_*_90)] rounded-lg bg-white p-4 sm:p-8 shadow-lg flex flex-col gap-4 sm:gap-8 overflow-y-auto">
67-
<h2 className="font-bold text-black3 text-[16px] sm:text-[24px]">
66+
<div className="sm:w-[584px] w-[320px] h-[calc(var(--vh)_*_90)] rounded-lg bg-white p-4 sm:p-8 shadow-lg flex flex-col gap-4 sm:gap-8 overflow-y-auto">
67+
<h2 className="font-bold text-black3 text-[18px] sm:text-[24px]">
6868
{mode === "edit" ? "할 일 수정" : "할 일 생성"}
6969
</h2>
7070

7171
<div className="flex flex-col gap-4 sm:gap-8">
7272
{/* 상태 및 담당자 */}
73-
<div className="flex flex-col sm:flex-row gap-4 text-black3 font-normal text-[14px] sm:text-[16px]">
73+
<div className="flex flex-col sm:flex-row gap-4 text-black3 font-normal text-[16px] sm:text-[18px]">
7474
<StatusSelect
7575
label="상태"
7676
value={formData.status}

‎src/pages/dashboard/[dashboardId]/index.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import LoadingSpinner from "@/components/common/LoadingSpinner";
2424
export default function Dashboard() {
2525
const router = useRouter();
2626
const { user, isInitialized } = useAuthGuard();
27-
const { guard: postGuard, isLoading } = usePostGuard();
27+
const { guard: postGuard } = usePostGuard();
2828

2929
const { dashboardId } = router.query;
3030
const [columns, setColumns] = useState<ColumnType[]>([]);

0 commit comments

Comments
 (0)