From ab76d2d5192997c9c0cad0df9e86f1b2cd377914 Mon Sep 17 00:00:00 2001 From: prssanna Date: Thu, 4 Feb 2021 18:10:36 +0530 Subject: [PATCH 1/9] fix: setup wizard error state --- frappe/desk/page/setup_wizard/setup_wizard.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/desk/page/setup_wizard/setup_wizard.js b/frappe/desk/page/setup_wizard/setup_wizard.js index c39e7f52c0..f44a57e339 100644 --- a/frappe/desk/page/setup_wizard/setup_wizard.js +++ b/frappe/desk/page/setup_wizard/setup_wizard.js @@ -201,7 +201,7 @@ frappe.setup.SetupWizard = class SetupWizard extends frappe.ui.Slides { this.abort_setup(r.message.fail); } }, - error: this.abort_setup("Error in setup", true) + error: () => this.abort_setup("Error in setup") }); } From 8254ef96f34275821663f01a2fd9fd30ad1b8f54 Mon Sep 17 00:00:00 2001 From: prssanna Date: Thu, 4 Feb 2021 18:20:25 +0530 Subject: [PATCH 2/9] fix: increase page head z-index --- frappe/public/scss/desk/page.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/scss/desk/page.scss b/frappe/public/scss/desk/page.scss index 46bec46573..3d14794997 100644 --- a/frappe/public/scss/desk/page.scss +++ b/frappe/public/scss/desk/page.scss @@ -78,7 +78,7 @@ } .page-head { - z-index: 2; + z-index: 4; position: sticky; top: var(--navbar-height); background: var(--bg-color); From 05fdd6d0dae30e2b64acdc67819ae7c17db5137b Mon Sep 17 00:00:00 2001 From: prssanna Date: Mon, 8 Feb 2021 11:43:50 +0530 Subject: [PATCH 3/9] fix: dashboard shortcut route on workspace --- frappe/public/js/frappe/utils/utils.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js index 5f6126b81f..de888fcd4a 100644 --- a/frappe/public/js/frappe/utils/utils.js +++ b/frappe/public/js/frappe/utils/utils.js @@ -708,7 +708,7 @@ Object.assign(frappe.utils, { title = frappe._title_prefix + " " + title.replace(/<[^>]*>/g, ""); } document.title = title; - + // save for re-routing const sub_path = frappe.router.get_sub_path(); frappe.route_titles[sub_path] = title; @@ -1172,7 +1172,7 @@ Object.assign(frappe.utils, { } else if (type === "page") { route = item.name; } else if (type === "dashboard") { - route = "dashboard/" + item.name; + route = `dashboard-view/${item.name}`; } } else { From 15969a2f83e1fad07a709ed8f32fc1cfbf4d85cf Mon Sep 17 00:00:00 2001 From: prssanna Date: Mon, 8 Feb 2021 11:44:11 +0530 Subject: [PATCH 4/9] fix: remove deleted file from build --- frappe/public/build.json | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/public/build.json b/frappe/public/build.json index 35e9d62436..f2a4d65582 100755 --- a/frappe/public/build.json +++ b/frappe/public/build.json @@ -194,7 +194,6 @@ "public/js/frappe/ui/toolbar/search.js", "public/js/frappe/ui/toolbar/tag_utils.js", "public/js/frappe/ui/toolbar/search.html", - "public/js/frappe/ui/toolbar/search_header.html", "public/js/frappe/ui/toolbar/search_utils.js", "public/js/frappe/ui/toolbar/about.js", "public/js/frappe/ui/toolbar/navbar.html", From 3c2708d66f365f1609bce0c0a973383bb621e5ae Mon Sep 17 00:00:00 2001 From: prssanna Date: Mon, 8 Feb 2021 16:52:14 +0530 Subject: [PATCH 5/9] fix: restricted button style --- frappe/public/icons/timeless/symbol-defs.svg | 3 +++ frappe/public/js/frappe/list/list_view.js | 2 +- frappe/public/scss/desk/list.scss | 12 ++++++++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/frappe/public/icons/timeless/symbol-defs.svg b/frappe/public/icons/timeless/symbol-defs.svg index d6852c620f..78cca81520 100644 --- a/frappe/public/icons/timeless/symbol-defs.svg +++ b/frappe/public/icons/timeless/symbol-defs.svg @@ -677,4 +677,7 @@ + + + diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index 6e8bd63676..2f1f278ecc 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -165,7 +165,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { if (match_rules_list.length) { this.restricted_list = $( `` ).click(() => this.show_restrictions(match_rules_list)).appendTo(this.page.page_form); } diff --git a/frappe/public/scss/desk/list.scss b/frappe/public/scss/desk/list.scss index d95bcaffd1..f1eadd6b3a 100644 --- a/frappe/public/scss/desk/list.scss +++ b/frappe/public/scss/desk/list.scss @@ -372,13 +372,17 @@ input.list-check-all, input.list-row-checkbox { margin-top: var(--margin-xs); height: var(--margin-xl); - .icon use { - stroke: var(--text-on-yellow); + .icon { + width: 14px; + height: 14px; + use { + stroke: var(--yellow-800); + } } &.btn { - box-shadow: none; - border: 1px solid; + box-shadow: none !important; + border: none; @include button-variant( $background: $light-yellow, $border: darken($light-yellow, 5%), From 0d693d72e6d8649709065d4214fab2975e3b6335 Mon Sep 17 00:00:00 2001 From: prssanna Date: Mon, 8 Feb 2021 16:52:59 +0530 Subject: [PATCH 6/9] fix: dark theme button styles --- frappe/public/scss/common/buttons.scss | 8 ++++++++ frappe/public/scss/common/css_variables.scss | 2 ++ frappe/public/scss/desk/dark.scss | 6 ++++++ 3 files changed, 16 insertions(+) diff --git a/frappe/public/scss/common/buttons.scss b/frappe/public/scss/common/buttons.scss index b7d7bf1e5e..74d864afa1 100644 --- a/frappe/public/scss/common/buttons.scss +++ b/frappe/public/scss/common/buttons.scss @@ -86,4 +86,12 @@ .btn.btn-danger { background-color: var(--red-400); color: $white; +} + + +[data-theme="dark"] { + .btn-primary-light { + background-color: var(--bg-dark-blue); + box-shadow: none; + } } \ No newline at end of file diff --git a/frappe/public/scss/common/css_variables.scss b/frappe/public/scss/common/css_variables.scss index 2276acd533..afda26fac3 100644 --- a/frappe/public/scss/common/css_variables.scss +++ b/frappe/public/scss/common/css_variables.scss @@ -141,6 +141,7 @@ // Background Text Color Pairs --bg-blue: var(--blue-100); --bg-light-blue: var(--blue-50); + --bg-dark-blue: var(--blue-300); --bg-green: var(--dark-green-50); --bg-yellow: var(--yellow-50); --bg-orange: var(--orange-50); @@ -151,6 +152,7 @@ --text-on-blue: var(--blue-600); --text-on-light-blue: var(--blue-500); + --text-on-dark-blue: var(--blue-700); --text-on-blue: var(--blue-600); --text-on-green: var(--dark-green-500); --text-on-yellow: var(--yellow-500); diff --git a/frappe/public/scss/desk/dark.scss b/frappe/public/scss/desk/dark.scss index 01ca5103ec..b4b2627163 100644 --- a/frappe/public/scss/desk/dark.scss +++ b/frappe/public/scss/desk/dark.scss @@ -42,6 +42,7 @@ // Background Text Color Pairs --bg-blue: var(--blue-600); --bg-light-blue: var(--blue-400); + --bg-dark-blue: var(--blue-900); --bg-green: var(--dark-green-500); --bg-yellow: var(--yellow-500); --bg-orange: var(--orange-500); @@ -52,6 +53,7 @@ --text-on-blue: var(--blue-50); --text-on-light-blue: var(--blue-100); + --text-on-dark-blue: var(--blue-300); --text-on-green: var(--dark-green-50); --text-on-yellow: var(--yellow-50); --text-on-orange: var(--orange-100); @@ -72,6 +74,10 @@ .frappe-card { .btn-default { background-color: var(--bg-color); + + &:hover { + background-color: var(--fg-hover-color); + } } } From f86335551b824d776567b49b60d0dc62308334a5 Mon Sep 17 00:00:00 2001 From: prssanna Date: Tue, 9 Feb 2021 13:30:12 +0530 Subject: [PATCH 7/9] fix: dropdown hidden in grid form --- .../public/js/frappe/form/controls/autocomplete.js | 14 ++++++-------- frappe/public/js/frappe/form/controls/data.js | 4 ++++ frappe/public/js/frappe/form/controls/link.js | 14 ++++++-------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/frappe/public/js/frappe/form/controls/autocomplete.js b/frappe/public/js/frappe/form/controls/autocomplete.js index ddde8ab2f7..27ebad24c3 100644 --- a/frappe/public/js/frappe/form/controls/autocomplete.js +++ b/frappe/public/js/frappe/form/controls/autocomplete.js @@ -89,18 +89,16 @@ frappe.ui.form.ControlAutocomplete = frappe.ui.form.ControlData.extend({ }); this.$input.on("awesomplete-open", () => { - let modal = this.$input.parents('.modal-dialog')[0]; - if (modal) { - $(modal).removeClass("modal-dialog-scrollable"); - } + this.toggle_container_scroll('.modal-dialog', 'modal-dialog-scrollable'); + this.toggle_container_scroll('.grid-form-body .form-area', 'scrollable'); + this.autocomplete_open = true; }); this.$input.on("awesomplete-close", () => { - let modal = this.$input.parents('.modal-dialog')[0]; - if (modal) { - $(modal).addClass("modal-dialog-scrollable"); - } + this.toggle_container_scroll('.modal-dialog', 'modal-dialog-scrollable', true); + this.toggle_container_scroll('.grid-form-body .form-area', 'scrollable', true); + this.autocomplete_open = false; }); diff --git a/frappe/public/js/frappe/form/controls/data.js b/frappe/public/js/frappe/form/controls/data.js index 48b4d9da35..f381d1b4a2 100644 --- a/frappe/public/js/frappe/form/controls/data.js +++ b/frappe/public/js/frappe/form/controls/data.js @@ -129,5 +129,9 @@ frappe.ui.form.ControlData = frappe.ui.form.ControlInput.extend({ } else { return v; } + }, + toggle_container_scroll: function(el_class, scroll_class, add=false) { + let el = this.$input.parents(el_class)[0]; + if (el) $(el).toggleClass(scroll_class, add); } }); diff --git a/frappe/public/js/frappe/form/controls/link.js b/frappe/public/js/frappe/form/controls/link.js index 4ed0c40d33..aae4af03dc 100644 --- a/frappe/public/js/frappe/form/controls/link.js +++ b/frappe/public/js/frappe/form/controls/link.js @@ -236,18 +236,16 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({ }); this.$input.on("awesomplete-open", () => { - let modal = this.$input.parents('.modal-dialog')[0]; - if (modal) { - $(modal).removeClass("modal-dialog-scrollable"); - } + this.toggle_container_scroll('.modal-dialog', 'modal-dialog-scrollable'); + this.toggle_container_scroll('.grid-form-body .form-area', 'scrollable'); + this.autocomplete_open = true; }); this.$input.on("awesomplete-close", () => { - let modal = this.$input.parents('.modal-dialog')[0]; - if (modal) { - $(modal).addClass("modal-dialog-scrollable"); - } + this.toggle_container_scroll('.modal-dialog', 'modal-dialog-scrollable', true); + this.toggle_container_scroll('.grid-form-body .form-area', 'scrollable', true); + this.autocomplete_open = false; }); From 241ad01929b7746c17c19c39bc626e91c94f8fca Mon Sep 17 00:00:00 2001 From: prssanna Date: Tue, 9 Feb 2021 13:30:32 +0530 Subject: [PATCH 8/9] fix: grid form scrollable style --- frappe/public/js/frappe/form/grid_row_form.js | 2 +- frappe/public/scss/desk/grid.scss | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/form/grid_row_form.js b/frappe/public/js/frappe/form/grid_row_form.js index 399f233c54..68e4178ae7 100644 --- a/frappe/public/js/frappe/form/grid_row_form.js +++ b/frappe/public/js/frappe/form/grid_row_form.js @@ -66,7 +66,7 @@ export default class GridRowForm {
-
+