diff --git a/app/modules/cupang/templates/cupang/box_calc.html b/app/modules/cupang/templates/cupang/box_calc.html index 6599bcf..de45636 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 a3d3944..86dcf56 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 b019e16..fbe2a2d 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 59eb144..c20b218 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 f34958b..90c832b 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 %}
diff --git a/app/modules/cupang/templates/cupang/index.html b/app/modules/cupang/templates/cupang/index.html index ae72478..882573f 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 d1708a4..2ef0ddf 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 a12da18..da7b8fb 100644 --- a/app/static/cupang.css +++ b/app/static/cupang.css @@ -1193,13 +1193,15 @@ body.cpg-dragging { cursor: grabbing; user-select: none; } .cpg-mcal-grid { display: grid; grid-template-columns: repeat(7, minmax(0, 1fr)); - grid-auto-rows: minmax(0, 1fr); - gap: 2px; + grid-template-rows: auto; /* 요일 행은 내용 높이만 */ + grid-auto-rows: minmax(0, 1fr); /* 주 행만 남은 높이 균등 분할 */ + gap: 4px; flex: 1 1 auto; min-height: 0; } .cpg-mcal-wd { - text-align: center; padding: 4px 0 6px; - font-size: 11px; font-weight: 600; letter-spacing: .3px; + display: flex; align-items: center; justify-content: center; + height: 34px; padding: 0; + font-size: 22px; font-weight: 700; letter-spacing: -0.2px; color: var(--color-midtone-gray); border-bottom: 1px solid var(--color-subtle-ash); } @@ -1208,23 +1210,25 @@ body.cpg-dragging { cursor: grabbing; user-select: none; } .cpg-mcal-cell { position: relative; - display: flex; flex-direction: column; align-items: center; gap: 3px; - min-height: 52px; min-width: 0; padding: 5px 4px 6px; + display: flex; flex-direction: column; align-items: center; gap: 4px; + min-height: 62px; min-width: 0; padding: 6px 4px 7px; + border: 1px solid var(--color-subtle-ash); border-radius: 8px; + background: #fff; text-decoration: none; color: var(--color-rich-black); - transition: background .12s, box-shadow .12s; + transition: background .12s, box-shadow .12s, border-color .12s; } -.cpg-mcal-cell:hover { background: var(--color-ghost-gray); } +.cpg-mcal-cell:hover { background: var(--color-ghost-gray); border-color: var(--color-midtone-gray); } .cpg-mcal-day { display: inline-flex; align-items: center; justify-content: center; - min-width: 24px; height: 24px; padding: 0 6px; + min-width: 32px; height: 32px; padding: 0 8px; border-radius: 999px; - font-size: 13px; font-weight: 500; font-variant-numeric: tabular-nums; + font-size: 20px; font-weight: 700; font-variant-numeric: tabular-nums; } .cpg-mcal-cell.is-red .cpg-mcal-day { color: var(--color-callout-red); } .cpg-mcal-cell.is-blue .cpg-mcal-day { color: #2b5bc2; } /* 이번 달이 아닌 날 — 흐리게 */ -.cpg-mcal-cell.is-out { opacity: .38; } +.cpg-mcal-cell.is-out { background: var(--color-ghost-gray); opacity: .5; } /* 오늘 — 검은 원 */ .cpg-mcal-cell.is-today .cpg-mcal-day { background: var(--color-deep-black); color: #fff; font-weight: 700; @@ -1232,6 +1236,7 @@ body.cpg-dragging { cursor: grabbing; user-select: none; } /* 선택한 날 — 링 강조 */ .cpg-mcal-cell.is-selected { background: var(--color-ghost-gray); + border-color: var(--color-deep-black); box-shadow: inset 0 0 0 1.5px var(--color-deep-black); } @@ -1241,10 +1246,10 @@ body.cpg-dragging { cursor: grabbing; user-select: none; } max-width: 100%; padding: 1px 7px; border-radius: 999px; background: var(--color-deep-black); color: #fff; - font-size: 11px; line-height: 1.6; white-space: nowrap; + font-size: 12px; font-weight: 600; line-height: 1.6; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; } -.cpg-mcal-tag > em { font-style: normal; color: #c9c9c9; font-size: 10px; } +.cpg-mcal-tag > em { font-style: normal; color: #c9c9c9; font-size: 11px; font-weight: 500; } .cpg-mcal-cell.is-out .cpg-mcal-tag { background: var(--color-midtone-gray); } /* 범례 */