diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index ba3e9864d8..00bf45010b 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -631,9 +631,6 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { let subject_html = ` - ${__(subject_field.label)} @@ -667,7 +664,16 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { }) .join(""); - return this.get_header_html_skeleton($columns, ''); + const right_html = ` + + + `; + + return this.get_header_html_skeleton($columns, right_html); } get_header_html_skeleton(left = "", right = "") { @@ -895,21 +901,18 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { const modified = comment_when(doc.modified, true); - let assigned_to = `
- - -
`; + let assigned_to = ``; let assigned_users = JSON.parse(doc._assign || "[]"); if (assigned_users.length) { - assigned_to = `
+ assigned_to = `
${frappe.avatar_group(assigned_users, 3, { filterable: true })[0].outerHTML}
`; } let comment_count = null; if (this.list_view_settings && !this.list_view_settings.disable_comment_count) { - comment_count = $(``); + comment_count = $(``); $(comment_count).append(` ${frappe.utils.icon("es-line-chat-alt")} ${doc._comment_count > 99 ? "99+" : doc._comment_count || 0}`); @@ -920,8 +923,12 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { - ${modified} + ${modified} ${comment_count ? $(comment_count).prop("outerHTML") : ""} + ${comment_count ? 'ยท' : ""} +
${this.get_indicator_dot(doc)} @@ -1012,9 +1019,6 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { div.innerHTML = ` - diff --git a/frappe/public/scss/desk/avatar.scss b/frappe/public/scss/desk/avatar.scss index 40b86258b4..615cb6604e 100644 --- a/frappe/public/scss/desk/avatar.scss +++ b/frappe/public/scss/desk/avatar.scss @@ -95,11 +95,6 @@ .standard-image { font-size: var(--text-xs); } - - .avatar-empty::after { - content: "\002D"; - line-height: 28px; - } } .avatar-medium { diff --git a/frappe/public/scss/desk/list.scss b/frappe/public/scss/desk/list.scss index 34bac0f73c..804e12fcef 100644 --- a/frappe/public/scss/desk/list.scss +++ b/frappe/public/scss/desk/list.scss @@ -94,6 +94,7 @@ .level-right { flex: 1; overflow: visible; + align-items: center; } .tag-col { @@ -118,10 +119,10 @@ &> span { display: inline-block; + } - &:not(:last-child) { - margin-right: 15px; - } + .modified { + margin-right: var(--margin-sm); } .comment-count { @@ -131,7 +132,6 @@ .frappe-timestamp { font-size: var(--text-xs); white-space: nowrap; - min-width: 30px; } .list-assignments, .list-actions { @@ -195,10 +195,6 @@ $level-margin-right: 8px; color: var(--text-color); } - .level-item:not(.file-select) { - margin-right: $level-margin-right; - } - &.seen { font-weight: normal; }