Merge pull request #1131 from PlanoramaEvents/development

v3.7.1-rc3
PlanoramaEvents · Jul 17, 2024 · 49428b3 · 49428b3
2 parents 3ccb19c + cc37080
commit 49428b3
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 7 deletions.
diff --git a/app/javascript/navbar/bottom-navbar.vue b/app/javascript/navbar/bottom-navbar.vue
@@ -28,12 +28,18 @@ export default {
 .silly-spacer {
   width: 5rem;
 }
+
+@media (min-width: 576px) {
+  footer {
+    position: absolute;
+    bottom: 0px;
+  }
+}
+
 footer {
   background: $color-primary-4;
   height: 50px;
   width: 100%;
-  position: absolute;
-  bottom: 0px;
   padding: 10px;
   z-index: 3000;
 

diff --git a/app/javascript/stylesheets/style.scss b/app/javascript/stylesheets/style.scss
@@ -22,7 +22,6 @@ dt {
 }
 
 .navbar.navbar-light {
-  height: 100px;
   background: linear-gradient(to right, #ffffff, $color-primary-4 67%);
   border-bottom: 5px solid $color-primary-0;
   .navbar-brand {
@@ -33,11 +32,29 @@ dt {
   &.not-production {
     background: linear-gradient(to right, #ffffff, #f311d8 67%); 
   }
+
+}
+
+@media (min-width: 576px) {
+  .navbar.navbar-light {
+    height: 100px;
+  }
+
+  #side-navbar .nav {
+    height: calc(100vh - 150px);
+  }
+
+  .scrollable {
+    max-height: calc(100vh - 150px);
+    overflow-x: auto;
+    &.minus31 {
+      max-height: calc(100vh - 181px);
+    }
+  }
 }
 
 #side-navbar .nav {
   background: $color-light-blue;
-  height: calc(100vh - 150px);
   overflow-y: auto;
   .nav-link.active {
     background: $color-primary-2;
@@ -53,12 +70,9 @@ dt {
   max-width: 30rem;
 }
 .scrollable {
-  max-height: calc(100vh - 150px);
   overflow-y: auto;
-  overflow-x: auto;
   padding-right: 1em;
   &.minus31 {
-    max-height: calc(100vh - 181px);
     padding-right: 0;
   }
 }