From 72c98a6716598dc4325c98ff64aade1c78dbf627 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Tue, 23 Mar 2021 14:26:00 +0530
Subject: [PATCH 1/2] fix: Make scrolling separate for sidebar and main content

(cherry picked from commit 6e22902ae14026ff4a2cf8c9201ad89640ed1fbc)
---
 frappe/public/scss/desk/desktop.scss | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/frappe/public/scss/desk/desktop.scss b/frappe/public/scss/desk/desktop.scss
index 4dad0a4349..eaa9c7a7f7 100644
--- a/frappe/public/scss/desk/desktop.scss
+++ b/frappe/public/scss/desk/desktop.scss
@@ -733,3 +733,18 @@ body {
 		height: 200px;
 	}
 }
+
+[data-page-route="Workspaces"] {
+	@media (min-width: map-get($grid-breakpoints, "lg")) {
+		.layout-main {
+			height: calc(100vh - var(--navbar-height) - var(--page-head-height) - 5px);
+			.layout-side-section, .layout-main-section-wrapper {
+				height: 100%;
+				overflow-y: scroll;
+			}
+			.desk-sidebar {
+				margin-bottom: var(--margin-2xl);
+			}
+		}
+	}
+}

From 574bd11c2d9fe260f9ce7c0e1690023b3ce4f1e3 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Tue, 23 Mar 2021 14:26:26 +0530
Subject: [PATCH 2/2] fix: Mobile view for workspace

(cherry picked from commit 228cbb1a17a82ba94c9384ac2d8770a7530b4140)
---
 frappe/public/scss/desk/desktop.scss | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/frappe/public/scss/desk/desktop.scss b/frappe/public/scss/desk/desktop.scss
index eaa9c7a7f7..ac58f203ea 100644
--- a/frappe/public/scss/desk/desktop.scss
+++ b/frappe/public/scss/desk/desktop.scss
@@ -485,6 +485,19 @@ body {
 				}
 			}
 		}
+
+		@media (max-width: map-get($grid-breakpoints, "sm")) {
+			.widget-body {
+				flex-direction: column;
+				.onboarding-steps-wrapper {
+					min-width: none;
+				}
+				.onboarding-step-preview {
+					padding-left: 0;
+					padding-top: var(--padding-lg);
+				}
+			}
+		}
 	}
 
 	&.shortcut-widget-box {