merge: main 브랜치의 최신 변경 사항 병합 및 충돌 해결

This commit is contained in:
2026-04-17 15:37:57 +09:00
50 changed files with 8265 additions and 1187 deletions

View File

@@ -47,13 +47,21 @@
}
.modal-header .btn-icon {
color: var(--white);
opacity: 0.8;
transition: opacity 0.2s;
color: #FFFFFF !important;
cursor: pointer;
background: none !important;
border: none !important;
}
.modal-header .btn-icon i,
.modal-header .btn-icon svg {
width: 20px !important; /* Original natural size */
height: 20px !important;
stroke: #FFFFFF !important;
}
.modal-header .btn-icon:hover {
opacity: 1;
background: none !important;
}
.modal-body {
@@ -270,3 +278,78 @@
color: var(--text-muted);
font-size: 0.8125rem;
}
/* Dashboard Detail Modal Table Fixed Header */
#dashboard-detail-modal .modal-body {
overflow-y: auto;
max-height: calc(80vh - 120px);
padding: 0;
}
/* 모달 내부의 table-container 기존 전역 스타일 무력화 */
#dashboard-detail-modal .table-container {
border: none;
border-radius: 0;
box-shadow: none;
max-height: none;
overflow: visible;
}
#dashboard-detail-modal table {
width: 100%;
border-collapse: separate;
border-spacing: 0;
}
#dashboard-detail-modal thead th {
position: sticky;
top: 0;
background-color: var(--bg-light);
z-index: 10;
border-bottom: 2px solid var(--border-color);
box-shadow: none;
padding: 0.75rem 1rem;
font-size: 0.8125rem;
font-weight: 600;
color: var(--text-main);
text-align: left;
white-space: nowrap;
}
#dashboard-detail-modal tbody td {
padding: 0.75rem 1rem;
border-bottom: 1px solid var(--border-color);
font-size: 0.8125rem;
color: var(--text-main);
white-space: nowrap;
}
#dashboard-detail-modal tbody tr:last-child td {
border-bottom: none;
}
#dashboard-detail-modal tbody tr:hover {
background-color: var(--bg-light);
}
/* 뱃지 스타일 (대시보드 상세 목록용) */
#dashboard-detail-modal .badge {
display: inline-block;
padding: 0.125rem 0.5rem;
border-radius: 4px;
font-size: 0.75rem;
font-weight: 500;
line-height: 1.5;
}
#dashboard-detail-modal .badge-outline {
border: 1px solid var(--primary-color);
color: var(--primary-color);
background: var(--primary-light);
}
#dashboard-detail-modal .badge-sw {
border: 1px solid #3b82f6;
color: #3b82f6;
background: #eff6ff;
}