From d7ab46f7f815ec70cb4359e487d4102bc3c41cec Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Thu, 16 Mar 2023 17:16:32 +0530 Subject: [PATCH] fix: allow 5 column layout in doctype form --- frappe/public/js/frappe/form/column.js | 7 ++++++- frappe/public/scss/desk/form.scss | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/column.js b/frappe/public/js/frappe/form/column.js index 3ea4296a94..317679f829 100644 --- a/frappe/public/js/frappe/form/column.js +++ b/frappe/public/js/frappe/form/column.js @@ -38,7 +38,12 @@ export default class Column { resize_all_columns() { // distribute all columns equally - let colspan = cint(12 / this.section.wrapper.find(".form-column").length); + let columns = this.section.wrapper.find(".form-column").length; + let colspan = cint(12 / columns); + + if (columns == 5) { + colspan = 20; + } this.section.wrapper .find(".form-column") diff --git a/frappe/public/scss/desk/form.scss b/frappe/public/scss/desk/form.scss index 516bc699c6..837f32f184 100644 --- a/frappe/public/scss/desk/form.scss +++ b/frappe/public/scss/desk/form.scss @@ -409,6 +409,21 @@ } } +// handle 5 columns in form +.form-column.col-sm-20 { + position: relative; + width: 100%; + padding-right: 15px; + padding-left: 15px; +} + +@media (min-width: map-get($grid-breakpoints, "sm")) { + .form-column.col-sm-20 { + flex: 0 0 20%; + max-width: 20%; + } +} + // above mobile @media (min-width: map-get($grid-breakpoints, "md")) { .layout-main .form-column.col-sm-12 > form > .input-max-width {