Fix scrollbar.

themesberg · Aug 25, 2020 · 5aa894a · 5aa894a
1 parent 832ae1e
commit 5aa894a
Show file tree

Hide file tree

Showing 15 changed files with 423 additions and 179 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -54,6 +54,7 @@
         "nouislider": "11.0.3",
         "onscreen": "1.3.4",
         "popper.js": "1.16.0",
+        "simplebar": "^6.0.0-beta.2",
         "smooth-scroll": "^16.1.0",
         "vanillajs-datepicker": "^1.0.3",
         "waypoints": "4.0.1"

diff --git a/src/assets/js/volt.js b/src/assets/js/volt.js
@@ -27,16 +27,16 @@ d.addEventListener("DOMContentLoaded", function(event) {
         xl: 1140
     };
 
-    var preloader = d.querySelector('.preloader');
-    if(preloader) {
-        setTimeout(function() {
-            preloader.classList.add('show');
+    // var preloader = d.querySelector('.preloader');
+    // if(preloader) {
+    //     setTimeout(function() {
+    //         preloader.classList.add('show');
 
-            setTimeout(function() {
-                d.querySelector('.loader-element').classList.add('hide');
-            }, 200);
-        }, 1000);
-    }
+    //         setTimeout(function() {
+    //             d.querySelector('.loader-element').classList.add('hide');
+    //         }, 200);
+    //     }, 1000);
+    // }
 
     var iconNotifications = d.querySelector('.icon-notifications');
     if(iconNotifications) {

diff --git a/src/pages/components/buttons.html b/src/pages/components/buttons.html
@@ -24,7 +24,7 @@
     })
 </head>
 
-<body>
+<body class="bg-soft">
 
         @@include('./dashboard/_nav.html', {
             "path": "../.."

diff --git a/src/pages/components/forms.html b/src/pages/components/forms.html
@@ -24,7 +24,7 @@
     })
 </head>
 
-<body>
+<body class="bg-soft">
 
         @@include('./dashboard/_nav.html', {
             "path": "../.."

diff --git a/src/pages/components/modals.html b/src/pages/components/modals.html
@@ -24,7 +24,7 @@
     })
 </head>
 
-<body>
+<body class="bg-soft">
 
         @@include('./dashboard/_nav.html', {
             "path": "../.."
@@ -291,13 +291,13 @@ <h2 class="mb-0 h5">Create Account</h2>
                                                     <div class="modal-dialog modal-tertiary modal-dialog-centered" role="document">
                                                         <div class="modal-content">
                                                             <div class="modal-header mx-auto">
-                                                                <p class="lead mb-0">You just unlocked a new badge</p>
+                                                                <p class="lead mb-0 text-white">You just unlocked a new badge</p>
                                                             </div>
                                                             <div class="modal-body">
                                                                 <div class="py-3 px-5 text-center">
                                                                     <span class="modal-icon display-1-lg"><span class="fas fa-medal"></span></span>
-                                                                    <h2 class="h3 modal-title mb-3">Author Level 5</h2>
-                                                                    <p class="mb-4">One Thousand Dollars! Well done mate - heads are turning your way.</p>
+                                                                    <h2 class="h3 modal-title mb-3 text-white">Author Level 5</h2>
+                                                                    <p class="mb-4 text-white">One Thousand Dollars! Well done mate - heads are turning your way.</p>
                                                                     <div class="progress-wrapper">
                                                                         <div class="progress">
                                                                             <div class="progress-bar bg-primary" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100"></div>

diff --git a/src/pages/components/notifications.html b/src/pages/components/notifications.html
@@ -24,13 +24,13 @@
     })
 </head>
 
-<body>
+<body class="bg-soft">
 
         @@include('./dashboard/_nav.html', {
             "path": "../.."
         })
 
-        <div class="container-fluid bg-soft">
+        <div class="container-fluid">
             <div class="row">
                 <div class="col-12">
 

diff --git a/src/pages/components/typography.html b/src/pages/components/typography.html
@@ -24,7 +24,7 @@
     })
 </head>
 
-<body>
+<body class="bg-soft">
 
         @@include('./dashboard/_nav.html', {
             "path": "../.."

diff --git a/src/pages/dashboard/dashboard.html b/src/pages/dashboard/dashboard.html
@@ -46,9 +46,9 @@
                             "path": "../.."
                         })
 
-                        @@include('./_preloader.html', {
+                        <!-- @@include('./_preloader.html', {
                             "path": "../.."
-                        })
+                        }) -->
 
                         <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center py-4">
                             <div class="btn-toolbar dropdown">

diff --git a/src/partials/_scripts.html b/src/partials/_scripts.html
@@ -27,6 +27,9 @@
 <!-- Datepicker -->
 <script src="@@path/vendor/vanillajs-datepicker/dist/js/datepicker.min.js"></script>
 
+<!-- Simplebar -->
+<script src="@@path/vendor/simplebar/dist/simplebar.min.js"></script>
+
 <!-- Github buttons -->
 <script async defer src="https://buttons.github.io/buttons.js"></script>