From bf8f36bc401c40fc292171cb995636e2bc1bab12 Mon Sep 17 00:00:00 2001 From: king Date: Wed, 2 Sep 2026 14:38:02 +0900 Subject: [PATCH] =?UTF-8?q?fix(cupang):=20=EB=8B=AC=EB=A7=88=EB=8B=A4=20?= =?UTF-8?q?=EB=8B=A4=EB=A5=B4=EB=8D=98=20=EB=8B=AC=EB=A0=A5=20=EC=B9=B8=20?= =?UTF-8?q?=ED=81=AC=EA=B8=B0=20=ED=86=B5=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 주 수(5주/6주)에 따라 1fr 로 나뉘던 행 높이를 고정값(--mcal-row)으로 바꿔 두 달의 칸 크기와 세로 간격을 동일하게 맞춘다. 화면 높이에 따라 84/72/62px. Co-Authored-By: Claude Opus 5 --- .../cupang/templates/cupang/box_calc.html | 2 +- .../cupang/templates/cupang/box_rules.html | 2 +- app/modules/cupang/templates/cupang/index.html | 2 +- .../cupang/templates/cupang/products.html | 2 +- app/modules/cupang/templates/cupang/view.html | 2 +- app/static/cupang.css | 17 +++++++++++------ 6 files changed, 16 insertions(+), 11 deletions(-) diff --git a/app/modules/cupang/templates/cupang/box_calc.html b/app/modules/cupang/templates/cupang/box_calc.html index e7814dd..25ee209 100644 --- a/app/modules/cupang/templates/cupang/box_calc.html +++ b/app/modules/cupang/templates/cupang/box_calc.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {% block content %}
diff --git a/app/modules/cupang/templates/cupang/box_rules.html b/app/modules/cupang/templates/cupang/box_rules.html index e248c66..4c0577b 100644 --- a/app/modules/cupang/templates/cupang/box_rules.html +++ b/app/modules/cupang/templates/cupang/box_rules.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {% block content %}
diff --git a/app/modules/cupang/templates/cupang/index.html b/app/modules/cupang/templates/cupang/index.html index 4e96ad2..a45b9c2 100644 --- a/app/modules/cupang/templates/cupang/index.html +++ b/app/modules/cupang/templates/cupang/index.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {% block content %}
diff --git a/app/modules/cupang/templates/cupang/products.html b/app/modules/cupang/templates/cupang/products.html index 097124a..43cf2cd 100644 --- a/app/modules/cupang/templates/cupang/products.html +++ b/app/modules/cupang/templates/cupang/products.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {% block content %}
diff --git a/app/modules/cupang/templates/cupang/view.html b/app/modules/cupang/templates/cupang/view.html index 3a23736..639d2dd 100644 --- a/app/modules/cupang/templates/cupang/view.html +++ b/app/modules/cupang/templates/cupang/view.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {% block content %} {# 출고 묶음 보기 — 상자 계산 화면과 같은 3열 구성. 읽기 전용(수정 없음). #} diff --git a/app/static/cupang.css b/app/static/cupang.css index 8044ef0..2bc6cb6 100644 --- a/app/static/cupang.css +++ b/app/static/cupang.css @@ -31,7 +31,7 @@ @media (max-width: 980px) { .cpg-layout { grid-template-columns: 1fr; } } .cpg-cal-card, .cpg-list-card { padding: 16px; } -.cpg-cal-card { display: flex; flex-direction: column; min-height: 0; overflow: hidden; } +.cpg-cal-card { display: flex; flex-direction: column; min-height: 0; overflow: auto; } .cpg-list-card { min-height: 0; overflow-y: auto; } .cpg-cal-head { @@ -1080,7 +1080,7 @@ body.cpg-dragging { cursor: grabbing; user-select: none; } @media (max-width: 1200px) { .cpg-mcal-months { grid-template-columns: minmax(0, 1fr); } } -.cpg-mcal { display: flex; flex-direction: column; min-height: 0; min-width: 0; } +.cpg-mcal { display: flex; flex-direction: column; min-height: 0; min-width: 0; align-self: start; } /* 달 머리글 — 가운데 정렬, 출고 건수는 오른쪽 끝에 겹쳐 놓는다 */ .cpg-mcal-h { @@ -1099,15 +1099,19 @@ body.cpg-dragging { cursor: grabbing; user-select: none; } background: var(--color-deep-black); color: #fff; } -/* 날짜 격자 */ +/* 날짜 격자 — 주 수(5주/6주)가 달라도 칸 크기가 같도록 행 높이를 고정한다. + (1fr 로 남은 높이를 나누면 5주 달과 6주 달의 칸 높이가 달라진다) */ .cpg-mcal-grid { display: grid; grid-template-columns: repeat(7, minmax(0, 1fr)); grid-template-rows: auto; /* 요일 행은 내용 높이만 */ - grid-auto-rows: minmax(0, 1fr); /* 주 행만 남은 높이 균등 분할 */ + grid-auto-rows: var(--mcal-row, 84px); gap: 4px; - flex: 1 1 auto; min-height: 0; + flex: 0 0 auto; min-height: 0; + align-content: start; } +@media (max-height: 900px) { .cpg-mcal-grid { --mcal-row: 72px; } } +@media (max-height: 780px) { .cpg-mcal-grid { --mcal-row: 62px; } } .cpg-mcal-wd { display: flex; align-items: center; justify-content: center; height: 34px; padding: 0; @@ -1121,7 +1125,8 @@ body.cpg-dragging { cursor: grabbing; user-select: none; } .cpg-mcal-cell { position: relative; display: flex; flex-direction: column; align-items: center; gap: 4px; - min-height: 70px; min-width: 0; padding: 6px 4px 7px; + height: 100%; min-height: 0; min-width: 0; padding: 6px 4px 7px; + justify-content: flex-start; border: 1px solid var(--color-subtle-ash); border-radius: 8px; background: #fff;