diff --git a/frontend/src/components/link/LinkAddModal/LinkAddModal.styled.ts b/frontend/src/components/link/LinkAddModal/LinkAddModal.styled.ts index fc2ab4a9a..159e98d10 100644 --- a/frontend/src/components/link/LinkAddModal/LinkAddModal.styled.ts +++ b/frontend/src/components/link/LinkAddModal/LinkAddModal.styled.ts @@ -40,9 +40,8 @@ export const Container = styled.div<{ `; return css` - width: 496px; - min-height: 320px; - padding: 20px 30px; + width: 400px; + padding: 18px 22px; `; }} @@ -66,7 +65,7 @@ export const IconWrapper = styled.div` justify-content: flex-end; width: 100%; - height: 38px; + height: 34px; margin-bottom: 22px; border-bottom: ${({ theme }) => `1px solid ${theme.color.GRAY300}`}; @@ -75,7 +74,7 @@ export const IconWrapper = styled.div` export const InputContainer = styled.div` display: flex; flex-direction: column; - gap: 10px; + gap: 8px; `; export const ControlButtonWrapper = styled.div` @@ -83,17 +82,24 @@ export const ControlButtonWrapper = styled.div` justify-content: flex-end; width: 100%; - height: 40px; + height: 38px; `; export const submitButton = css` - width: 90px; + width: 80px; + padding: 0; `; export const closeButton = css` - width: 22px; - height: 38px; + width: 28px; + height: 28px; padding: 0; + margin-bottom: 4px; + + svg { + width: 28px; + height: 28px; + } `; export const title = css` @@ -103,5 +109,5 @@ export const title = css` border-radius: 10px; background-color: ${({ theme }) => theme.color.GRAY200}; - font-size: 17px; + font-size: 18px; `; diff --git a/frontend/src/components/link/LinkAddModal/LinkAddModal.tsx b/frontend/src/components/link/LinkAddModal/LinkAddModal.tsx index ea077534a..451e836c2 100644 --- a/frontend/src/components/link/LinkAddModal/LinkAddModal.tsx +++ b/frontend/src/components/link/LinkAddModal/LinkAddModal.tsx @@ -47,7 +47,7 @@ const LinkAddModal = (props: LinkAddModalProps) => {
- + 링크 이름 { /> - + 링크 theme.zIndex.MODAL}; width: 500px; - min-height: 280px; - padding: 20px 30px; + padding: 18px 22px; border-radius: 10px; background-color: ${({ theme }) => theme.color.WHITE}; @@ -30,6 +29,9 @@ export const Backdrop = styled.div` export const Header = styled.div` display: flex; + width: 100%; + height: 34px; + margin-bottom: 18px; border-bottom: ${({ theme }) => `1px solid ${theme.color.GRAY300}`}; `; @@ -39,15 +41,14 @@ export const Body = styled.div` flex-direction: column; height: 100%; - margin-top: 20px; - row-gap: 36px; + row-gap: 22px; & > label { display: flex; flex-direction: column; align-items: center; - row-gap: 36px; + row-gap: 26px; } `; @@ -72,21 +73,26 @@ export const strongContent = css` `; export const closeButton = css` - width: 22px; - height: 38px; - padding: 8px 0; - + width: 28px; + height: 28px; + padding: 0; + margin-bottom: 4px; margin-left: auto; + + svg { + width: 28px; + height: 28px; + } `; export const cancelButton = css` - width: 90px; + width: 80px; background-color: ${({ theme }) => theme.color.GRAY500}; `; export const exitConfirmButton = css` - width: 90px; + width: 80px; background-color: ${({ theme }) => theme.color.RED}; `; diff --git a/frontend/src/components/team/TeamPlaceInfoModal/TeamPlaceInfoModal.styled.ts b/frontend/src/components/team/TeamPlaceInfoModal/TeamPlaceInfoModal.styled.ts index 184707a50..3d31b5db1 100644 --- a/frontend/src/components/team/TeamPlaceInfoModal/TeamPlaceInfoModal.styled.ts +++ b/frontend/src/components/team/TeamPlaceInfoModal/TeamPlaceInfoModal.styled.ts @@ -17,9 +17,9 @@ export const Container = styled.div` right: 20px; z-index: ${({ theme }) => theme.zIndex.MODAL}; - width: 320px; - height: 500px; - padding: 20px 30px; + width: 310px; + max-height: 500px; + padding: 22px; border-radius: 8px; box-shadow: diff --git a/frontend/src/components/team_calendar/DailyScheduleModal/DailyScheduleModal.styled.ts b/frontend/src/components/team_calendar/DailyScheduleModal/DailyScheduleModal.styled.ts index c81bcbeee..3bb0729f5 100644 --- a/frontend/src/components/team_calendar/DailyScheduleModal/DailyScheduleModal.styled.ts +++ b/frontend/src/components/team_calendar/DailyScheduleModal/DailyScheduleModal.styled.ts @@ -16,8 +16,8 @@ export const Container = styled.div<{ $css: CSSProp }>` flex-direction: column; z-index: ${({ theme }) => theme.zIndex.MODAL}; - width: 300px; - height: 338px; + width: 250px; + max-height: 338px; padding: 10px 20px 20px 20px; border-radius: 10px; @@ -118,7 +118,7 @@ export const modalLocation = ( return css` position: absolute; top: ${(row > 3 ? -228 : 0) + 148 + 110 * row}px; - left: ${(column > 3 ? -300 : calendarWidth / 7) + + left: ${(column > 3 ? -250 : calendarWidth / 7) + calendarLeft + (calendarWidth * column) / 7}px; `; diff --git a/frontend/src/components/team_calendar/DailyScheduleModal/DailyScheduleModal.tsx b/frontend/src/components/team_calendar/DailyScheduleModal/DailyScheduleModal.tsx index 6918157b5..6a94b8d34 100644 --- a/frontend/src/components/team_calendar/DailyScheduleModal/DailyScheduleModal.tsx +++ b/frontend/src/components/team_calendar/DailyScheduleModal/DailyScheduleModal.tsx @@ -93,16 +93,12 @@ const DailyScheduleModal = (props: DailyScheduleModalProps) => { onSetModalType(); }} > - - {title} - + {title} ); }) ) : ( - - 등록된 일정이 없습니다. - + 등록된 일정이 없습니다. )} diff --git a/frontend/src/components/team_calendar/ICalendarModal/ICalendarModal.styled.ts b/frontend/src/components/team_calendar/ICalendarModal/ICalendarModal.styled.ts index 585baf5ab..d47da8e46 100644 --- a/frontend/src/components/team_calendar/ICalendarModal/ICalendarModal.styled.ts +++ b/frontend/src/components/team_calendar/ICalendarModal/ICalendarModal.styled.ts @@ -38,14 +38,14 @@ export const Container = styled.div<{ if ($isMobile) return css` width: 300px; - min-height: 180px; + height: 180px; padding: 10px 20px; `; return css` - width: 400px; - min-height: 200px; - padding: 20px; + width: 360px; + height: 190px; + padding: 16px; `; }} @@ -112,7 +112,7 @@ export const UrlWrapper = styled.div` justify-content: center; width: 90%; - height: 40px; + height: 36px; padding: 0 8px; & > div { @@ -129,7 +129,15 @@ export const UserGuideLink = styled.a` `; export const closeButton = css` + width: 28px; + height: 28px; padding: 0; + margin-bottom: 4px; + + svg { + width: 28px; + height: 28px; + } `; export const copyButton = css` diff --git a/frontend/src/components/team_calendar/ICalendarModal/ICalendarModal.tsx b/frontend/src/components/team_calendar/ICalendarModal/ICalendarModal.tsx index 787f656ac..5ca61dcef 100644 --- a/frontend/src/components/team_calendar/ICalendarModal/ICalendarModal.tsx +++ b/frontend/src/components/team_calendar/ICalendarModal/ICalendarModal.tsx @@ -49,7 +49,7 @@ const ICalendarModal = (props: ICalendarModalProps) => { 일정 내보내기 - + setIsTooltipOpen(true)} diff --git a/frontend/src/components/team_calendar/ScheduleAddModal/ScheduleAddModal.styled.ts b/frontend/src/components/team_calendar/ScheduleAddModal/ScheduleAddModal.styled.ts index 36399fa1e..2b1583a0b 100644 --- a/frontend/src/components/team_calendar/ScheduleAddModal/ScheduleAddModal.styled.ts +++ b/frontend/src/components/team_calendar/ScheduleAddModal/ScheduleAddModal.styled.ts @@ -39,9 +39,9 @@ export const Container = styled.div<{ `; return css` - width: 496px; - min-height: 380px; - padding: 20px 30px; + width: 400px; + min-height: 320px; + padding: 18px 22px; `; }} @@ -56,7 +56,7 @@ export const Container = styled.div<{ display: flex; flex-direction: column; - row-gap: ${({ $isMobile }) => ($isMobile ? '10px' : '20px')}; + row-gap: ${({ $isMobile }) => ($isMobile ? '10px' : '16px')}; } `; @@ -65,14 +65,15 @@ export const Header = styled.div` justify-content: flex-end; width: 100%; - margin-bottom: 22px; + height: 34px; + margin-bottom: 18px; border-bottom: ${({ theme }) => `1px solid ${theme.color.GRAY300}`}; `; export const TitleWrapper = styled.div` width: 100%; - height: 44px; + height: 38px; `; export const InnerContainer = styled.div` @@ -86,6 +87,7 @@ export const InnerContainer = styled.div` export const CheckboxContainer = styled.div` display: flex; align-items: center; + justify-content: flex-end; column-gap: 8px; `; @@ -114,7 +116,7 @@ export const InputWrapper = styled.div<{ $isMobile: boolean }>` align-items: center; justify-content: space-between; - width: ${({ $isMobile }) => !$isMobile && 'calc(100% - 100px)'}; + width: ${({ $isMobile }) => !$isMobile && 'calc(100% - 80px)'}; margin-left: ${({ $isMobile }) => !$isMobile && 'auto'}; `; @@ -133,7 +135,7 @@ export const ControlButtonWrapper = styled.div` justify-content: flex-end; width: 100%; - height: 40px; + height: 38px; `; export const title = css` @@ -143,14 +145,19 @@ export const title = css` border-radius: 10px; background-color: ${({ theme }) => theme.color.GRAY200}; - font-size: 20px; + font-size: 18px; `; export const closeButton = css` - width: 22px; - height: 38px; - padding: 8px 0; + width: 28px; + height: 28px; + padding: 0; margin-bottom: 4px; + + svg { + width: 28px; + height: 28px; + } `; export const timetableButton = css` @@ -177,5 +184,6 @@ export const teamPlaceName = css` `; export const submitButton = css` - width: 90px; + width: 80px; + padding: 0; `; diff --git a/frontend/src/components/team_calendar/ScheduleAddModal/ScheduleAddModal.tsx b/frontend/src/components/team_calendar/ScheduleAddModal/ScheduleAddModal.tsx index fcc46f808..54de44fa4 100644 --- a/frontend/src/components/team_calendar/ScheduleAddModal/ScheduleAddModal.tsx +++ b/frontend/src/components/team_calendar/ScheduleAddModal/ScheduleAddModal.tsx @@ -76,7 +76,7 @@ const ScheduleAddModal = (props: ScheduleAddModalProps) => { - + 일정 시작 @@ -101,7 +101,7 @@ const ScheduleAddModal = (props: ScheduleAddModalProps) => { - + 일정 마감 @@ -126,10 +126,14 @@ const ScheduleAddModal = (props: ScheduleAddModalProps) => { - + 종일 - +

($isMobile ? '10px' : '20px')}; + row-gap: ${({ $isMobile }) => ($isMobile ? '10px' : '16px')}; } `; @@ -65,14 +65,15 @@ export const Header = styled.div` justify-content: flex-end; width: 100%; - margin-bottom: 22px; + height: 34px; + margin-bottom: 18px; border-bottom: ${({ theme }) => `1px solid ${theme.color.GRAY300}`}; `; export const TitleWrapper = styled.div` width: 100%; - height: 44px; + height: 38px; `; export const InnerContainer = styled.div` @@ -86,6 +87,7 @@ export const InnerContainer = styled.div` export const CheckboxContainer = styled.div` display: flex; align-items: center; + justify-content: flex-end; column-gap: 8px; `; @@ -114,7 +116,7 @@ export const InputWrapper = styled.div<{ $isMobile: boolean }>` align-items: center; justify-content: space-between; - width: ${({ $isMobile }) => !$isMobile && 'calc(100% - 100px)'}; + width: ${({ $isMobile }) => !$isMobile && 'calc(100% - 80px)'}; margin-left: ${({ $isMobile }) => !$isMobile && 'auto'}; `; @@ -133,7 +135,7 @@ export const ControlButtonWrapper = styled.div` justify-content: flex-end; width: 100%; - height: 40px; + height: 38px; `; export const title = css` @@ -143,14 +145,19 @@ export const title = css` border-radius: 10px; background-color: ${({ theme }) => theme.color.GRAY200}; - font-size: 20px; + font-size: 18px; `; export const closeButton = css` - width: 22px; - height: 38px; - padding: 8px 0; + width: 28px; + height: 28px; + padding: 0; margin-bottom: 4px; + + svg { + width: 28px; + height: 28px; + } `; export const dateTimeLocalInput = css` @@ -169,5 +176,6 @@ export const teamPlaceName = css` `; export const submitButton = css` - width: 90px; + width: 80px; + padding: 0; `; diff --git a/frontend/src/components/team_calendar/ScheduleEditModal/ScheduleEditModal.tsx b/frontend/src/components/team_calendar/ScheduleEditModal/ScheduleEditModal.tsx index 8071f45ec..d00d71c12 100644 --- a/frontend/src/components/team_calendar/ScheduleEditModal/ScheduleEditModal.tsx +++ b/frontend/src/components/team_calendar/ScheduleEditModal/ScheduleEditModal.tsx @@ -74,7 +74,7 @@ const ScheduleEditModal = (props: ScheduleEditModalProps) => { - + 일정 시작 @@ -98,7 +98,7 @@ const ScheduleEditModal = (props: ScheduleEditModalProps) => { - + 일정 마감 @@ -123,10 +123,14 @@ const ScheduleEditModal = (props: ScheduleEditModalProps) => { - + 종일 - + diff --git a/frontend/src/components/team_calendar/ScheduleModal/ScheduleModal.stories.tsx b/frontend/src/components/team_calendar/ScheduleModal/ScheduleModal.stories.tsx index 20cd26398..d694b35a8 100644 --- a/frontend/src/components/team_calendar/ScheduleModal/ScheduleModal.stories.tsx +++ b/frontend/src/components/team_calendar/ScheduleModal/ScheduleModal.stories.tsx @@ -1,11 +1,12 @@ import type { Meta, StoryObj } from '@storybook/react'; +import Button from '~/components/common/Button/Button'; import ScheduleModal from '~/components/team_calendar/ScheduleModal/ScheduleModal'; import { useModal } from '~/hooks/useModal'; -import { arrayOf } from '~/utils/arrayOf'; const meta = { title: 'Schedule/ScheduleModal', component: ScheduleModal, + tags: ['autodocs'], } satisfies Meta; export default meta; @@ -15,19 +16,9 @@ type Story = StoryObj; const SampleModal = () => { const { openModal } = useModal(); - const handleOpen = () => { - openModal(); - }; - return ( <> - {arrayOf(5).map((_, index) => { - return ( -

handleOpen()}> - 모달 열기 -
- ); - })} + ` position: absolute; flex-direction: column; z-index: ${({ theme }) => theme.zIndex.MODAL}; - gap: 28px; + gap: 16px; ${({ $isMobile }) => { if ($isMobile) @@ -16,9 +16,8 @@ export const Container = styled.div<{ $css: CSSProp; $isMobile: boolean }>` `; return css` - width: 551px; - height: 272px; - padding: 20px 30px 30px 40px; + width: 446px; + padding: 18px 22px; `; }} @@ -56,6 +55,8 @@ export const MenuContainer = styled.div` display: flex; align-items: center; justify-content: space-around; + + gap: 6px; `; export const PeriodWrapper = styled.div<{ $isMobile: boolean }>` @@ -88,13 +89,17 @@ export const menuIcon = css` align-items: center; justify-content: center; - width: 42px; - height: 42px; - + width: 28px; + height: 28px; padding: 0; border-radius: 8px; + svg { + width: 28px; + height: 28px; + } + &:hover { background-color: ${({ theme }) => theme.color.GRAY100}; } @@ -106,13 +111,12 @@ export const closeButton = ($isMobile: boolean) => css` align-items: center; align-self: flex-end; - width: 96px; + width: 80px; height: 42px; ${$isMobile && css` margin-right: 10px; `} - padding: 10px 30px; cursor: pointer; `; @@ -137,11 +141,11 @@ export const modalLocation = ( if (calendarSize === 'md') return css` position: absolute; - top: ${(row < 3 ? 92 : -199) + (row + 1) * 110 + level * 18}px; + top: ${(row < 3 ? 92 : -128) + (row + 1) * 110 + level * 18}px; left: ${(column > 3 - ? calendarWidth / 7 - 550 + ? calendarWidth / 7 - 446 : column === 3 - ? calendarWidth / 14 - 275 + ? calendarWidth / 14 - 223 : 0) + calendarLeft + (calendarWidth * column) / 7}px; diff --git a/frontend/src/components/team_calendar/ScheduleModal/ScheduleModal.tsx b/frontend/src/components/team_calendar/ScheduleModal/ScheduleModal.tsx index 04487c776..c6f7807a5 100644 --- a/frontend/src/components/team_calendar/ScheduleModal/ScheduleModal.tsx +++ b/frontend/src/components/team_calendar/ScheduleModal/ScheduleModal.tsx @@ -111,7 +111,7 @@ const ScheduleModal = (props: ScheduleModalProps) => {
diff --git a/frontend/src/components/team_calendar/TimeTableMenu/TimeTableMenu.styled.ts b/frontend/src/components/team_calendar/TimeTableMenu/TimeTableMenu.styled.ts index 7b6b4ee11..4a6a3007e 100644 --- a/frontend/src/components/team_calendar/TimeTableMenu/TimeTableMenu.styled.ts +++ b/frontend/src/components/team_calendar/TimeTableMenu/TimeTableMenu.styled.ts @@ -1,7 +1,7 @@ import { css } from 'styled-components'; export const timeTableButton = ($isMobile: boolean) => css` - width: ${$isMobile ? '100px' : '150px'}; + width: ${$isMobile ? '100px' : '130px'}; height: 40px; border: 1px solid ${({ theme }) => theme.color.GRAY200};