diff --git a/app/modules/cupang/templates/cupang/box_rules.html b/app/modules/cupang/templates/cupang/box_rules.html index aa5596d..77ae755 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/centers.html b/app/modules/cupang/templates/cupang/centers.html index 33dc894..33d2c86 100644 --- a/app/modules/cupang/templates/cupang/centers.html +++ b/app/modules/cupang/templates/cupang/centers.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/detail.html b/app/modules/cupang/templates/cupang/detail.html index 3a443b3..59b8b55 100644 --- a/app/modules/cupang/templates/cupang/detail.html +++ b/app/modules/cupang/templates/cupang/detail.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/form.html b/app/modules/cupang/templates/cupang/form.html index 758f563..45f9560 100644 --- a/app/modules/cupang/templates/cupang/form.html +++ b/app/modules/cupang/templates/cupang/form.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {% block content %}
@@ -109,4 +109,4 @@ {% endblock %} -{% block scripts %}{% endblock %} +{% block scripts %}{% endblock %} diff --git a/app/modules/cupang/templates/cupang/index.html b/app/modules/cupang/templates/cupang/index.html index b5ae84c..aff9227 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 924cb77..88a64a6 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/static/cupang.css b/app/static/cupang.css index efbea6c..ddb939f 100644 --- a/app/static/cupang.css +++ b/app/static/cupang.css @@ -25,15 +25,18 @@ display: grid; grid-template-columns: minmax(0, 1fr) 320px; gap: 16px; - align-items: start; + align-items: stretch; + flex: 1 1 auto; min-height: 0; /* 남은 높이 채움 → 문서 스크롤 방지 */ } @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-list-card { min-height: 0; overflow-y: auto; } .cpg-cal-head { display: flex; align-items: center; gap: 10px; - margin-bottom: 12px; + margin-bottom: 12px; flex-shrink: 0; } .cpg-cal-title { font-size: 18pt; font-weight: 600; letter-spacing: -0.45px; margin: 0; } .cpg-nav-btn { min-width: 36px; padding: 4px 10px; font-size: 18pt; line-height: 1; } @@ -41,7 +44,9 @@ .cpg-cal-grid { display: grid; grid-template-columns: repeat(7, 1fr); + grid-template-rows: auto repeat(6, 1fr); /* 요일행 auto + 6주 균등 분할 */ gap: 6px; + flex: 1 1 auto; min-height: 0; } .cpg-cal-wd { text-align: center; font-size: 15px; font-weight: 600; @@ -52,7 +57,7 @@ .cpg-cal-cell { display: flex; flex-direction: column; gap: 4px; - min-height: 96px; padding: 8px; + min-height: 0; padding: 8px; overflow: hidden; border: 1px solid var(--color-subtle-ash); border-radius: 10px; background: #fff;