From 3b776409d089a4af205b4e800872733be4f34b75 Mon Sep 17 00:00:00 2001
From: SatyamKumarCS <satyamkumarch15@gmail.com>
Date: Thu, 14 May 2026 19:04:09 +0530
Subject: [PATCH 1/2] Fix Back to Editor hover state gap and icon visibility

---
 client/styles/components/_nav.scss | 74 +++++++++++++++++++++++-------
 1 file changed, 57 insertions(+), 17 deletions(-)

diff --git a/client/styles/components/_nav.scss b/client/styles/components/_nav.scss
index 887407db45..ba9c8aa3ba 100644
--- a/client/styles/components/_nav.scss
+++ b/client/styles/components/_nav.scss
@@ -21,13 +21,14 @@
   @include themify() {
     border-bottom: 1px dashed map-get($theme-map, 'nav-border-color');
   }
-  // padding-left: #{math.div(20, $base-font-size)}rem;
+
+
 }
 
 .nav__menubar {
   display: flex;
   flex-direction: row;
-  width:100%;
+  width: 100%;
   justify-content: space-between;
 }
 
@@ -57,11 +58,11 @@
 }
 
 // base focus styles
-.nav__item button:focus {  
+.nav__item button:focus {
   @include themify() {
     background-color: getThemifyVariable('nav-hover-color');
   }
-  
+
   .nav__item-header {
     @include themify() {
       color: getThemifyVariable('button-hover-color');
@@ -73,11 +74,12 @@
     @include themify() {
       fill: getThemifyVariable('button-hover-color');
     }
-  }  
+  }
 }
 
 
 .nav__dropdown-item {
+
   & button:focus,
   & a:focus {
     @include themify() {
@@ -85,6 +87,7 @@
       background-color: getThemifyVariable('nav-hover-color');
     }
   }
+
   & button:focus .nav__keyboard-shortcut,
   & a:focus .nav__keyboard-shortcut {
     @include themify() {
@@ -93,6 +96,7 @@
   }
 
   &.nav__dropdown-item--disabled {
+
     & button,
     & a,
     & button:hover,
@@ -111,7 +115,7 @@
 }
 
 .nav__item--no-icon {
-  padding-left: #{math.div(15, $base-font-size)}rem;
+  padding-left: 0;
 }
 
 .nav__item-header-triangle polygon,
@@ -131,8 +135,9 @@
       color: getThemifyVariable('button-hover-color');
     }
   }
-  
-  & g, & path {
+
+  & g,
+  & path {
     @include themify() {
       fill: getThemifyVariable('nav-hover-color');
     }
@@ -146,11 +151,24 @@
   }
 }
 
+
+.nav__item.nav__item--no-icon:hover {
+  background-color: transparent !important;
+
+  .nav__back-link {
+    @include themify() {
+      background-color: getThemifyVariable('nav-hover-color');
+    }
+  }
+}
+
 .nav__item-header:hover {
   @include themify() {
     color: getThemifyVariable('nav-hover-color');
   }
-  & g, & path {
+
+  & g,
+  & path {
     @include themify() {
       fill: getThemifyVariable('nav-hover-color');
     }
@@ -158,17 +176,17 @@
 }
 
 .nav__item-header-triangle {
-	margin-left: #{math.div(5, $base-font-size)}rem;
+  margin-left: #{math.div(5, $base-font-size)}rem;
 }
 
 .nav__dropdown {
   @include themify() {
-      color: getThemifyVariable('nav-hover-color');
-    }
+    color: getThemifyVariable('nav-hover-color');
+  }
 }
 
 .nav__item-header-triangle {
-	margin-left: #{math.div(5, $base-font-size)}rem;
+  margin-left: #{math.div(5, $base-font-size)}rem;
 }
 
 .nav__dropdown {
@@ -176,6 +194,7 @@
   display: none;
   max-height: none;
   overflow: visible;
+
   .nav__item--open & {
     display: flex;
   }
@@ -211,6 +230,7 @@
 // }
 
 .nav__dropdown-item {
+
   & button,
   & a,
   & .tooltip-wrapper button,
@@ -223,6 +243,7 @@
   }
 
   &:hover {
+
     & .tooltip-wrapper button,
     & .tooltip-wrapper a {
       @include themify() {
@@ -251,8 +272,8 @@
 
 }
 
-.svg__logo g path{
-  
+.svg__logo g path {
+
   @include themify() {
     // Set internal color of the logo;
     fill: getThemifyVariable('logo-background-color');
@@ -278,15 +299,34 @@
 }
 
 .nav__back-icon {
-  & g, & path {
+
+  & g,
+  & path {
     opacity: 1;
+
     @include themify() {
       fill: getThemifyVariable('inactive-text-color');
     }
   }
+
   margin-right: #{math.div(5, $base-font-size)}rem;
 }
 
+
+.nav__item.nav__item--no-icon:hover .nav__back-icon {
+
+  & g,
+  & path {
+    @include themify() {
+      fill: getThemifyVariable('button-hover-color');
+    }
+  }
+}
+
 .nav__back-link {
   display: flex;
-}
+
+  align-items: center;
+  height: 100%;
+  padding: 0 #{math.div(10, $base-font-size)}rem;
+}
\ No newline at end of file

From e72fe6a9d3186eb4b0b9197b3518e7d9d6225bf6 Mon Sep 17 00:00:00 2001
From: SatyamKumarCS <satyamkumarch15@gmail.com>
Date: Mon, 25 May 2026 02:23:32 +0530
Subject: [PATCH 2/2] style: remove unnecessary !important from nav hover rule

---
 client/styles/components/_nav.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/styles/components/_nav.scss b/client/styles/components/_nav.scss
index ba9c8aa3ba..c5901aec7e 100644
--- a/client/styles/components/_nav.scss
+++ b/client/styles/components/_nav.scss
@@ -153,7 +153,7 @@
 
 
 .nav__item.nav__item--no-icon:hover {
-  background-color: transparent !important;
+  background-color: transparent;
 
   .nav__back-link {
     @include themify() {