From 83c2f6e53a61a6abce28026c88223f47d4dfd549 Mon Sep 17 00:00:00 2001 From: Maharshi Patel Date: Thu, 21 Sep 2023 14:56:52 +0530 Subject: [PATCH] chore: fix linters --- frappe/public/js/frappe/form/grid.js | 8 ++++---- frappe/public/js/frappe/form/grid_row.js | 10 +++++++--- frappe/public/js/frappe/list/list_view.js | 5 +++-- frappe/public/js/frappe/utils/utils.js | 6 +++++- frappe/public/scss/desk/frappe_datatable.scss | 4 ++-- frappe/public/scss/espresso/_typography.scss | 2 +- 6 files changed, 22 insertions(+), 13 deletions(-) diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index f9941d5010..0c91101092 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -362,12 +362,12 @@ export default class Grid { grid: this, show_search: true, }); - this.header_search.row.addClass("filter-row") - if (this.header_search.show_search || this.header_search.show_search_row()){ + this.header_search.row.addClass("filter-row"); + if (this.header_search.show_search || this.header_search.show_search_row()) { $(this.parent).find(".grid-heading-row").addClass("with-filter"); - } else{ + } else { $(this.parent).find(".grid-heading-row").removeClass("with-filter"); - } + } this.filter_applied && this.update_search_columns(); } diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js index 812d65f780..02afd301d6 100644 --- a/frappe/public/js/frappe/form/grid_row.js +++ b/frappe/public/js/frappe/form/grid_row.js @@ -516,7 +516,9 @@ export default class GridRow { fields += `
@@ -526,8 +528,10 @@ export default class GridRow {
${__(docfield.label)}
-
- + diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index b354bb0465..57b8f88f2d 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -986,7 +986,6 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { `; - const like = div.querySelector(".like-action"); like.setAttribute("data-liked-by", doc._liked_by || "[]"); like.setAttribute("data-doctype", this.doctype); @@ -1046,7 +1045,9 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { ]; const title = docstatus_description[doc.docstatus || 0]; if (indicator) { - return ` ${__(indicator[0])} `; diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js index 42745594d7..7852cfc80b 100644 --- a/frappe/public/js/frappe/utils/utils.js +++ b/frappe/public/js/frappe/utils/utils.js @@ -1215,7 +1215,11 @@ Object.assign(frappe.utils, { size_class = `icon-${size}`; } return ` `; diff --git a/frappe/public/scss/desk/frappe_datatable.scss b/frappe/public/scss/desk/frappe_datatable.scss index ef4a0d43bc..a515c51b41 100644 --- a/frappe/public/scss/desk/frappe_datatable.scss +++ b/frappe/public/scss/desk/frappe_datatable.scss @@ -20,8 +20,8 @@ margin-left: -5px; margin-top: 0px; @include get_textstyle("base", "regular"); - - .dt-cell { + + .dt-cell { color: var(--text-color) !important; background-color: var(--bg-color) !important; } diff --git a/frappe/public/scss/espresso/_typography.scss b/frappe/public/scss/espresso/_typography.scss index 1fe7610d39..685f79bc06 100644 --- a/frappe/public/scss/espresso/_typography.scss +++ b/frappe/public/scss/espresso/_typography.scss @@ -5,7 +5,7 @@ --text-2xs: 12px; --text-xs: 12px; --text-sm: 13px; - --text-md: 13px; // alias + --text-md: 13px; // alias --text-base: 14px; --text-lg: 16px; --text-xl: 18px;