From d387048ebf12cded6d1994bb8f8e76e4a1c1a3e0 Mon Sep 17 00:00:00 2001 From: king Date: Fri, 2 Oct 2026 15:15:46 +0900 Subject: [PATCH] feat(project): apply Asana system fonts to Project screens Override the font token only on Project pages, preserve icon and monospace fonts, and update CSS/JS cache versions. Match the image viewer font stack as well. --- .../project/templates/project/goal_meeting.html | 4 ++-- app/modules/project/templates/project/goals.html | 4 ++-- app/modules/project/templates/project/help.html | 2 +- app/modules/project/templates/project/inbox.html | 4 ++-- app/modules/project/templates/project/mytasks.html | 4 ++-- app/modules/project/templates/project/project.html | 4 ++-- app/modules/project/templates/project/trash.html | 4 ++-- app/static/project.css | 11 +++++++++++ app/static/project.js | 2 +- 9 files changed, 25 insertions(+), 14 deletions(-) diff --git a/app/modules/project/templates/project/goal_meeting.html b/app/modules/project/templates/project/goal_meeting.html index dbc981d..948d3c7 100644 --- a/app/modules/project/templates/project/goal_meeting.html +++ b/app/modules/project/templates/project/goal_meeting.html @@ -1,7 +1,7 @@ {% extends "erp_base.html" %} {% block head_extra %} - + {% endblock %} @@ -296,5 +296,5 @@ {% include "project/_side_modals.html" %} {% include "project/_member_tasks_modal.html" %} - + {% endblock %} diff --git a/app/modules/project/templates/project/goals.html b/app/modules/project/templates/project/goals.html index fa4a232..9d33c34 100644 --- a/app/modules/project/templates/project/goals.html +++ b/app/modules/project/templates/project/goals.html @@ -1,7 +1,7 @@ {% extends "erp_base.html" %} {% block head_extra %} - + {% endblock %} @@ -196,5 +196,5 @@ {% include "project/_side_modals.html" %} {% include "project/_member_tasks_modal.html" %} - + {% endblock %} diff --git a/app/modules/project/templates/project/help.html b/app/modules/project/templates/project/help.html index a182691..8e348cd 100644 --- a/app/modules/project/templates/project/help.html +++ b/app/modules/project/templates/project/help.html @@ -1,7 +1,7 @@ {% extends "erp_base.html" %} {% block head_extra %} - + {% endblock %} diff --git a/app/modules/project/templates/project/inbox.html b/app/modules/project/templates/project/inbox.html index bf21fa8..d75580b 100644 --- a/app/modules/project/templates/project/inbox.html +++ b/app/modules/project/templates/project/inbox.html @@ -1,7 +1,7 @@ {% extends "erp_base.html" %} {% block head_extra %} - + {% endblock %} @@ -104,5 +104,5 @@ {% include "project/_side_modals.html" %} {% include "project/_member_tasks_modal.html" %} - + {% endblock %} diff --git a/app/modules/project/templates/project/mytasks.html b/app/modules/project/templates/project/mytasks.html index 3bef367..944af90 100644 --- a/app/modules/project/templates/project/mytasks.html +++ b/app/modules/project/templates/project/mytasks.html @@ -1,7 +1,7 @@ {% extends "erp_base.html" %} {% block head_extra %} - + {% endblock %} @@ -100,5 +100,5 @@ "today": {{ today | tojson }} } - + {% endblock %} diff --git a/app/modules/project/templates/project/project.html b/app/modules/project/templates/project/project.html index 9712322..4b35847 100644 --- a/app/modules/project/templates/project/project.html +++ b/app/modules/project/templates/project/project.html @@ -1,7 +1,7 @@ {% extends "erp_base.html" %} {% block head_extra %} - + @@ -496,5 +496,5 @@ - + {% endblock %} diff --git a/app/modules/project/templates/project/trash.html b/app/modules/project/templates/project/trash.html index 114b962..91ad80f 100644 --- a/app/modules/project/templates/project/trash.html +++ b/app/modules/project/templates/project/trash.html @@ -1,7 +1,7 @@ {% extends "erp_base.html" %} {% block head_extra %} - + {% endblock %} @@ -70,5 +70,5 @@ {% include "project/_side_modals.html" %} {% include "project/_member_tasks_modal.html" %} - + {% endblock %} diff --git a/app/static/project.css b/app/static/project.css index c061f6d..74cce0e 100644 --- a/app/static/project.css +++ b/app/static/project.css @@ -12,8 +12,19 @@ --pj-card-radius: 12px; --pj-card-shadow: 0 1px 2px rgba(16,24,40,.04), 0 2px 6px rgba(16,24,40,.06); --pj-card-shadow-hover: 0 6px 16px rgba(16,24,40,.10), 0 2px 4px rgba(16,24,40,.06); + /* 아사나 웹앱 기본 시스템 폰트 + 한글 대체(Apple SD Gothic Neo·Malgun Gothic). + project.css 는 Project 화면에서만 불러오므로 공통 토큰 --font-geist 를 여기서 + 덮으면 본문·상단바·공용 대화상자(erp-dialog.css)까지 이 화면에서만 바뀐다. */ + --pj-font: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + "Helvetica Neue", Helvetica, Arial, + "Apple SD Gothic Neo", "Malgun Gothic", sans-serif; + --font-geist: var(--pj-font); } +/* 입력창·버튼은 브라우저 기본 폼 폰트 대신 본문 폰트를 따른다. :where() 라 특이성 0 — + 아이콘 폰트(.material-symbols-*)·이모지 등 기존 font-family 지정이 항상 이긴다. */ +:where(button, input, select, textarea, optgroup) { font-family: inherit; } + .pj-wrap { padding: 4px 2px 40px; color: var(--pj-ink); } /* ── 버튼 ── */ diff --git a/app/static/project.js b/app/static/project.js index fef7ddf..dff10d6 100644 --- a/app/static/project.js +++ b/app/static/project.js @@ -2109,7 +2109,7 @@ }; const html = '이미지' + '