diff --git a/app/modules/vacation/templates/vacation/detail.html b/app/modules/vacation/templates/vacation/detail.html index 89c0b40..af85452 100644 --- a/app/modules/vacation/templates/vacation/detail.html +++ b/app/modules/vacation/templates/vacation/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/vacation/templates/vacation/form.html b/app/modules/vacation/templates/vacation/form.html index 749a118..2d377ea 100644 --- a/app/modules/vacation/templates/vacation/form.html +++ b/app/modules/vacation/templates/vacation/form.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {% block content %}
@@ -68,4 +68,4 @@
{% endblock %} -{% block scripts %}{% endblock %} +{% block scripts %}{% endblock %} diff --git a/app/modules/vacation/templates/vacation/index.html b/app/modules/vacation/templates/vacation/index.html index 0541ae2..c8a75be 100644 --- a/app/modules/vacation/templates/vacation/index.html +++ b/app/modules/vacation/templates/vacation/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/vacation/templates/vacation/pending.html b/app/modules/vacation/templates/vacation/pending.html index 99f15c1..80607b4 100644 --- a/app/modules/vacation/templates/vacation/pending.html +++ b/app/modules/vacation/templates/vacation/pending.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {% block content %}
diff --git a/app/modules/vacation/templates/vacation/settings.html b/app/modules/vacation/templates/vacation/settings.html index 1f93370..30e188e 100644 --- a/app/modules/vacation/templates/vacation/settings.html +++ b/app/modules/vacation/templates/vacation/settings.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {% block content %}
diff --git a/app/static/vacation.css b/app/static/vacation.css index d7ab41b..6ceacab 100644 --- a/app/static/vacation.css +++ b/app/static/vacation.css @@ -85,9 +85,13 @@ .vac-out .vac-day-num { color: #bbb; } .vac-today { background: #f5f5f5; } .vac-today .vac-day-num { - background: var(--vac-black); color: #fff; border-radius: 9999px; - padding: 2px 9px; + background: var(--vac-black); + color: #fff !important; /* vac-red/vac-blue 글자색(!important) 이김 */ + border-radius: 9999px; padding: 2px 9px; } +/* 오늘이 일/공휴일=빨강배경, 토요일=파랑배경, 평일=검정배경 (모두 흰글씨) */ +.vac-today .vac-day-num.vac-red { background: var(--vac-red); } +.vac-today .vac-day-num.vac-blue { background: var(--vac-blue); } .vac-selected { box-shadow: inset 0 0 0 2px var(--vac-black); } .vac-red { color: var(--vac-red) !important; } .vac-blue { color: var(--vac-blue) !important; }