+
종일
-
+
($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) => {