Fix nav aside width issue

epfl-si · Oct 23, 2024 · 79d4939 · 79d4939
1 parent c878b2c
commit 79d4939
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/assets/components/organisms/nav-aside/nav-aside.scss b/assets/components/organisms/nav-aside/nav-aside.scss
@@ -7,21 +7,36 @@
     flex-wrap: nowrap;
     margin-top: $spacer;
 
-    .nav-aside-wrapper {
+    & > .nav-container,
+    & > .nav-aside-wrapper {
       flex: 0 0 22%;
       order: -1;
       max-width: 22%;
       min-width: 320px;
       border-right: 1px solid gray('200');
     }
 
+    & > .nav-container:not( :has( .nav-aside-wrapper ) ) {
+      border: 0;
+      min-width: 0;
+      flex-basis: 0;
+    }
+
     .content {
       flex: 1 1 auto;
       .container { width: 90%; }
     }
   }
 }
 
+.nav-aside-layout > .nav-container,
+.nav-aside-layout > .nav-aside-wrapper {
+  @include media-breakpoint-up(xxl){
+    flex: 0 0 16.1%;
+    max-width: 16.1%;
+  }
+}
+
 .nav-aside-layout .nav-aside-wrapper {
   display: block;
 
@@ -42,11 +57,6 @@
   @include media-breakpoint-up(xl) {
     height: 100%;
   }
-
-  @include media-breakpoint-up(xxl){
-    flex: 0 0 16.1%;
-    max-width: 16.1%;
-  }
 }
 
 .nav-aside {