From e79ce22d4d7070c814da333e166830f64ca16c07 Mon Sep 17 00:00:00 2001
From: Sagar Vora <sagar@resilient.tech>
Date: Tue, 25 May 2021 19:08:19 +0530
Subject: [PATCH] fix: double checkboxes showing in editable grid

---
 frappe/public/js/frappe/form/controls/check.js | 4 +++-
 frappe/public/scss/common/grid.scss            | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/form/controls/check.js b/frappe/public/js/frappe/form/controls/check.js
index 658ef640a9..1209f52e6d 100644
--- a/frappe/public/js/frappe/form/controls/check.js
+++ b/frappe/public/js/frappe/form/controls/check.js
@@ -14,8 +14,10 @@ frappe.ui.form.ControlCheck = class ControlCheck extends frappe.ui.form.ControlD
 		</div>`).appendTo(this.parent);
 	}
 	set_input_areas() {
-		this.label_area = this.label_span = this.$wrapper.find(".label-area").get(0);
 		this.input_area = this.$wrapper.find(".input-area").get(0);
+		if (this.only_input) return;
+
+		this.label_area = this.label_span = this.$wrapper.find(".label-area").get(0);
 		this.disp_area = this.$wrapper.find(".disp-area").get(0);
 	}
 	make_input() {
diff --git a/frappe/public/scss/common/grid.scss b/frappe/public/scss/common/grid.scss
index 3cc5139d9e..aac949b1bf 100644
--- a/frappe/public/scss/common/grid.scss
+++ b/frappe/public/scss/common/grid.scss
@@ -140,7 +140,7 @@
 		.checkbox {
 			margin: 0px;
 			text-align: center;
-			margin-top: 9px;
+			margin-top: var(--padding-sm);
 		}
 
 		textarea {