Merge latest code from main into server_dashboard and resolve conflicts

This commit is contained in:
2026-04-23 09:35:53 +09:00
30 changed files with 7014 additions and 2186 deletions

View File

@@ -103,13 +103,21 @@
.grid-form.is-view-mode input,
.grid-form.is-view-mode select,
.grid-form.is-view-mode textarea {
border-color: transparent !important;
border: none !important;
background-color: transparent !important;
padding-left: 0;
padding-right: 0;
pointer-events: none;
color: var(--text-main);
font-weight: 500;
padding-left: 0 !important;
padding-right: 0 !important;
pointer-events: none !important;
color: var(--text-main) !important;
font-weight: 500 !important;
appearance: none !important;
-webkit-appearance: none !important;
-moz-appearance: none !important;
box-shadow: none !important;
}
.grid-form.is-view-mode select::-ms-expand {
display: none !important;
}
.grid-form.is-edit-mode input,
@@ -119,6 +127,16 @@
border: 1px solid var(--border-color);
}
/* 수동 수정 불가 필드 (자산번호 등) 전용 스타일 */
.grid-form input[readonly] {
border-color: transparent !important;
background-color: transparent !important;
pointer-events: none !important;
color: var(--text-main) !important;
font-weight: 500 !important;
cursor: default;
}
.grid-form.is-edit-mode input:focus,
.grid-form.is-edit-mode select:focus,
.grid-form.is-edit-mode textarea:focus {