Skip to content

Commit

Permalink
fix: prioritize modal over freeze in grid-form
Browse files Browse the repository at this point in the history
(cherry picked from commit 477335e)
  • Loading branch information
shariquerik authored and mergify[bot] committed Apr 14, 2023
1 parent bb2a687 commit 953b331
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion frappe/public/js/frappe/form/grid_row.js
Original file line number Diff line number Diff line change
Expand Up @@ -1295,7 +1295,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 (
Expand Down
6 changes: 5 additions & 1 deletion frappe/public/scss/common/grid.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -362,6 +362,10 @@
}
}

#freeze.grid-form {
z-index: 1020;
}

.recorder-form-in-grid {
z-index: 0;
@include base-grid();
Expand Down
2 changes: 1 addition & 1 deletion frappe/public/scss/desk/global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ kbd {

// freeze backdrop text
#freeze {
z-index: 1050;
z-index: 1055;
bottom: 0;
opacity: 0;
background-color: var(--bg-color);
Expand Down

0 comments on commit 953b331

Please sign in to comment.