diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index 57b8f88f2d..50309f2707 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 = ` - - ${frappe.utils.icon("es-solid-heart", "sm", "like-icon")} - ${__(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 = ` + + + + ${frappe.utils.icon("es-solid-heart", "sm", "like-icon")} + + + `; + + return this.get_header_html_skeleton($columns, right_html); } get_header_html_skeleton(left = "", right = "") { @@ -909,19 +915,23 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { 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}`); } html += ` - + ${settings_button || assigned_to} - ${modified} + ${modified} ${comment_count ? $(comment_count).prop("outerHTML") : ""} + ${comment_count ? 'ยท' : ""} + + ${this.get_like_html(doc)} + ${this.get_indicator_dot(doc)} @@ -1012,9 +1022,6 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { div.innerHTML = ` - - ${this.get_like_html(doc)} - diff --git a/frappe/public/scss/desk/list.scss b/frappe/public/scss/desk/list.scss index 34bac0f73c..57510e24d1 100644 --- a/frappe/public/scss/desk/list.scss +++ b/frappe/public/scss/desk/list.scss @@ -118,10 +118,10 @@ &> span { display: inline-block; + } - &:not(:last-child) { - margin-right: 15px; - } + .modified { + margin-right: var(--margin-sm); } .comment-count { @@ -131,7 +131,6 @@ .frappe-timestamp { font-size: var(--text-xs); white-space: nowrap; - min-width: 30px; } .list-assignments, .list-actions { @@ -195,10 +194,6 @@ $level-margin-right: 8px; color: var(--text-color); } - .level-item:not(.file-select) { - margin-right: $level-margin-right; - } - &.seen { font-weight: normal; }