Merge pull request #65 from PLADI-ALM/feat/PDW-14-booking-resource

[PDW-14] fix: 자원 예약 화면 내 WhiteContainer로 수정
PLADI-ALM · Oct 11, 2023 · 2d3dcb0 · 2d3dcb0
2 parents 4d70c04 + f5865de
commit 2d3dcb0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/components/officeBooking/BookingTimeBar.js b/src/components/officeBooking/BookingTimeBar.js
@@ -13,7 +13,6 @@ var endT = -1;
 
 export const BookingContentContainer = styled.div`
     margin-left: 40px;
-    padding: 40px 0 0 0;
     display: flex;
 `
 
@@ -37,7 +36,7 @@ export const RequestButtonContainer = styled.div`
 export const RequestBookingButton = styled.button`
     border: none;
     padding: 5px 10px;
-    margin-right: 45px;
+    margin-right: 55px;
     margin-top: 15px;
     background: #8741CB;
     color: #FFF;

diff --git a/src/pages/booking/resourceBooking/ResourceBooking.js b/src/pages/booking/resourceBooking/ResourceBooking.js
@@ -10,22 +10,26 @@ import { SubTitleContainer, MainTextContainer, SubTextContainer, SelectedSubTitl
 import { BookingPurposeContainer, BookingCapsuleContainer, BookingPurposeTextFieldContainer } from 'components/officeBooking/BookingPurpose';
 import ResourceInfo from 'components/resourceInfo/ResourceInfo';
 import { BookingContentContainer, RequestButtonContainer, RequestBookingButton } from 'components/officeBooking/BookingTimeBar';
-import { RightContainer } from 'components/rightContainer/RightContainer';
+import { RightContainer, WhiteContainer } from 'components/rightContainer/RightContainer';
 import 'react-calendar/dist/Calendar.css';
 import styles from "../resourceBooking/CustomCalendar.css";
 
 var startDate = '';
 var endDate = '';
 
+const CustomWhiteContainer = styled(WhiteContainer)`
+    display: block;
+`
+
 export const TitleText = styled.p`
     color: #4C4C4C;
     font-family: NanumSquare_ac;
     font-size: 32px;
     font-style: normal;
     font-weight: 700;
     align: left;
-    width: 200px;
-    margin-bottom: 10px;
+    display: flex;
+    margin: 0 0 10px 10px;
 `
 
 export const ContentContainer = styled.div`
@@ -136,7 +140,7 @@ function ResourceBooking(props) {
     return <RightContainer>
         <TitleText>자원 예약</TitleText>
 
-        <ContentContainer>
+        <CustomWhiteContainer>
 
             <SubTitleContainer>
                 <MainTextContainer>
@@ -192,7 +196,7 @@ function ResourceBooking(props) {
                 <BookingPurposeTextFieldContainer>
                     <PurposeTextarea id='bookingPurpose'
                         cols='135'
-                        rows='5'
+                        rows='4'
                         maxLength='100' />
                 </BookingPurposeTextFieldContainer>
             </BookingPurposeContainer>
@@ -203,7 +207,7 @@ function ResourceBooking(props) {
             </RequestButtonContainer>
 
 
-        </ContentContainer>
+        </CustomWhiteContainer>
     </RightContainer>
 }
 export default ResourceBooking;