diff --git a/app/modules/vacation/templates/vacation/detail.html b/app/modules/vacation/templates/vacation/detail.html index dd6b3db..0c826c6 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 3e9e096..749a118 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 142da20..0541ae2 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 27b56be..99f15c1 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 272ef9a..1f93370 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/erp.css b/app/static/erp.css index 4770cd2..277375b 100644 --- a/app/static/erp.css +++ b/app/static/erp.css @@ -197,6 +197,14 @@ body.erp-body { background: var(--color-rich-black); } +/* 검정 배경 요소는 글자 무조건 흰색. + 버튼/배지의 a:link/a:visited(특이도 0,1,1)가 클래스 색을 덮어쓰는 문제 차단. */ +a.erp-btn-primary, a.erp-btn-primary:link, a.erp-btn-primary:visited, a.erp-btn-primary:hover, +.erp-badge-inverse, a.erp-badge-inverse:link, a.erp-badge-inverse:visited, +.erp-sidebar-item.is-active, a.erp-sidebar-item.is-active:link, a.erp-sidebar-item.is-active:visited { + color: var(--color-canvas-white) !important; +} + .erp-btn-ghost { background: transparent; color: var(--color-rich-black); diff --git a/app/static/vacation.css b/app/static/vacation.css index f68fef6..d7ab41b 100644 --- a/app/static/vacation.css +++ b/app/static/vacation.css @@ -113,7 +113,7 @@ .vac-bar-draft { background: #fff; border: 1px dashed var(--vac-muted); color: var(--vac-muted); } .vac-bar-submit { background: var(--vac-ghost); border: 1px solid var(--vac-muted); color: var(--vac-black); } -.vac-bar-approve { background: var(--vac-black); color: #fff; } +.vac-bar-approve, a.vac-bar-approve:link, a.vac-bar-approve:visited { background: var(--vac-black); color: #fff; } .vac-bar-reject { background: #fff; border: 1px solid var(--vac-red); color: var(--vac-red); text-decoration: line-through; } .vac-bar-cancel { background: #fff; border: 1px dashed var(--vac-ash); color: #bbb; opacity: 0.7; } diff --git a/app/templates/erp_base.html b/app/templates/erp_base.html index d03b72d..bfb4a87 100644 --- a/app/templates/erp_base.html +++ b/app/templates/erp_base.html @@ -4,8 +4,8 @@ {{ page_title or "ERP" }} — DBX Corporation - - + + {% block head_extra %}{% endblock %}