itfirst/sake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fo bo 머지작업 - 오류수정

Browse Source
This commit is contained in:
jazz
2025-11-28 11:32:34 +09:00
parent 03a5491ed2
commit daef889533
4 changed files with 195 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/main/resources/static/admin/css/style.css
View File

@@ -1673,7 +1673,7 @@ gap-0 {
width: 13px;
height: 13px;
}
.icon_word-badge08 {
.icon_word-badge08, .icon_word-badge_naver {
background-image: url("../images/icon_word-badge08.png");
width: 13px;
height: 13px;
@@ -1683,6 +1683,81 @@ gap-0 {
width: 13px;
height: 13px;
}
.icon_word-badge10 {
background-image: url("../images/icon_word-badge10.png");
width: 18px;
height: 18px;
}
.icon_word-badge11 {
background-image: url("../images/icon_word-badge11.png");
width: 18px;
height: 18px;
}
.icon_word-badge12 {
background-image: url("../images/icon_word-badge12.png");
width: 13px;
height: 13px;
}
.icon_word-badge13 {
background-image: url("../images/icon_word-badge13.png");
width: 13px;
height: 13px;
}
.icon_word-badge14 {
background-image: url("../images/icon_word-badge14.png");
width: 13px;
height: 13px;
}
.icon_word-badge15 {
background-image: url("../images/icon_word-badge15.png");
width: 18px;
height: 18px;
}
.icon_word-badge16 {
background-image: url("../images/icon_word-badge16.png");
width: 13px;
height: 13px;
}
.icon_word-badge_kcp {
background-image: url("../images/icon_word-badge_kcp.png");
width: 14px;
height: 14px;
}
.icon_word-badge_pos {
background-image: url("../images/icon_word-badge_pos.png");
width: 26px;
height: 14px;
}
.icon_word-badge_payco {
background-image: url("../images/icon_word-badge_payco.png");
width: 14px;
height: 14px;
}
.icon_word-badge_toss {
background-image: url("../images/icon_word-badge_toss.png");
width: 14px;
height: 14px;
}
.icon_word-badge_gcpay {
background-image: url("../images/icon_word-badge_gcpay.png");
width: 14px;
height: 14px;
}
.icon_word-badge_kakao {
background-image: url("../images/icon_word-badge_kakao.png");
width: 14px;
height: 14px;
}
.icon_word-badge-mileage {
background-image: url("../images/icon_word-badge-mileage.png");
width: 14px;
height: 14px;
}
.icon_word-badge-point {
background-image: url("../images/icon_word-badge-point.png");
width: 14px;
height: 14px;
}
.icon_gift-badge {
background-image: url("../images/icon_gift-badge.png");
width: 14px;

171
src/main/resources/static/mngr/css/style.css
View File

@@ -6445,23 +6445,27 @@ main {
}
}
.text-order-recept {
color: #DA6525;
color: #E3A600;
}
.text-order-confirm {
color: #EA8729;
color: #7CB614;
}
.text-order-prep {
color: #ECB22A;
color: #27A40E;
}
.text-order-export {
color: #3061C2;
}
.text-order-delivery {
color: #3CAB50;
color: #8B41B7;
}
.text-order-complete {
color: #1c7ed6;
color: #C84172;
}
.text-order-gray {
@@ -6476,22 +6480,25 @@ main {
border-radius: 4px;
}
.order-status-badge.recept {
background-color: #DA6525;
background-color: #E3A600;
}
.order-status-badge.confirm {
background-color: #EA8729;
background-color: #7CB614;
}
.order-status-badge.prep {
background-color: #ECB22A;
background-color: #27A40E;
}
.order-status-badge.export {
background-color: #3061C2;
}
.order-status-badge.gray {
background-color: #979b9d;
}
.order-status-badge.delivery {
background-color: #3CAB50;
background-color: #8B41B7;
}
.order-status-badge.complete {
background-color: #1c7ed6;
background-color: #C84172;
}
.order-status-badge.black {
background-color: #3a3a37;
@@ -6499,43 +6506,53 @@ main {
.btn.recept {
color: #ffffff;
background-color: #DA6525;
background-color: #E3A600;
font-weight: 500;
}
.btn.recept:hover {
background-color: #cd5f23;
background-color: #ca9503;
}
.btn.confirm {
color: #ffffff;
background-color: #EA8729;
background-color: #7CB614;
font-weight: 500;
}
.btn.confirm:hover {
background-color: #e97f1b;
background-color: #7cb214;
}
.btn.prep {
color: #ffffff;
background-color: #ECB22A;
background-color: #27A40E;
font-weight: 500;
}
.btn.prep:hover {
background-color: #ebad1c;
background-color: #27a20e;
}
.btn.export {
color: #ffffff;
background-color: #3061C2;
font-weight: 500;
}
.btn.export:hover {
background-color: #3061c0;
}
.btn.delivery {
color: #ffffff;
background-color: #3CAB50;
background-color: #8B41B7;
font-weight: 500;
}
.btn.delivery:hover {
background-color: #38a04b;
background-color: #8b40b5;
}
.btn.complete {
color: #ffffff;
background-color: #1c7ed6;
background-color: #C84172;
font-weight: 500;
}
.btn.complete:hover {
background-color: #1a76c8;
background-color: #c84170;
}
.btn.gray {
color: #ffffff;
@@ -6547,38 +6564,41 @@ main {
}
.btn.delivery {
color: #ffffff;
background-color: #3CAB50;
background-color: #8B41B7;
font-weight: 500;
}
.btn.delivery:hover {
background-color: #38a04b;
background-color: #8b41b5;
}
.btn.complete {
color: #ffffff;
background-color: #1c7ed6;
background-color: #C84172;
font-weight: 500;
}
.btn.complete:hover {
background-color: #1a76c8;
background-color: #c84170;
}
.table.order-section .order-section__header {
border-bottom: 2px solid #dee2e6;
}
.table.order-section .order-section__header.recept {
border-color: #DA6525;
border-color: #E3A600;
}
.table.order-section .order-section__header.confirm {
border-color: #EA8729;
border-color: #7CB614;
}
.table.order-section .order-section__header.prep {
border-color: #ECB22A;
border-color: #27A40E;
}
.table.order-section .order-section__header.export {
border-color: #3061C2;
}
.table.order-section .order-section__header.delivery {
border-color: #3CAB50;
border-color: #8B41B7;
}
.table.order-section .order-section__header.complete {
border-color: #1c7ed6;
border-color: #C84172;
}
.table.order-section .order-section__header.gray {
border-color: #979b9d;
@@ -6704,19 +6724,22 @@ main {
transform: translateX(calc(-50% - 36px));
}
.order-step.recept {
background-color: #DA6525;
background-color: #E3A600;
}
.order-step.confirm {
background-color: #EA8729;
background-color: #7CB614;
}
.order-step.prep {
background-color: #ECB22A;
background-color: #27A40E;
}
.order-step.export {
background-color: #3061C2;
}
.order-step.delivery {
background-color: #3CAB50;
background-color: #8B41B7;
}
.order-step.complete {
background-color: #1c7ed6;
background-color: #C84172;
}
.order-step.gray {
background-color: #979b9d;
@@ -6743,22 +6766,25 @@ main {
word-break: break-all;
}
.order-number__content.recept {
color: #DA6525;
color: #E3A600;
}
.order-number__content.confirm {
color: #EA8729;
color: #7CB614;
}
.order-number__content.prep {
color: #ECB22A;
color: #27A40E;
}
.order-number__content.export {
color: #3061C2;
}
.order-number__content.gray {
color: #979b9d;
}
.order-number__content.delivery {
color: #3CAB50;
color: #8B41B7;
}
.order-number__content.complete {
color: #1c7ed6;
color: #C84172;
}
.order-number__btn-container {
display: inline-flex;
@@ -7262,22 +7288,25 @@ main {
color: #16191d;
}
.table.vertical td.order-detail-status.recept em {
color: #DA6525;
color: #E3A600;
}
.table.vertical td.order-detail-status.gray em {
color: #979b9d;
}
.table.vertical td.order-detail-status.confirm em {
color: #EA8729;
color: #7CB614;
}
.table.vertical td.order-detail-status.prep em {
color: #ECB22A;
color: #27A40E;
}
.table.vertical td.order-detail-status.export em {
color: #3061C2;
}
.table.vertical td.order-detail-status.delivery em {
color: #3CAB50;
color: #8B41B7;
}
.table.vertical td.order-detail-status.complete em {
color: #1c7ed6;
color: #C84172;
}
.order-detail-status__inner {
@@ -7434,6 +7463,16 @@ main {
border-top: 1px solid #f1f3f5;
}
.sendOut-info__reseller_erp td {
background-color: rgba(196, 250, 177, 0.9) !important;
}
.sendOut-info__reseller_erp td.table-empty-cell::before {
border-top: 1px solid #c4fab1;
}
.sendOut-info__reseller_erp td.table-empty-cell::after {
border-top: 1px solid #c4fab1;
}
.sendOut-orderDetail-trigger::after {
position: relative;
top: 3px;
@@ -7575,31 +7614,39 @@ main {
/* 주문 상태코드별 색 추가 add by jws */
.order-status-badge.ordr-sttus15 {
background-color: #DA6525;
background-color: #E3A600;
}
.order-status-badge.ordr-sttus25 {
background-color: #EA8729;
background-color: #7CB614;
}
.order-status-badge.ordr-sttus35 {
background-color: #ECB22A;
background-color: #27A40E;
}
.order-status-badge.ordr-sttus50 {
background-color: #3061C2;
}
.order-status-badge.ordr-sttus55 {
background-color: #3061C2;
}
.order-status-badge.ordr-sttus60 {
background-color: #3CAB50;
background-color: #8B41B7;
}
.order-status-badge.ordr-sttus65 {
background-color: #3CAB50;
background-color: #8B41B7;
}
.order-status-badge.ordr-sttus70 {
background-color: #1c7ed6;
background-color: #C84172;
}
.order-status-badge.ordr-sttus75 {
background-color: #1c7ed6;
background-color: #C84172;
}
.order-status-badge.ordr-sttus95 {
@@ -7611,31 +7658,39 @@ main {
}
.table.vertical td.order-detail-status.ordr-sttus15 em {
color: #DA6525;
color: #E3A600;
}
.table.vertical td.order-detail-status.ordr-sttus25 em {
color: #EA8729;
color: #7CB614;
}
.table.vertical td.order-detail-status.ordr-sttus35 em {
color: #ECB22A;
color: #27A40E;
}
.table.vertical td.order-detail-status.ordr-sttus50 em {
color: #3061C2;
}
.table.vertical td.order-detail-status.ordr-sttus55 em {
color: #3061C2;
}
.table.vertical td.order-detail-status.ordr-sttus60 em {
color: #3CAB50;
color: #8B41B7;
}
.table.vertical td.order-detail-status.ordr-sttus65 em {
color: #3CAB50;
color: #8B41B7;
}
.table.vertical td.order-detail-status.ordr-sttus70 em {
color: #1c7ed6;
color: #C84172;
}
.table.vertical td.order-detail-status.ordr-sttus75 em {
color: #1c7ed6;
color: #C84172;
}
.table.vertical td.order-detail-status.ordr-sttus95 em {