From 1041b7b85b0a5142685ced58ee137b098643314d Mon Sep 17 00:00:00 2001 From: Maharshi Patel Date: Mon, 25 Sep 2023 17:51:53 +0530 Subject: [PATCH 1/8] fix: espresso issues shared in #22508. I have fixed the following issues: * notification unread indicator * workspace sidebar menu icons as per espresso * Fallback icon if page is public and no icon is set * Removed Borders from grouped buttons * added unseen notification icon need to update once timless creates a new icon * changed filter button to be more like espresso. * changed group by button icon and text. * fixed link icon in communications (caused by use of like-icon class) * changed sidebar Add Assignee Icon to better reflect use also changed text of Shared with to Share. --- frappe/public/icons/espresso/icons.svg | 13 +++++++++++++ .../js/frappe/form/templates/form_sidebar.html | 4 ++-- .../form/templates/timeline_message_box.html | 2 +- frappe/public/js/frappe/ui/filters/filter_list.js | 5 ++--- frappe/public/js/frappe/ui/group_by/group_by.js | 6 +++--- frappe/public/js/frappe/ui/toolbar/navbar.html | 2 +- .../public/js/frappe/views/workspace/workspace.js | 14 +++++++------- frappe/public/scss/desk/dark.scss | 4 ++-- frappe/public/scss/desk/global.scss | 10 ++-------- frappe/public/scss/desk/list.scss | 10 +++++++++- frappe/public/scss/desk/notification.scss | 4 +++- frappe/public/scss/desk/report.scss | 11 +---------- 12 files changed, 46 insertions(+), 39 deletions(-) diff --git a/frappe/public/icons/espresso/icons.svg b/frappe/public/icons/espresso/icons.svg index 7508cd717f..3cd91a3791 100644 --- a/frappe/public/icons/espresso/icons.svg +++ b/frappe/public/icons/espresso/icons.svg @@ -522,6 +522,13 @@ + + + + + + + @@ -989,6 +996,12 @@ + + + + + + diff --git a/frappe/public/js/frappe/form/templates/form_sidebar.html b/frappe/public/js/frappe/form/templates/form_sidebar.html index 0fe6ca16d5..447e71514e 100644 --- a/frappe/public/js/frappe/form/templates/form_sidebar.html +++ b/frappe/public/js/frappe/form/templates/form_sidebar.html @@ -45,7 +45,7 @@
    • @@ -106,7 +106,7 @@
    • - {%= __("Shared With") %} + {%= __("Share") %}
    • diff --git a/frappe/public/js/frappe/form/templates/timeline_message_box.html b/frappe/public/js/frappe/form/templates/timeline_message_box.html index 5e0afdc9a2..f04552fec2 100644 --- a/frappe/public/js/frappe/form/templates/timeline_message_box.html +++ b/frappe/public/js/frappe/form/templates/timeline_message_box.html @@ -61,7 +61,7 @@ {% if (doc._url) { %} - + {% } %} diff --git a/frappe/public/js/frappe/ui/filters/filter_list.js b/frappe/public/js/frappe/ui/filters/filter_list.js index 7907050b7b..551611ebf4 100644 --- a/frappe/public/js/frappe/ui/filters/filter_list.js +++ b/frappe/public/js/frappe/ui/filters/filter_list.js @@ -128,9 +128,7 @@ frappe.ui.FilterGroup = class { update_filter_button() { const filters_applied = this.filters.length > 0; const button_label = filters_applied - ? this.filters.length > 1 - ? __("{0} filters", [this.filters.length]) - : __("{0} filter", [this.filters.length]) + ? __("Filters {0}", [this.filters.length]) : __("Filter"); this.filter_button @@ -140,6 +138,7 @@ frappe.ui.FilterGroup = class { this.filter_button.find(".filter-icon").toggleClass("active", filters_applied); this.filter_button.find(".button-label").html(button_label); + this.filter_button.attr("title", `${ this.filters.length } Filter${ this.filters.length > 1 ? "s" : "" } Applied`); } set_filter_events() { diff --git a/frappe/public/js/frappe/ui/group_by/group_by.js b/frappe/public/js/frappe/ui/group_by/group_by.js index e0c8a38018..c1059b1f8f 100644 --- a/frappe/public/js/frappe/ui/group_by/group_by.js +++ b/frappe/public/js/frappe/ui/group_by/group_by.js @@ -229,7 +229,7 @@ frappe.ui.GroupBy = class { $(`
      • - - - +