Merge branch 'style'

This commit is contained in:
dyhj625 2025-03-11 10:48:38 +09:00
commit 8135926150
4 changed files with 70 additions and 90 deletions

View File

@ -108,7 +108,6 @@ cursor: not-allowed !important;
.vac-modal-content { .vac-modal-content {
background: #fff; background: #fff;
padding: 20px; padding: 20px;
border-radius: 8px;
box-shadow: 0px -4px 5px rgba(0, 0, 0, 0.1), box-shadow: 0px -4px 5px rgba(0, 0, 0, 0.1),
0px 4px 0px rgba(0, 0, 0, 0); 0px 4px 0px rgba(0, 0, 0, 0);
max-width: 500px; max-width: 500px;
@ -229,21 +228,7 @@ cursor: not-allowed !important;
/* 오전/오후반차,저장버튼 */ /* 오전/오후반차,저장버튼 */
/* 버튼 기본 스타일 */ /* 버튼 기본 스타일 */
.vac-btn { .vac-btn {
width: 60px;
height: 60px;
border-radius: 50%;
font-size: 20px;
display: flex;
align-items: center;
justify-content: center;
transition: all 0.2sease-in-out; transition: all 0.2sease-in-out;
display: inline-block;
font-weight: 400;
line-height: 1.53;
color: #697a8d;
text-align: center;
vertical-align: middle;
cursor: pointer;
border: 1px solid transparent; border: 1px solid transparent;
} }
/* 마우스를 올렸을 때 */ /* 마우스를 올렸을 때 */
@ -286,17 +271,9 @@ cursor: not-allowed !important;
} }
/* 버튼 기본 (비활성화일 때 기본 녹색) */ /* 버튼 기본 (비활성화일 때 기본 녹색) */
.vac-btn-success { .vac-btn-success {
font-size: 24px;
width: 60px;
height: 60px;
border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out;
background-color: #871919 !important; background-color: #871919 !important;
color: white; color: white;
cursor: pointer;
border: 1px solid transparent; border: 1px solid transparent;
} }
/* 버튼 활성화 */ /* 버튼 활성화 */
@ -309,7 +286,6 @@ cursor: not-allowed !important;
} }
/* 버튼 비활성화 */ /* 버튼 비활성화 */
.vac-btn-success.disabled { .vac-btn-success.disabled {
border: 3px solid #e6e4e4; /* 붉은색 테두리 적용 */
background-color: #bbb8b8 !important; background-color: #bbb8b8 !important;
color: white !important; color: white !important;
cursor: not-allowed !important; cursor: not-allowed !important;

View File

@ -1,29 +1,32 @@
<template> <template>
<div class="menu gap-4 justify-content-center mt-5"> <div class="row gx-2 mb-4">
<div class="col-4">
<div class="ratio ratio-1x1">
<!-- 오전 반차 버튼 --> <!-- 오전 반차 버튼 -->
<button <button class="vac-btn vac-btn-warning rounded-circle d-flex align-items-center justify-content-center" :class="{ active: halfDayType === 'AM' }"
class="vac-btn vac-btn-warning" @click="toggleHalfDay('AM')">
:class="{ active: halfDayType === 'AM' }"
@click="toggleHalfDay('AM')"
>
<i class="bi bi-sun"></i> <i class="bi bi-sun"></i>
</button> </button>
</div>
</div>
<div class="col-4">
<div class="ratio ratio-1x1">
<!-- 오후 반차 버튼 --> <!-- 오후 반차 버튼 -->
<button <button class="vac-btn vac-btn-info rounded-circle d-flex align-items-center justify-content-center" :class="{ active: halfDayType === 'PM' }"
class="vac-btn vac-btn-info" @click="toggleHalfDay('PM')">
:class="{ active: halfDayType === 'PM' }"
@click="toggleHalfDay('PM')"
>
<i class="bi bi-moon"></i> <i class="bi bi-moon"></i>
</button> </button>
<!-- 저장 버튼 --> </div>
<div class="save-button-container"> </div>
<button class="vac-btn-success" @click="addVacationRequests" <div class="col-4">
<div class="ratio ratio-1x1">
<button class="vac-btn-success rounded-circle d-flex align-items-center justify-content-center" @click="addVacationRequests"
:class="{ active: !isDisabled, disabled: isDisabled }"> :class="{ active: !isDisabled, disabled: isDisabled }">
</button> </button>
</div> </div>
</div> </div>
</div>
</template> </template>
<script setup> <script setup>

View File

@ -1,15 +1,16 @@
<template> <template>
<div class="card-body d-flex justify-content-center m-n5"> <div class="">
<ul class="profile-list"> <ul class="row gx-2 mb-2 list-inline">
<li <li
v-for="(user, index) in sortedUserList" v-for="(user, index) in sortedUserList"
:key="index" :key="index"
class="profile-item" class="col-4 mb-3"
:class="{ newRow: (index + 1) % 4 === 0 }" :class="{ newRow: (index + 1) % 4 === 0 }"
@click="$emit('profileClick', user)" @click="$emit('profileClick', user)"
data-bs-placement="top" data-bs-placement="top"
:aria-label="user.MEMBERSEQ" :aria-label="user.MEMBERSEQ"
> >
<div class="ratio ratio-1x1 mb-2">
<img <img
class="rounded-circle profile-img" class="rounded-circle profile-img"
:src="getUserProfileImage(user.MEMBERPRF)" :src="getUserProfileImage(user.MEMBERPRF)"
@ -18,6 +19,7 @@
@error="setDefaultImage" @error="setDefaultImage"
@load="showImage" @load="showImage"
/> />
</div>
<span class="mt-2 text-sm-center d-block fs-6 remaining-vacation"> <span class="mt-2 text-sm-center d-block fs-6 remaining-vacation">
{{ remainingVacationData[user.MEMBERSEQ] || 0 }} {{ remainingVacationData[user.MEMBERSEQ] || 0 }}
</span> </span>
@ -110,9 +112,7 @@ if (windowWidth.value >= 1850) {
}); });
const getDynamicStyle = (user) => ({ const getDynamicStyle = (user) => ({
width: profileSize.value, borderWidth: "2px",
height: profileSize.value,
borderWidth: "4px",
borderColor: user.usercolor || "#ccc", borderColor: user.usercolor || "#ccc",
borderStyle: "solid", borderStyle: "solid",
}); });

View File

@ -3,9 +3,10 @@
<div class="card app-calendar-wrapper"> <div class="card app-calendar-wrapper">
<div class="row g-0"> <div class="row g-0">
<!-- Sidebar: 사이드바 영역 --> <!-- Sidebar: 사이드바 영역 -->
<div class="col-3 app-calendar-sidebar border-end" id="app-calendar-sidebar"> <div class="col-3 border-end text-center" id="app-calendar-sidebar">
<div class="sidebar-content"> <div>
<div class="sidebar-actions text-center my-3">
<div class="card-body">
<HalfDayButtons <HalfDayButtons
ref="halfDayButtonsRef" ref="halfDayButtonsRef"
@toggleHalfDay="toggleHalfDay" @toggleHalfDay="toggleHalfDay"
@ -13,11 +14,11 @@
:isDisabled="!hasChanges" :isDisabled="!hasChanges"
:selectedDate="selectedDate" :selectedDate="selectedDate"
/> />
</div>
<ProfileList <ProfileList
@profileClick="handleProfileClick" @profileClick="handleProfileClick"
:remainingVacationData="remainingVacationData" :remainingVacationData="remainingVacationData"
/> />
</div>
<VacationModal <VacationModal
v-if="isModalOpen" v-if="isModalOpen"
:isOpen="isModalOpen" :isOpen="isModalOpen"