Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/meetingroom qa #53

Merged
merged 6 commits into from
Jun 12, 2024
Merged

Feature/meetingroom qa #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
79d81ce
fix: 공지사항 background color
jiohjung98 Jun 12, 2024
9d9d1da
fix: 네브바 예약 텍스트 변경
jiohjung98 Jun 12, 2024
dc1299b
fix: 모달 예약 버튼 background color
jiohjung98 Jun 12, 2024
a914dd2
fix: 체크박스 border none
jiohjung98 Jun 12, 2024
07ed142
fix: 구분선 width 100%
jiohjung98 Jun 12, 2024
54a4ca8
Merge branch 'develop' of https://github.com/4bujak-4bujak/frontend i…
jiohjung98 Jun 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/home/OfficeNotice.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/components/layout/footer/Footer.tsx
View file
Open in desktop
Original file line number Diff 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
11 changes: 6 additions & 5 deletions src/components/reservation/meetingRoom/DatePickerModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading
Loading