From b1e12a610910d294dfa333f8764b06cc4082085c Mon Sep 17 00:00:00 2001
From: Maharshi Patel <maharshi.patel988@gmail.com>
Date: Fri, 20 Oct 2023 16:52:55 +0530
Subject: [PATCH 1/2] fix: minor desk style inconsistencies

- made onboarding widget button default from primary
  as it takes too much attention
- removed desk navbar dropshadow
- made sidebar text smaller and added padding to plus icon and hover effect
- as we need border in tree view btn-group added those styles in tree.scss
- made hover black on workspace links
- dark mode misc
---
 .../public/js/frappe/widgets/onboarding_widget.js  |  4 ++--
 frappe/public/scss/desk/dark.scss                  |  2 +-
 frappe/public/scss/desk/desktop.scss               |  6 +++---
 frappe/public/scss/desk/navbar.scss                |  1 -
 frappe/public/scss/desk/page.scss                  | 10 +++++++---
 frappe/public/scss/desk/sidebar.scss               | 10 +++++++---
 frappe/public/scss/desk/tree.scss                  | 14 ++++++++++++++
 7 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/frappe/public/js/frappe/widgets/onboarding_widget.js b/frappe/public/js/frappe/widgets/onboarding_widget.js
index eaac7725e1..10934f98b2 100644
--- a/frappe/public/js/frappe/widgets/onboarding_widget.js
+++ b/frappe/public/js/frappe/widgets/onboarding_widget.js
@@ -124,12 +124,12 @@ export default class OnboardingWidget extends Widget {
 			set_description();
 
 			if (step.intro_video_url) {
-				$(`<button class="btn btn-primary btn-sm">${__("Watch Tutorial")}</button>`)
+				$(`<button class="btn btn-default btn-sm">${__("Watch Tutorial")}</button>`)
 					.appendTo(this.step_footer)
 					.on("click", toggle_video);
 			} else {
 				$(
-					`<button class="btn btn-primary btn-sm">${__(
+					`<button class="btn btn-default btn-sm">${__(
 						step.action_label || step.action
 					)}</button>`
 				)
diff --git a/frappe/public/scss/desk/dark.scss b/frappe/public/scss/desk/dark.scss
index 5bca420e41..59dc34e032 100644
--- a/frappe/public/scss/desk/dark.scss
+++ b/frappe/public/scss/desk/dark.scss
@@ -194,7 +194,7 @@ $check-icon-dark: url("data:image/svg+xml, <svg viewBox='0 0 8 7' fill='none' xm
 		}
 	}
 	.comment-input-wrapper .ql-editor.ql-blank::before {
-		color: var(--text-muted);
+		color: var(--text-color);
 	}
 	// --appreciation-color: var(--dark-green-100);
 	// --appreciation-bg: var(--dark-green-600);
diff --git a/frappe/public/scss/desk/desktop.scss b/frappe/public/scss/desk/desktop.scss
index 25e86dad47..30456215da 100644
--- a/frappe/public/scss/desk/desktop.scss
+++ b/frappe/public/scss/desk/desktop.scss
@@ -551,9 +551,9 @@ body {
 		cursor: pointer;
 
 		&:hover {
-			--icon-stroke: var(--gray-600);
+			--icon-stroke: var(--invert-neutral);
 			.widget-title {
-				color: var(--gray-600) !important;
+				color: var(--invert-neutral) !important;
 			}
 		}
 
@@ -600,7 +600,7 @@ body {
 			.link-content {
 				flex: 1;
 				&:hover {
-					color: var(--gray-600);
+					color: var(--invert-neutral);
 				}
 			}
 
diff --git a/frappe/public/scss/desk/navbar.scss b/frappe/public/scss/desk/navbar.scss
index ffcf66af48..90504ff981 100644
--- a/frappe/public/scss/desk/navbar.scss
+++ b/frappe/public/scss/desk/navbar.scss
@@ -1,7 +1,6 @@
 .navbar {
 	height: $navbar-height;
 	background: var(--navbar-bg);
-	box-shadow: var(--shadow-sm);
 	border-bottom: 1px solid var(--border-color);
 	padding: 0;
 	.navbar-brand {
diff --git a/frappe/public/scss/desk/page.scss b/frappe/public/scss/desk/page.scss
index cda50da363..acf7b46664 100644
--- a/frappe/public/scss/desk/page.scss
+++ b/frappe/public/scss/desk/page.scss
@@ -58,9 +58,13 @@
 		height: var(--btn-height);
 		margin-left: var(--margin-sm, 8px);
 		border-radius: var(--border-radius);
-		display: flex;
-		align-items: center;
-		gap: 8px;
+		line-height: 1;
+		padding: 4px 8px;
+		&, & .hidden-xs {
+			display: flex;
+			align-items: center;
+			gap: 6px;
+		}
 	}
 	.btn:not(.icon-btn) {
 		padding: 4px 8px;
diff --git a/frappe/public/scss/desk/sidebar.scss b/frappe/public/scss/desk/sidebar.scss
index 035c38cc50..94b162bd7d 100644
--- a/frappe/public/scss/desk/sidebar.scss
+++ b/frappe/public/scss/desk/sidebar.scss
@@ -183,7 +183,7 @@ body[data-route^="Module"] .main-menu {
 }
 
 .layout-side-section {
-	@include get_textstyle("base", "regular");
+	@include get_textstyle("sm", "regular");
 	padding-right: 30px;
 
 	&.hide-sidebar {
@@ -415,8 +415,7 @@ body[data-route^="Module"] .main-menu {
 	.data-pill {
 		background-color: unset;
 		box-shadow: none;
-		padding: 0;
-		padding-left: var(--padding-md);
+		padding:0 var(--padding-xs) 0 var(--padding-md);
 	}
 }
 
@@ -467,6 +466,11 @@ body[data-route^="Module"] .main-menu {
 	width: unset;
 	height: unset;
 	margin-right: 0;
+	padding: var(--padding-xs) !important;
+	border-radius: var(--border-radius-full);
+	&:hover {
+		background-color: var(--subtle-fg);
+	}
 	&:focus {
 		box-shadow: none;
 	}
diff --git a/frappe/public/scss/desk/tree.scss b/frappe/public/scss/desk/tree.scss
index bf99d7c55d..a0cffaa203 100644
--- a/frappe/public/scss/desk/tree.scss
+++ b/frappe/public/scss/desk/tree.scss
@@ -1,5 +1,19 @@
 .tree {
 	padding: var(--padding-sm);
+	.btn-group {
+		.btn {
+			box-shadow: none;
+			outline: 1px solid var(--btn-group-border-color);
+
+			&:not(:first-child) {
+				margin-left: 1px;
+			}
+
+			&:focus {
+				outline: 2px solid var(--dark-border-color);
+			}
+		}
+	}
 }
 
 .tree li {

From 8973ee35d4d41b928f1f67c87d60363d93d51ba6 Mon Sep 17 00:00:00 2001
From: Maharshi Patel <maharshi.patel988@gmail.com>
Date: Fri, 20 Oct 2023 17:43:32 +0530
Subject: [PATCH 2/2] fix(minor): slides border and remove width

- remove unnecessary width from slides to make it a bit more responsive
- change border color to --border-color ( more subtle )
---
 frappe/public/scss/desk/slides.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frappe/public/scss/desk/slides.scss b/frappe/public/scss/desk/slides.scss
index 3b9dd08db6..98eca5f26a 100644
--- a/frappe/public/scss/desk/slides.scss
+++ b/frappe/public/scss/desk/slides.scss
@@ -72,11 +72,10 @@
 }
 
 .slides-wrapper {
-	width: 520px;
 	max-width: 520px;
 	background: var(--card-bg);
 	padding: var(--padding-xl);
-	border: 1px solid var(--gray-400);
+	border: 1px solid var(--border-color);
 	border-radius: var(--border-radius-md);
 
 	.slide-wrapper:focus {