From c00da17f2bfd2c607320bf5982185d3b49b07ee9 Mon Sep 17 00:00:00 2001
From: codecalm <codecalm@gmail.com>
Date: Wed, 10 Jul 2019 21:06:09 +0200
Subject: [PATCH] demo config fix

---
 js/demo.js               | 13 +++++++------
 scss/layout/_navbar.scss | 30 +++++++++++++++++-------------
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/js/demo.js b/js/demo.js
index 7f6dee1bf..17748dc10 100644
--- a/js/demo.js
+++ b/js/demo.js
@@ -3,6 +3,7 @@
 class TablerDemo {
   constructor() {
     this.init();
+    this.initFormControls();
 
     this.form = document.querySelector('.js-layout-form');
 
@@ -18,8 +19,6 @@ class TablerDemo {
           this.onSubmitForm();
         });
       }
-
-      this.initFormControls();
     }
   };
 
@@ -79,11 +78,13 @@ class TablerDemo {
   };
 
   setFormValue = function(name, value,) {
-    let elements = this.form.querySelectorAll(`[name="${name}"]`);
+    if(this.form) {
+      let elements = this.form.querySelectorAll(`[name="${name}"]`);
 
-    if(elements) {
-      elements.forEach((e) => e.checked = false);
-      this.form.querySelector(`[name="${name}"][value="${value}"]`).checked = true;
+      if (elements) {
+        elements.forEach((e) => e.checked = false);
+        this.form.querySelector(`[name="${name}"][value="${value}"]`).checked = true;
+      }
     }
   };
 
diff --git a/scss/layout/_navbar.scss b/scss/layout/_navbar.scss
index cb671f596..5eeaaaf4c 100644
--- a/scss/layout/_navbar.scss
+++ b/scss/layout/_navbar.scss
@@ -210,22 +210,26 @@ Fixed navbar
   top: 0;
   bottom: 0;
 
-  & + .layout-main {
-    margin-left: $sidenav-width;
+  @include media-breakpoint-up(xl) {
+    & + .layout-main {
+      margin-left: $sidenav-width;
+    }
+
+    &.navbar-right + .layout-main {
+      margin-left: 0;
+      margin-right: $sidenav-width;
+    }
   }
 
-  &.navbar-right + .layout-main {
-    margin-left: 0;
-    margin-right: $sidenav-width;
-  }
+  @include media-breakpoint-up(lg) {
+    &.navbar-folded + .layout-main {
+      margin-left: $sidenav-folded-width;
+    }
 
-  &.navbar-folded + .layout-main {
-    margin-left: $sidenav-folded-width;
-  }
-
-  &.navbar-right.navbar-folded + .layout-main {
-    margin-left: 0;
-    margin-right: $sidenav-folded-width;
+    &.navbar-right.navbar-folded + .layout-main {
+      margin-left: 0;
+      margin-right: $sidenav-folded-width;
+    }
   }
 }