From 68d9c92c70255794be6897e93335220062478a81 Mon Sep 17 00:00:00 2001 From: prssanna Date: Wed, 26 Aug 2020 17:30:56 +0530 Subject: [PATCH 1/9] fix: remove filter divider margin --- frappe/public/scss/filters.scss | 2 -- 1 file changed, 2 deletions(-) diff --git a/frappe/public/scss/filters.scss b/frappe/public/scss/filters.scss index 8e3ec46878..efbbb8543e 100644 --- a/frappe/public/scss/filters.scss +++ b/frappe/public/scss/filters.scss @@ -48,8 +48,6 @@ } .divider { - margin-right: -10px; - margin-left: -10px; background-color: var(--border-color); } } From 6ad81dc690983a066b152e2fdf8ccb0f44da59a5 Mon Sep 17 00:00:00 2001 From: prssanna Date: Wed, 26 Aug 2020 23:10:42 +0530 Subject: [PATCH 2/9] fix: don't set undefined filters --- frappe/public/js/frappe/ui/filters/filter_list.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/ui/filters/filter_list.js b/frappe/public/js/frappe/ui/filters/filter_list.js index 36d19398e3..571edd0ce9 100644 --- a/frappe/public/js/frappe/ui/filters/filter_list.js +++ b/frappe/public/js/frappe/ui/filters/filter_list.js @@ -64,7 +64,6 @@ frappe.ui.FilterGroup = class { if (!this.wrapper) { this.wrapper = $('.filter-popover'); - console.log('shownn', this.filters); if (hide_empty_filters) { this.toggle_empty_filters(false); this.add_filters_to_popover(this.filters); @@ -76,8 +75,8 @@ frappe.ui.FilterGroup = class { }); this.filter_button.on('hidden.bs.popover', (e) => { - this.on_change(); this.update_filters(); + this.on_change(); }); $(window).on('hashchange', () => { @@ -243,7 +242,9 @@ frappe.ui.FilterGroup = class { } update_filters() { - this.filters = this.filters.filter((f) => f.field); // remove hidden filters + // remove hidden filters and undefined filters + this.filters.map(f => !f.get_selected_value() && f.remove()); + this.filters = this.filters.filter(f => f.get_selected_value() && f.field); this.update_filter_button(); this.filters.length === 0 && this.toggle_empty_filters(true); From 9758f9ead831e0c22ba61a1ee507a6b3434f56b0 Mon Sep 17 00:00:00 2001 From: prssanna Date: Wed, 26 Aug 2020 23:11:08 +0530 Subject: [PATCH 3/9] fix: filter icon close button alignment --- frappe/public/js/frappe/ui/filters/edit_filter.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/ui/filters/edit_filter.html b/frappe/public/js/frappe/ui/filters/edit_filter.html index a09817a8c7..59185f3d4a 100644 --- a/frappe/public/js/frappe/ui/filters/edit_filter.html +++ b/frappe/public/js/frappe/ui/filters/edit_filter.html @@ -12,7 +12,7 @@
-
+
From bf6c8355cc0f3d10f8becf5d3a6353883212d2d7 Mon Sep 17 00:00:00 2001 From: prssanna Date: Wed, 26 Aug 2020 23:33:03 +0530 Subject: [PATCH 4/9] fix: default color input color --- frappe/public/js/frappe/form/controls/color.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/form/controls/color.js b/frappe/public/js/frappe/form/controls/color.js index f954002b33..8efde67e50 100644 --- a/frappe/public/js/frappe/form/controls/color.js +++ b/frappe/public/js/frappe/form/controls/color.js @@ -35,8 +35,8 @@ frappe.ui.form.ControlColor = frappe.ui.form.ControlData.extend({ set_formatted_input: function(value) { this._super(value); - if (!value) value = '#FFFFFF'; - const contrast = frappe.ui.color.get_contrast_color(value); + if (!value) value = '#F4F5F5'; + const contrast = frappe.ui.color.get_contrast_color(value); this.$input.css({ "background-color": value, "color": contrast From e4e46beaf5666d52a81def29ff6de51407a2f84c Mon Sep 17 00:00:00 2001 From: prssanna Date: Wed, 26 Aug 2020 23:36:00 +0530 Subject: [PATCH 5/9] fix: controls select icon stroke color - move select icon style to controls.scss --- frappe/public/less/controls.less | 19 ------------------- frappe/public/scss/controls.scss | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/frappe/public/less/controls.less b/frappe/public/less/controls.less index 19b916e036..0259140652 100644 --- a/frappe/public/less/controls.less +++ b/frappe/public/less/controls.less @@ -110,25 +110,6 @@ } } -.frappe-control[data-fieldtype="Select"] .control-input { - position: relative; - - select { - /* for Firefox */ - -moz-appearance: none; - /* for Chrome */ - -webkit-appearance: none; - } - - .icon { - position: absolute; - top: 8px; - height: 15px; - right: 12px; - pointer-events: none; - } -} - /* duration control */ .duration-picker { diff --git a/frappe/public/scss/controls.scss b/frappe/public/scss/controls.scss index b73bbd2850..89612c6fdc 100644 --- a/frappe/public/scss/controls.scss +++ b/frappe/public/scss/controls.scss @@ -28,4 +28,26 @@ .frappe-control { font-size: var(--text-md); +} + +.frappe-control[data-fieldtype="Select"] .control-input { + position: relative; + + select { + /* for Firefox */ + -moz-appearance: none; + /* for Chrome */ + -webkit-appearance: none; + } + + .icon { + position: absolute; + top: 8px; + height: 15px; + right: 12px; + pointer-events: none; + use { + stroke: var(--text-muted); + } + } } \ No newline at end of file From 187f84c9d3b2db789fd86110a3567af5a5f0cffe Mon Sep 17 00:00:00 2001 From: prssanna Date: Wed, 26 Aug 2020 23:37:08 +0530 Subject: [PATCH 6/9] fix: chart widget menu icon --- frappe/public/js/frappe/widgets/chart_widget.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js index cb7b080ccf..31f0881391 100644 --- a/frappe/public/js/frappe/widgets/chart_widget.js +++ b/frappe/public/js/frappe/widgets/chart_widget.js @@ -473,7 +473,7 @@ export default class ChartWidget extends Widget { /* eslint-disable indent */ this.chart_actions = $(`
    ${actions From bfc5c3cd09d68e62c3312b725e56d0805e4b0db7 Mon Sep 17 00:00:00 2001 From: prssanna Date: Wed, 26 Aug 2020 23:38:29 +0530 Subject: [PATCH 7/9] fix: removed notifications.less from build.json --- frappe/public/build.json | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/public/build.json b/frappe/public/build.json index fe1d467a39..3a1e2a664f 100755 --- a/frappe/public/build.json +++ b/frappe/public/build.json @@ -90,7 +90,6 @@ "public/less/desk.less", "public/less/module.less", "public/less/flex.less", - "public/less/notifications.less", "public/less/link_preview.less", "public/less/form.less", "public/less/mobile.less", From 1b6a5ce1077a9f36336eae6e406d2aa57c16fb67 Mon Sep 17 00:00:00 2001 From: prssanna Date: Wed, 26 Aug 2020 23:39:18 +0530 Subject: [PATCH 8/9] fix(Filter): check if field exists while getting selected value --- frappe/public/js/frappe/ui/filters/filter.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/public/js/frappe/ui/filters/filter.js b/frappe/public/js/frappe/ui/filters/filter.js index 14c089fe39..209fa8485e 100644 --- a/frappe/public/js/frappe/ui/filters/filter.js +++ b/frappe/public/js/frappe/ui/filters/filter.js @@ -406,6 +406,8 @@ frappe.ui.filter_utils = { }, get_selected_value(field, condition) { + if (!field) return; + let val = field.get_value(); if (typeof val === 'string') { From 032ea96269fc3edc659253c0cd8e04739d1a924a Mon Sep 17 00:00:00 2001 From: prssanna Date: Wed, 26 Aug 2020 23:59:03 +0530 Subject: [PATCH 9/9] fix: yellow highlight background color --- frappe/public/scss/dark.scss | 1 + frappe/public/scss/grid.scss | 2 +- frappe/public/scss/list.scss | 6 +++--- frappe/public/scss/variables.scss | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/frappe/public/scss/dark.scss b/frappe/public/scss/dark.scss index f449396cc6..89fdb76fe5 100644 --- a/frappe/public/scss/dark.scss +++ b/frappe/public/scss/dark.scss @@ -36,6 +36,7 @@ --border-color: var(--gray-700); --dark-border-color: var(--gray-600); --highlight-color: var(--gray-700); + --yellow-highlight-color: var(--yellow-700); .frappe-card { .btn-default { diff --git a/frappe/public/scss/grid.scss b/frappe/public/scss/grid.scss index 8a4d021636..a88a2d6dba 100644 --- a/frappe/public/scss/grid.scss +++ b/frappe/public/scss/grid.scss @@ -40,7 +40,7 @@ // padding: 10px 15px; &.highlight { - background-color: var(--yellow-50); + background-color: var(--yellow-highlight-color); } &.sortable-handle { diff --git a/frappe/public/scss/list.scss b/frappe/public/scss/list.scss index 71f058a1b1..4b3682d65b 100644 --- a/frappe/public/scss/list.scss +++ b/frappe/public/scss/list.scss @@ -79,9 +79,9 @@ body.no-list-sidebar { flex-direction: column; outline: none; - // &:focus { - // background-color: $light-yellow; - // } + &:focus { + background-color: var(--yellow-highlight-color); + } } .list-row { diff --git a/frappe/public/scss/variables.scss b/frappe/public/scss/variables.scss index 362e36583a..b4d6469fb1 100644 --- a/frappe/public/scss/variables.scss +++ b/frappe/public/scss/variables.scss @@ -181,6 +181,7 @@ $card-box-shadow: 0px 0px 1px rgba(17, 43, 66, 0.16), 0px 1px 3px rgba(17, 43, 6 --border-color: var(--gray-100); --dark-border-color: var(--gray-300); --highlight-color: var(--gray-50); + --yellow-highlight-color: var(--yellow-50); // Border Sizes --border-radius-sm: 4px;