From 477335eb4aee1fc3987139770feee06d254e036d Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Fri, 14 Apr 2023 17:26:24 +0530 Subject: [PATCH] fix: prioritize modal over freeze in grid-form --- frappe/public/js/frappe/form/grid_row.js | 2 +- frappe/public/scss/common/grid.scss | 6 +++++- frappe/public/scss/desk/global.scss | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js index 27ca3dba0c..d4fdd47a11 100644 --- a/frappe/public/js/frappe/form/grid_row.js +++ b/frappe/public/js/frappe/form/grid_row.js @@ -1296,7 +1296,7 @@ export default class GridRow { .find(".grid-delete-row") .toggle(!(this.grid.df && this.grid.df.cannot_delete_rows)); - frappe.dom.freeze("", "dark"); + frappe.dom.freeze("", "dark grid-form"); if (cur_frm) cur_frm.cur_grid = this; this.wrapper.addClass("grid-row-open"); if ( diff --git a/frappe/public/scss/common/grid.scss b/frappe/public/scss/common/grid.scss index f25c7ef66c..99ecfff932 100644 --- a/frappe/public/scss/common/grid.scss +++ b/frappe/public/scss/common/grid.scss @@ -321,7 +321,7 @@ overflow: hidden; height: 0; opacity: 0; - z-index: 1051; + z-index: 1021; border-radius: var(--border-radius-md); @include base-grid(); @@ -362,6 +362,10 @@ } } +#freeze.grid-form { + z-index: 1020; +} + .recorder-form-in-grid { z-index: 0; @include base-grid(); diff --git a/frappe/public/scss/desk/global.scss b/frappe/public/scss/desk/global.scss index cb66de9920..9f1b0b56a4 100644 --- a/frappe/public/scss/desk/global.scss +++ b/frappe/public/scss/desk/global.scss @@ -418,7 +418,7 @@ kbd { // freeze backdrop text #freeze { - z-index: 1050; + z-index: 1055; bottom: 0; opacity: 0; background-color: var(--bg-color);