From ad204942c47369254cc3ca93b08f4c5da3c2abaa Mon Sep 17 00:00:00 2001
From: Flora Thiebaut <flora.thiebaut@sdsc.ethz.ch>
Date: Fri, 31 May 2024 10:10:45 +0200
Subject: [PATCH 1/2] fix: fix project page nav in small viewports

Fixes #3168.
---
 .../ProjectPageV2/ProjectPageNav/ProjectPageNav.tsx         | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/client/src/features/ProjectPageV2/ProjectPageNav/ProjectPageNav.tsx b/client/src/features/ProjectPageV2/ProjectPageNav/ProjectPageNav.tsx
index 2bc959e2e8..af5337993a 100644
--- a/client/src/features/ProjectPageV2/ProjectPageNav/ProjectPageNav.tsx
+++ b/client/src/features/ProjectPageV2/ProjectPageNav/ProjectPageNav.tsx
@@ -107,11 +107,7 @@ export default function ProjectPageNav({
             end
             to={projectSettingsUrl}
             title="Settings"
-            className={cx(
-              navLinkClasses,
-              selectedContent === ProjectPageContentType.Settings && "active",
-              styles.navLink
-            )}
+            className={cx(navLinkClasses, styles.navLink)}
           >
             <PencilSquare
               className={cx("d-block", "d-lg-none", "rk-icon-md")}

From e68ce30751e601297e0dae97c7bdcd71fe8888a5 Mon Sep 17 00:00:00 2001
From: Flora Thiebaut <flora.thiebaut@sdsc.ethz.ch>
Date: Fri, 31 May 2024 10:41:12 +0200
Subject: [PATCH 2/2] fix it

---
 .../ProjectPageContainer/ProjectPageContainer.tsx  | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/client/src/features/ProjectPageV2/ProjectPageContainer/ProjectPageContainer.tsx b/client/src/features/ProjectPageV2/ProjectPageContainer/ProjectPageContainer.tsx
index 91c6e33dd8..e659798c5e 100644
--- a/client/src/features/ProjectPageV2/ProjectPageContainer/ProjectPageContainer.tsx
+++ b/client/src/features/ProjectPageV2/ProjectPageContainer/ProjectPageContainer.tsx
@@ -75,19 +75,13 @@ function ProjectPageContainerInner({
       >
         <ProjectPageHeader project={data} />
       </Col>
-      <Col sm={12} lg={1} className={cx(styles.NavContainer)}>
-        <div className="sticky-top pt-2 pt-md-4">
-          <ProjectPageNav
-            project={data}
-            selectedContent={contentPage}
-          ></ProjectPageNav>
+      <Col sm={12} lg={1} className={styles.NavContainer}>
+        <div className={cx("sticky-lg-top", "z-1", "pt-2", "pt-md-4")}>
+          <ProjectPageNav project={data} selectedContent={contentPage} />
         </div>
       </Col>
       <Col sm={12} lg={11}>
-        <ProjectPageContent
-          project={data}
-          selectedContent={contentPage}
-        ></ProjectPageContent>
+        <ProjectPageContent project={data} selectedContent={contentPage} />
       </Col>
     </Row>
   );