Merge pull request #53 from 4bujak-4bujak/feature/meetingroomQA

Feature/meetingroom qa
4bujak-4bujak · Jun 12, 2024 · 6b78fde · 6b78fde
2 parents 1f9c70c + 54a4ca8
commit 6b78fde
Show file tree

Hide file tree

Showing 5 changed files with 179 additions and 286 deletions.
diff --git a/src/components/home/OfficeNotice.tsx b/src/components/home/OfficeNotice.tsx
@@ -36,7 +36,7 @@ const OfficeNotice: React.FC = () => {
 
   return (
     <>
-      <div className="w-full h-12 mt-7 bg-gray-200 flex items-center gap-[13px] px-[13px] py-[14px] rounded shadow border border-gray-200">
+  <div className="w-full h-12 mt-7 flex items-center gap-[13px] px-[13px] py-[14px] rounded shadow border border-gray-200" style={{ backgroundColor: 'rgb(228, 224, 245)' }}>
         <div>
           <img src="/home/notice.svg" alt="" />
         </div>

diff --git a/src/components/layout/footer/Footer.tsx b/src/components/layout/footer/Footer.tsx
@@ -41,7 +41,7 @@ const Footer = () => {
               )}
             </div>
             <div className="text-center text-black text-xs font-normal font-['Pretendard']">
-              예약/일정
+              예약
             </div>
           </div>
         </Link>

diff --git a/src/components/reservation/meetingRoom/DatePickerModal.tsx b/src/components/reservation/meetingRoom/DatePickerModal.tsx
@@ -330,11 +330,12 @@ const DatePickerModal: React.FC<DatePickerModalProps> = ({
           </div>
         )}
         <div className="pt-[10px] w-full text-center items-center">
-          <button
-            className="absolute bottom-[30px] flex w-[88%] mx-auto h-12 bg-indigo-700 text-white rounded-lg justify-center items-center"
-            onClick={handleConfirm}>
-            확인
-          </button>
+        <button
+          className="absolute bottom-[30px] flex w-[88%] mx-auto h-12 text-white rounded-lg justify-center items-center"
+          style={{ backgroundColor: '#4E32BB' }}
+          onClick={handleConfirm}>
+          확인
+        </button>
         </div>
       </div>
     </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,7 +41,7 @@ const Footer = () => { @@
                   )}
                 </div>
                 <div className="text-center text-black text-xs font-normal font-['Pretendard']">
-                  예약/일정
+                  예약
                 </div>
               </div>
             </Link>
@@ Expand Down @@