From f71651729ef3a1f34fb2104b43567b49f6966a43 Mon Sep 17 00:00:00 2001 From: dyhj625 Date: Tue, 25 Feb 2025 14:09:31 +0900 Subject: [PATCH 1/8] =?UTF-8?q?=ED=9C=B4=EA=B0=80css=20=EC=88=98=EC=A0=95?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/custom.css | 99 ++++++++++++++++++--- public/vendor/css/core.css | 4 +- src/components/button/HalfDayButtons.vue | 3 +- src/components/modal/VacationGrantModal.vue | 88 ++---------------- src/components/modal/VacationModal.vue | 93 ++----------------- src/views/vacation/VacationManagement.vue | 23 +++-- 6 files changed, 121 insertions(+), 189 deletions(-) diff --git a/public/css/custom.css b/public/css/custom.css index c4bb01d..af34e46 100644 --- a/public/css/custom.css +++ b/public/css/custom.css @@ -7,42 +7,121 @@ /* 휴가 */ -.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-events { max-height: 100px !important; overflow-y: auto !important; } - +/* 이벤트 선 없게 */ .fc-event { border: none; } +/* 오전전반차 그래프 */ .fc-daygrid-event.half-day-am { width: calc(50% - 4px) !important; } +/* 오후반차 그래프프 */ .fc-daygrid-event.half-day-pm { width: calc(50% - 4px) !important; margin-left: auto !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: #6076e0 !important; } +/* 캘린더 날짜 왼쪽 상단 위치하게 */ .fc-daygrid-day-number { margin-right: auto; } +/* 데이트피커 뾰족없게게 */ +.flatpickr-calendar:before, +.flatpickr-calendar:after { + display: none !important; +} + +/* 본인 모달 */ + +/* 닫기 버튼 */ +.close-btn { + position: absolute; + top: 10px; + right: 10px; + background: none; + border: none; + font-size: 18px; + cursor: pointer; +} +/* 리스트 아이템 */ +.vacation-item { + display: flex; + align-items: center; + font-size: 16px; + font-weight: bold; + margin-bottom: 8px; + padding: 5px 10px; + border-radius: 5px; + background: #f9f9f9; +} +/* 모달 본문 스크롤 */ +.modal-body { + max-height: 130px; + overflow-y: auto; +} + +/* 선물하기 모달 */ + +/* 연차 개수 버튼 */ +.count-btn { + font-size: 18px; + padding: 2px 10px; + border: none; + background: #2C3E50; + color: white; + border-radius: 5px; + cursor: pointer; +} +.count-btn:hover { + background: #1d2c44; +} +.count-btn:disabled { + background: #cccccc; + cursor: not-allowed; +} + +/* 버튼 컨테이너 (우측 정렬) */ +.custom-button-container { + display: flex; + justify-content: flex-end; + align-items: center; +} +/* 버튼 기본 스타일 */ +.custom-button { + background: none; /* 배경색 없음 */ + border: none; /* 테두리 없음 */ + padding: 10px; /* 크기 조정 */ + cursor: pointer; /* 클릭 가능하도록 변경 */ +} + +/* 아이콘 색상 변경 (기본) */ +.custom-button i { + color: #282538; /* 기본 아이콘 색상 */ + font-size: 25px; /* 아이콘 크기 */ +} + +/* 버튼 호버 효과 */ +.custom-button:hover i { + color: #007BFF; /* 호버 시 아이콘 색상 변경 (파란색) */ +} + + + + .grayscaleImg { filter: grayscale(100%); diff --git a/public/vendor/css/core.css b/public/vendor/css/core.css index 48dd4cf..bf84231 100644 --- a/public/vendor/css/core.css +++ b/public/vendor/css/core.css @@ -14820,8 +14820,8 @@ body { font-size: 1.1em; line-height: 1; -webkit-user-select: none; - -moz-user-select: none; - user-select: none; + -moz-user-select: none; + user-select: none; } .ui-star + .ui-star { margin-left: -0.1em; diff --git a/src/components/button/HalfDayButtons.vue b/src/components/button/HalfDayButtons.vue index 83f4c35..8c77ed2 100644 --- a/src/components/button/HalfDayButtons.vue +++ b/src/components/button/HalfDayButtons.vue @@ -1,5 +1,6 @@ diff --git a/src/stores/voteDetail.js b/src/stores/voteDetail.js deleted file mode 100644 index 20696d4..0000000 --- a/src/stores/voteDetail.js +++ /dev/null @@ -1,15 +0,0 @@ -import { defineStore } from "pinia"; - -export const useVoteStore = defineStore("vote", { - state: () => ({ - selectedVote: {} - }), - actions: { - setVoteData(data) { - this.selectedVote = data; - }, - clearVoteData() { - this.selectedVote = {}; - } - } -}); diff --git a/src/views/voteboard/voteBoardList.vue b/src/views/voteboard/voteBoardList.vue index 8334dd4..ffca12a 100644 --- a/src/views/voteboard/voteBoardList.vue +++ b/src/views/voteboard/voteBoardList.vue @@ -50,7 +50,6 @@ import $api from '@api'; import Quill from 'quill'; import WriteBtn from '@c/button/WriteBtn.vue'; import voteList from '@c/voteboard/voteCardList.vue'; -import { useVoteStore } from '@s/voteDetail'; import { useRouter } from 'vue-router'; const toastStore = useToastStore(); @@ -69,11 +68,8 @@ const router = useRouter(); onMounted(async () => { getvoteList(); }); -const voteStore = useVoteStore(); //글작성 const voteWrite = () => { - voteStore.setVoteData(selectedVote.value); - console.log("Pinia 상태 업데이트됨:", voteStore.selectedVote); router.push('/voteboard/write'); }; diff --git a/src/views/voteboard/voteboardWrite.vue b/src/views/voteboard/voteboardWrite.vue index 62584b2..efd4f32 100644 --- a/src/views/voteboard/voteboardWrite.vue +++ b/src/views/voteboard/voteboardWrite.vue @@ -17,7 +17,8 @@ name="title" :is-essential="true" :is-alert="titleAlert" - :v-model="title" + v-model="title" + @keyup="ValidHandler('title')" /> -
- +
+ - - + @keyup="ValidHandler('content' + (index + 1))" + /> +
+ + +
+