From 8b3bd5adc3704957a3d416f5ca4e1b0bc987f8dc Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Thu, 16 Feb 2023 14:19:19 +0530
Subject: [PATCH 1/2] fix: help-icon taking space if doc url is not set

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

diff --git a/frappe/public/js/frappe/form/controls/base_input.js b/frappe/public/js/frappe/form/controls/base_input.js
index 50030fdc04..7831a9e9b6 100644
--- a/frappe/public/js/frappe/form/controls/base_input.js
+++ b/frappe/public/js/frappe/form/controls/base_input.js
@@ -17,7 +17,7 @@ frappe.ui.form.ControlInput = class ControlInput extends frappe.ui.form.Control
 				<div class="form-group">
 					<div class="clearfix">
 						<label class="control-label" style="padding-right: 0px;"></label>
-						<span class="ml-1 help"></span>
+						<span class="help"></span>
 					</div>
 					<div class="control-input-wrapper">
 						<div class="control-input"></div>
diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js
index b767dac932..8771229884 100644
--- a/frappe/public/js/frappe/form/grid.js
+++ b/frappe/public/js/frappe/form/grid.js
@@ -63,7 +63,7 @@ export default class Grid {
 		let template = `
 			<div class="grid-field">
 				<label class="control-label">${__(this.df.label || "")}</label>
-				<span class="ml-1 help"></span>
+				<span class="help"></span>
 				<p class="text-muted small grid-description"></p>
 				<div class="grid-custom-buttons"></div>
 				<div class="form-grid-container">
diff --git a/frappe/public/scss/common/controls.scss b/frappe/public/scss/common/controls.scss
index 08debbbde9..9fe5f82a35 100644
--- a/frappe/public/scss/common/controls.scss
+++ b/frappe/public/scss/common/controls.scss
@@ -135,6 +135,9 @@ select.form-control {
 		content: ' *';
 		color: var(--red-400);
 	}
+	.help:empty {
+		display: none;
+	}
 	.ql-editor:not(.read-mode) {
 		background-color: var(--control-bg);
 	}

From 6bf326996e9906cfd1887d6dc215be44b04126e5 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Thu, 16 Feb 2023 14:57:27 +0530
Subject: [PATCH 2/2] fix: do not show help-icon in report view (datatable)

---
 frappe/public/scss/desk/frappe_datatable.scss | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/frappe/public/scss/desk/frappe_datatable.scss b/frappe/public/scss/desk/frappe_datatable.scss
index cfec31b72e..1bf3dc5b41 100644
--- a/frappe/public/scss/desk/frappe_datatable.scss
+++ b/frappe/public/scss/desk/frappe_datatable.scss
@@ -36,6 +36,10 @@
 			top: 5px;
 			right: 10px;
 		}
+
+		.help {
+			display: none;
+		}
 	}
 
 	.dt-header {
@@ -67,6 +71,10 @@
 
 	.checkbox {
 		margin: 7px 0 7px 8px;
+
+		.label-area {
+			display: none;
+		}
 	}
 
 	[data-fieldtype="Color"] .control-input {