diff --git a/public/css/custom.css b/public/css/custom.css index 9f01857..49db7af 100644 --- a/public/css/custom.css +++ b/public/css/custom.css @@ -3,4 +3,94 @@ .display-block { display: block !important; -} \ No newline at end of file +} + +.notice-row td { + color: #DC3545 !important; +} +.notice-row { + background-color: #f8f9fa; +} +.general-row { + background-color: white; + color: black; +} +.clickable-row { + cursor: pointer; +} +.clickable-row:hover { + background-color: #f1f1f1; +} +.new-badge { + font-size: 0.65rem; + padding: 0.2em 0.4em; + vertical-align: middle; +} + + +/* 휴가*/ + +.half-day-buttons { + display: flex; + justify-content: center; + gap: 10px; + margin-top: 20px; + } + .half-day-buttons .btn.active { + border: 2px solid black; + } + .fc-daygrid-day-frame { + min-height: 80px !important; + max-height: 120px !important; + overflow: hidden !important; + padding-top: 25px !important; + } + .fc-daygrid-day-events { + max-height: 100px !important; + overflow-y: auto !important; + } + .fc-daygrid-event { + position: absolute !important; + height: 20px !important; + width: 100% !important; + left: 0 !important; + margin: 2px 0 !important; + padding: 0 !important; + border-radius: 2px !important; + border: none !important; + } + .fc-daygrid-event-harness { + display: flex; + flex-direction: column; + align-items: flex-start; + justify-content: flex-start; + width: 100%; + gap: 22px; + } + .fc-daygrid-event.half-day-am { + width: 45% !important; + left: 0 !important; + } + .fc-daygrid-event.half-day-pm { + width: 45% !important; + left: auto !important; + right: 0 !important; + } + .fc-daygrid-event.full-day { + width: 100% !important; + left: 0 !important; + } + .fc-day-sun .fc-daygrid-day-number, + .fc-col-header-cell:first-child .fc-col-header-cell-cushion { + color: #ff4500 !important; + } + .fc-day-sat .fc-daygrid-day-number, + .fc-col-header-cell:last-child .fc-col-header-cell-cushion { + color: #324fde !important; + } + .fc-daygrid-day-number { + position: absolute !important; + top: 0px !important; + left: 5px !important; + text-align: left !important; + } \ No newline at end of file diff --git a/src/views/board/BoardEdit.vue b/src/views/board/BoardEdit.vue index 3629502..354b75d 100644 --- a/src/views/board/BoardEdit.vue +++ b/src/views/board/BoardEdit.vue @@ -139,8 +139,4 @@ onMounted(() => { color: red; text-align: center; } - -.display-block { - display: block; -} diff --git a/src/views/board/BoardList.vue b/src/views/board/BoardList.vue index 7055c17..59f6e90 100644 --- a/src/views/board/BoardList.vue +++ b/src/views/board/BoardList.vue @@ -188,7 +188,7 @@ const fetchGeneralPosts = async (page = 1) => { if (data?.data) { console.log(data) - const totalPosts = data.data.total; // 전체 게시물 개수 받아오기 (API가 제공해야 함) + const totalPosts = data.data.total; // 전체 게시물 개수 받아오기 generalList.value = data.data.list.map((post, index) => ({ realId: post.id, @@ -260,33 +260,4 @@ onMounted(() => { diff --git a/src/views/AddEventModal.vue b/src/views/vacation/AddEventModal.vue similarity index 71% rename from src/views/AddEventModal.vue rename to src/views/vacation/AddEventModal.vue index 22de25e..321c9e7 100644 --- a/src/views/AddEventModal.vue +++ b/src/views/vacation/AddEventModal.vue @@ -34,22 +34,4 @@ diff --git a/src/views/vacation/VacationManagement.vue b/src/views/vacation/VacationManagement.vue index a5ed61f..ec7db60 100644 --- a/src/views/vacation/VacationManagement.vue +++ b/src/views/vacation/VacationManagement.vue @@ -297,81 +297,6 @@ }); -