From 200d4a0f3d062521f20527b0fe02172d45c35536 Mon Sep 17 00:00:00 2001
From: Matthew Mamonov <g.smellyshovel@gmail.com>
Date: Mon, 2 Dec 2019 20:30:54 +0300
Subject: [PATCH] feat: fixed sidebar and navbar (#635) (#644)

---
 src/components/admin/VaPageLayout.vue           | 5 +++++
 src/components/admin/app-navbar/AppNavbar.vue   | 6 +++++-
 src/components/admin/app-sidebar/AppSidebar.vue | 9 ++++++++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/components/admin/VaPageLayout.vue b/src/components/admin/VaPageLayout.vue
index b31117768..ad7eeab43 100644
--- a/src/components/admin/VaPageLayout.vue
+++ b/src/components/admin/VaPageLayout.vue
@@ -71,10 +71,15 @@ $vuestic-preloader-top: calc(50% - 104px / 2);
 
 .va-page-layout {
   .content-wrap {
+    margin-top: 65px;
     margin-left: $sidebar-width;
     transition: margin-left 0.3s ease;
     padding: 0;
 
+    @include media-breakpoint-down(sm) {
+      margin-top: $sidebar-mobile-top;
+    }
+
     .pre-loader {
       position: absolute;
       left: $vuestic-preloader-left;
diff --git a/src/components/admin/app-navbar/AppNavbar.vue b/src/components/admin/app-navbar/AppNavbar.vue
index c066e397d..643ab9640 100644
--- a/src/components/admin/app-navbar/AppNavbar.vue
+++ b/src/components/admin/app-navbar/AppNavbar.vue
@@ -98,7 +98,11 @@ $font-size-base: 1rem !default;
 
 .app-navbar {
   transition: background-color 0.3s ease; /* sidebar's bg color transitions as well -> consistency */
-  position: relative;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  z-index: 990;
   height: $top-nav-height;
   display: flex;
   padding: 1rem 2rem 1rem 1rem;
diff --git a/src/components/admin/app-sidebar/AppSidebar.vue b/src/components/admin/app-sidebar/AppSidebar.vue
index efe379e84..21a2e9906 100644
--- a/src/components/admin/app-sidebar/AppSidebar.vue
+++ b/src/components/admin/app-sidebar/AppSidebar.vue
@@ -1,5 +1,5 @@
 <template>
-  <va-sidebar :minimized="minimized">
+  <va-sidebar :minimized="minimized" class="app-sidebar">
     <template slot="menu">
 
       <template v-for="(item, key) in items">
@@ -53,3 +53,10 @@ export default {
 }
 
 </script>
+
+<style lang="scss">
+  .app-sidebar {
+    position: fixed !important;
+    z-index: 990;
+  }
+</style>