Skip to content

Commit 9eb3d2c

Browse files
authored
Merge pull request #180 from part3-4team-Taskify/feature/Gnb
[Style] edit: 태블릿, 모바일에서 구성원, 초대 내역 텍스트 이탈 문제 수정
2 parents 669f43b + b0bf586 commit 9eb3d2c

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

src/components/table/InviteRecords.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ const InviteRecords = ({ dashboardId }: { dashboardId: string }) => {
100100
};
101101

102102
return (
103-
<div className="lg:w-[620px] lg:h-[404px] w-[284px] h-[337px] sm:w-[544px] sm:h-[404px] relative p-6 rounded-lg bg-white">
103+
<div className="lg:w-[620px] w-[284px] sm:w-[544px] min:h-[337px] sm:h-[430px] relative p-6 rounded-lg bg-white">
104104
<div className="flex justify-between items-start sm:items-center">
105105
{/* 제목 */}
106106
<p className="md:text-[24px] text-[20px] text-xl font-bold">

src/components/table/TablePagination.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ const Pagination: React.FC<PaginationProps> = ({
2222
<button
2323
onClick={onPrev}
2424
disabled={currentPage === 1}
25-
className={`w-9 sm:w-10 h-9 sm:h-10 flex justify-center items-center border-r border-gray-300 hover:bg-gray-100
26-
${currentPage === 1 ? "opacity-50 cursor-not-allowed" : "cursor-pointer"}`}
25+
className={`w-9 sm:w-10 h-9 sm:h-10 flex justify-center items-center border-r border-gray-300
26+
${currentPage === 1 ? "opacity-50 cursor-not-allowed" : "cursor-pointer hover:bg-gray-100"}`}
2727
>
2828
<img
2929
src="/svgs/arrow_backward_white.svg"

src/components/table/member/MemberList.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ const MemberList: React.FC<HeaderBebridgeProps> = ({ dashboardId }) => {
6262
}, [dashboardId]);
6363

6464
return (
65-
<div className="lg:w-[620px] lg:h-[404px] w-[284px] h-[337px] sm:w-[544px] sm:h-[404px] relative p-6 rounded-lg bg-white">
65+
<div className="lg:w-[620px] lg:h-[404px] w-[284px] min:h-[337px] sm:w-[544px] sm:h-[404px] relative p-6 rounded-lg bg-white">
6666
<div className="flex justify-between items-center">
6767
<p className="text-xl sm:text-2xl font-bold">구성원</p>
6868
<Pagination

src/pages/dashboard/[dashboardId]/edit.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ export default function EditDashboard() {
100100
<InviteRecords dashboardId={dashboardIdString || ""} />{" "}
101101
{/* undefined일 경우 빈 문자열로 전달*/}
102102
</div>
103-
<div className="flex mt-15 sm:mt-0 ml-6">
103+
<div className="flex mt-6 sm:mt-0">
104104
<button
105105
onClick={openModal}
106106
className="text-base sm:text-lg cursor-pointer w-[284px] h-[52px] sm:w-[320px] sm:h-[62px] text-black3 rounded-[8px] border-[1px] border-[var(--color-gray3)] hover:scale-105 transition-transform duration-200"

0 commit comments

Comments
 (0)