From c9a4cb2cace6912c9dc9d88fdadf3e098bd1a588 Mon Sep 17 00:00:00 2001
From: codecalm <codecalm@gmail.com>
Date: Mon, 1 Jul 2019 22:59:32 +0200
Subject: [PATCH] taqbler layout refactoring

---
 pages/_includes/layout/sidenav.html |  4 +--
 pages/_includes/layout/topnav.html  | 11 ++-----
 pages/_includes/parts/navbar.html   |  2 +-
 pages/_layouts/base.html            |  2 +-
 pages/_layouts/default.html         | 45 ++++++++++++-----------------
 pages/layout-navbar-all.html        |  6 ----
 scss/layout/_navbar.scss            |  5 ++++
 7 files changed, 30 insertions(+), 45 deletions(-)
 delete mode 100644 pages/layout-navbar-all.html
diff --git a/pages/_includes/layout/sidenav.html b/pages/_includes/layout/sidenav.html
index 980aef6ec..1346e0b3d 100644
--- a/pages/_includes/layout/sidenav.html
+++ b/pages/_includes/layout/sidenav.html
@@ -1,4 +1,4 @@
 {% assign menu = page.menu | default: layout.menu %}
-<div class="navbar navbar-side{% if include.dark %} navbar-dark{% endif %}{% if page.nav-position == 'right' %} navbar-right{% endif %}{% if include.folded %} navbar-folded{% endif %} navbar-sticky">
+<aside class="d-none d-lg-flex navbar navbar-side{% if include.dark %} navbar-dark{% endif %}{% if page.nav-position == 'right' %} navbar-right{% endif %}{% if include.folded %} navbar-folded{% endif %}">
    {% include layout/sidenav-content.html menu=menu %}
-</div>
+</aside>
diff --git a/pages/_includes/layout/topnav.html b/pages/_includes/layout/topnav.html
index f51ca1647..efdc17217 100644
--- a/pages/_includes/layout/topnav.html
+++ b/pages/_includes/layout/topnav.html
@@ -1,11 +1,4 @@
-<header class="navbar navbar-expand-md{% if include.dark %} navbar-dark{% endif %}{% if include.sticky %} navbar-sticky{% endif %}">
-   {% include parts/navbar.html logo=true search=true user-menu=1 person=1 dark=include.dark %}
+<header class="navbar navbar-expand-lg{% if include.dark %} navbar-dark{% endif %}{% if include.sticky %} navbar-sticky{% endif %}">
+   {% include parts/navbar.html logo=true search=true user-menu=1 person=1 dark=include.dark fluid=include.fluid %}
 </header>
 
-{% if page.nav-position == "top" or page.nav-position == "all" %}
-<div class="navbar navbar-expand-md">
-	<div class="container">
-      {% include layout/menu.html top=true %}
-	</div>
-</div>
-{% endif %}
diff --git a/pages/_includes/parts/navbar.html b/pages/_includes/parts/navbar.html
index a3cd90438..a7559d4ef 100644
--- a/pages/_includes/parts/navbar.html
+++ b/pages/_includes/parts/navbar.html
@@ -97,7 +97,7 @@
       </li>
       {% endif %}
 
-      <li class="nav-item d-none d-md-flex">
+      <li class="nav-item d-none d-lg-flex mr-3">
          <a href="https://github.com/tabler/tabler" class="btn btn-sm btn-outline-primary" target="_blank">Source code</a>
       </li>
 
diff --git a/pages/_layouts/base.html b/pages/_layouts/base.html
index d183a2419..db42bc4fd 100644
--- a/pages/_layouts/base.html
+++ b/pages/_layouts/base.html
@@ -23,7 +23,7 @@
 	{% include layout/css.html %}
 	{% include layout/js.html %}
 </head>
-<body class="d-flex flex-column antialiased {% if page.dark-theme %} theme-dark{% endif %}{% if layout.body-class %} {{ layout.body-class }}{% endif %}{% if page.body-class %} {{ page.body-class }}{% endif %}">
+<body class="antialiased {% if page.dark-theme %} theme-dark{% endif %}{% if layout.body-class %} {{ layout.body-class }}{% endif %}{% if page.body-class %} {{ page.body-class }}{% endif %}">
 
    {{ content}}
 
diff --git a/pages/_layouts/default.html b/pages/_layouts/default.html
index 2918fa440..81408d526 100644
--- a/pages/_layouts/default.html
+++ b/pages/_layouts/default.html
@@ -2,35 +2,28 @@
 layout: base
 ---
 
-{% if page.header-primary %}
-   {% include layout/topnav.html dark=page.header-dark sticky=page.header-sticky %}
-{% endif %}
+{% include layout/topnav.html dark=page.header-dark sticky=true fluid=true %}
 
-<div class="d-flex h-auto min-h-screen">
-   <div class="d-flex flex-fill">
-      {% if page.nav-position == "all" %}
-      {% include layout/sidenav.html dark=true folded=true %}
-      {% endif %}
+<div class="d-flex flex-row">
+   {% if page.nav-position == "left" or page.nav-position == "right" %}
+   {% include layout/sidenav.html dark=page.sidenav-dark folded=page.sidenav-folded %}
+   {% endif %}
 
-      {% if page.nav-position == "left" or page.nav-position == "right" or page.nav-position == "all"  %}
-      {% include layout/sidenav.html dark=page.sidenav-dark folded=page.sidenav-folded %}
-      {% endif %}
+   <main class="d-flex flex-column flex-fill max-w-full">
+      {% include layout/topnav.html dark=page.header-dark sticky=page.header-sticky %}
 
-      <div class="main-content flex-fill d-flex flex-column max-w-full">
-         {% unless page.header-primary %}
-         {% include layout/topnav.html dark=page.header-dark sticky=page.header-sticky %}
-         {% endunless %}
-
-         <div class="d-flex flex-fill max-w-full">
-
-            <div class="flex-fill px-lg-2 mw-100{% if page.blank %} d-flex align-items-center{% endif %}">
-               <div class="container{% if page.container-size %} container-{{ page.container-size }}{% endif %}{% if page.fluid %}-fluid{% endif %} my-4">
-                  {% include layout/page-title.html %}
-
-                  {{ content }}
-               </div>
-            </div>
+      {% if page.nav-position == "top" or page.nav-position == "all" %}
+      <div class="d-none d-lg-flex navbar navbar-expand-md">
+         <div class="container">
+            {% include layout/menu.html top=true %}
          </div>
       </div>
-   </div>
+      {% endif %}
+
+      <div class="container{% if page.container-size %} container-{{ page.container-size }}{% endif %}{% if page.fluid %}-fluid{% endif %} my-4">
+         <!--{% include layout/page-title.html %}-->
+
+         {{ content }}
+      </div>
+   </main>
 </div>
diff --git a/pages/layout-navbar-all.html b/pages/layout-navbar-all.html
deleted file mode 100644
index 902a7d7ad..000000000
--- a/pages/layout-navbar-all.html
+++ /dev/null
@@ -1,6 +0,0 @@
----
-nav-position: all
-page-title: Dashboard
----
-
-{% include_cached layout/homepage.html %}
diff --git a/scss/layout/_navbar.scss b/scss/layout/_navbar.scss
index 3f27d9950..b7c2f6e3a 100644
--- a/scss/layout/_navbar.scss
+++ b/scss/layout/_navbar.scss
@@ -329,3 +329,8 @@ Utils
     display: none;
   }
 }
+
+
+.navbar-toggler-icon {
+  outline: 1px solid red;
+}
