Merge branch 'fix/subtask-add-icons'

This commit is contained in:
2026-10-13 14:30:41 +09:00
11 changed files with 27 additions and 19 deletions
@@ -2,7 +2,7 @@
{% block head_extra %}
{# 프로젝트 화면 부품(설명 편집기·날짜 팝업·멤버 고르기)을 그대로 쓴다 — project.js 는 PJ_LIB_ONLY 로 부품만 #}
<link rel="stylesheet" href="/static/project.css?v=20261013d" />
<link rel="stylesheet" href="/static/project.css?v=20261013e" />
<link rel="stylesheet" href="/static/vendor/material-symbols/material-symbols.css" />
<script>window.PJ_LIB_ONLY = true; window.PJ_HOLIDAYS = {{ (pj_kr_holidays or {}) | tojson }};</script>
{% endblock %}
@@ -64,7 +64,7 @@
</section>
</div>
<script>window.NTC_PEOPLE = {{ people | tojson }};</script>
<script src="/static/project.js?v=20261013d" defer></script>
<script src="/static/project.js?v=20261013e" defer></script>
<script src="/static/erp-notice-admin.js?v=20261012b" defer></script>
{% endif %}
{% endblock %}
@@ -1,7 +1,7 @@
{% extends "project/_meeting_content_base.html" if meeting_embedded else "erp_base.html" %}
{% block head_extra %}
<link rel="stylesheet" href="/static/project.css?v=20261013d" />
<link rel="stylesheet" href="/static/project.css?v=20261013e" />
<link rel="stylesheet" href="/static/vendor/material-symbols/material-symbols.css" />
{% endblock %}
@@ -298,5 +298,5 @@
<script src="/static/project-goal-text.js?v=20261003d" defer></script>
<script src="/static/project-meeting-cells.js?v=20261012a" defer></script>
<script src="/static/project.js?v=20261013d" defer></script>
<script src="/static/project.js?v=20261013e" defer></script>
{% endblock %}
@@ -1,7 +1,7 @@
{% extends "erp_base.html" %}
{% block head_extra %}
<link rel="stylesheet" href="/static/project.css?v=20261013d" />
<link rel="stylesheet" href="/static/project.css?v=20261013e" />
<link rel="stylesheet" href="/static/vendor/material-symbols/material-symbols.css" />
{% endblock %}
@@ -207,5 +207,5 @@
{% include "project/_member_tasks_modal.html" %}
<script src="/static/project-goal-text.js?v=20261003d" defer></script>
<script src="/static/project.js?v=20261013d" defer></script>
<script src="/static/project.js?v=20261013e" defer></script>
{% endblock %}
@@ -1,7 +1,7 @@
{% extends "erp_base.html" %}
{% block head_extra %}
<link rel="stylesheet" href="/static/project.css?v=20261013d" />
<link rel="stylesheet" href="/static/project.css?v=20261013e" />
<link rel="stylesheet" href="/static/project-help.css?v=20261003a" />
<link rel="stylesheet" href="/static/vendor/material-symbols/material-symbols.css" />
{% endblock %}
@@ -1,7 +1,7 @@
{% extends "erp_base.html" %}
{% block head_extra %}
<link rel="stylesheet" href="/static/project.css?v=20261013d" />
<link rel="stylesheet" href="/static/project.css?v=20261013e" />
<link rel="stylesheet" href="/static/vendor/material-symbols/material-symbols.css" />
{% endblock %}
@@ -102,5 +102,5 @@
{% include "project/_side_modals.html" %}
{% include "project/_member_tasks_modal.html" %}
<script src="/static/project.js?v=20261013d" defer></script>
<script src="/static/project.js?v=20261013e" defer></script>
{% endblock %}
@@ -1,7 +1,7 @@
{% extends "erp_base.html" %}
{% block head_extra %}
<link rel="stylesheet" href="/static/project.css?v=20261013d" />
<link rel="stylesheet" href="/static/project.css?v=20261013e" />
<link rel="stylesheet" href="/static/vendor/material-symbols/material-symbols.css" />
{% endblock %}
@@ -100,5 +100,5 @@
"today": {{ today | tojson }}
}
</script>
<script src="/static/project.js?v=20261013d" defer></script>
<script src="/static/project.js?v=20261013e" defer></script>
{% endblock %}
@@ -1,7 +1,7 @@
{% extends "erp_base.html" %}
{% block head_extra %}
<link rel="stylesheet" href="/static/project.css?v=20261013d" />
<link rel="stylesheet" href="/static/project.css?v=20261013e" />
<link rel="stylesheet" href="/static/vendor/material-symbols/material-symbols.css" />
{% endblock %}
@@ -108,5 +108,5 @@
});
})();
</script>
<script src="/static/project.js?v=20261013d" defer></script>
<script src="/static/project.js?v=20261013e" defer></script>
{% endblock %}
@@ -1,7 +1,7 @@
{% extends "erp_base.html" %}
{% block head_extra %}
<link rel="stylesheet" href="/static/project.css?v=20261013d" />
<link rel="stylesheet" href="/static/project.css?v=20261013e" />
<!-- 구글 머티리얼 심볼(담당자 아이콘 등) — self-host -->
<link rel="stylesheet" href="/static/vendor/material-symbols/material-symbols.css" />
<!-- 타임라인 vis-timeline — self-host -->
@@ -364,9 +364,10 @@
<ul class="pj-subtask-list" id="pj-subtask-list"></ul>
<div class="pj-subtask-form">
<input type="text" id="pj-subtask-input" placeholder="세부 업무 제목…" autocomplete="off" />
{# 아이콘 순서는 보드 카드 새 줄과 같게 — 마감일 · 담당자 · 협업자 #}
<input type="date" id="pj-subtask-add-due" />
<select id="pj-subtask-add-assignee"><option value="">담당자 없음</option></select>
<button type="button" class="pj-assignee-btn is-empty pj-subtask-add-fol" id="pj-subtask-add-followers" title="협업자 지정">협업자 없음</button>
<input type="date" id="pj-subtask-add-due" />
<button type="button" class="pj-btn pj-btn-primary" id="pj-subtask-add">추가</button>
</div>
</div>
@@ -469,5 +470,5 @@
</script>
<script src="/static/vendor/vis-timeline/vis-timeline-graph2d.min.js"></script>
<script src="/static/project.js?v=20261013d" defer></script>
<script src="/static/project.js?v=20261013e" defer></script>
{% endblock %}
@@ -1,7 +1,7 @@
{% extends "erp_base.html" %}
{% block head_extra %}
<link rel="stylesheet" href="/static/project.css?v=20261013d" />
<link rel="stylesheet" href="/static/project.css?v=20261013e" />
<link rel="stylesheet" href="/static/vendor/material-symbols/material-symbols.css" />
{% endblock %}
@@ -70,5 +70,5 @@
{% include "project/_side_modals.html" %}
{% include "project/_member_tasks_modal.html" %}
<script src="/static/project.js?v=20261013d" defer></script>
<script src="/static/project.js?v=20261013e" defer></script>
{% endblock %}
+7
View File
@@ -1613,6 +1613,13 @@ img.pj-person-ic { width: 22px; height: 22px; }
.pj-subtask-form .pj-date-btn:not(.is-icon-only) .material-symbols-outlined { font-size: 17px; }
.pj-subtask-form #pj-subtask-add { flex: 0 0 auto; }
.pj-subtask-form .pj-date-btn.is-icon-only { flex: 0 0 auto; width: 32px; padding: 0; }
/* 추가 칸 아이콘 크기 통일 — 마감일·담당자·협업자 모두 24px(앞 규칙의 18px 보다 우선) */
.pj-subtask-form .pj-assignee-btn[data-for] .pj-person-ic svg,
.pj-subtask-form .pj-assignee-btn[data-for] img.pj-person-ic,
.pj-subtask-form .pj-assignee-btn.pj-subtask-add-fol > svg,
.pj-subtask-form .pj-assignee-btn.pj-subtask-add-fol img.pj-person-ic,
.pj-subtask-form .pj-date-btn.is-icon-only > svg { width: 24px; height: 24px; }
.pj-subtask-form .pj-assignee-btn .pj-gicon.pj-person-ic { font-size: 24px; }
.pj-assignee-btn.pj-subtask-assignee img.pj-person-ic,
.pj-assignee-btn[data-for="pj-subtask-add-assignee"] img.pj-person-ic { width: 18px; height: 18px; }
.pj-assignee-btn.pj-subtask-assignee .pj-person-ic svg,
+1 -1
View File
@@ -8491,7 +8491,7 @@
function paintAddFol() {
if (!addFolBtn) return;
addFolBtn.classList.toggle("is-empty", !addFollowers.length);
addFolBtn.innerHTML = (addFollowers.length ? followerIconHtml(addFollowers) : personIconHtml("")) +
addFolBtn.innerHTML = followerIconHtml(addFollowers) + // 비면 점선 원 두 사람(보드 카드 새 줄과 같은 아이콘)
'<span class="pj-assignee-btn-name"></span>';
addFolBtn.querySelector(".pj-assignee-btn-name").textContent =
addFollowers.length ? "협업자 " + addFollowers.length + "명" : "협업자 없음";