From 8e52b0acc7bd4309acad645e4ca2952b58a2d68c Mon Sep 17 00:00:00 2001
From: codecalm <codecalm@gmail.com>
Date: Tue, 7 Apr 2020 23:23:43 +0200
Subject: [PATCH] sidebar menu fixes

---
 pages/_includes/layout/navbar.html  | 2 +-
 pages/_includes/layout/sidebar.html | 4 ++++
 pages/_layouts/default.html         | 4 ++--
 scss/_variables.scss                | 2 +-
 scss/layout/_navbar.scss            | 3 ++-
 scss/layout/_sidebar.scss           | 1 -
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pages/_includes/layout/navbar.html b/pages/_includes/layout/navbar.html
index e15421084..79497be37 100644
--- a/pages/_includes/layout/navbar.html
+++ b/pages/_includes/layout/navbar.html
@@ -1,7 +1,7 @@
 {% assign breakpoint = include.breakpoint | default: 'md' %}
 {% assign secondary = include.secondary | default: false %}
 
-<header class="navbar navbar-expand-{{ breakpoint }}{% unless include.transparent %} {% if include.dark %}navbar-dark{% else %}navbar-light{% endif %}{% if include.background %} bg-{{ include.background }}{% endif %}{% endunless %}{% if include.sticky %} sticky-top{% endif %}"{% if include.background-color %} style="background: {{ include.background-color }}"{% endif %}>
+<header class="navbar navbar-expand-{{ breakpoint }}{% unless include.transparent %} {% if include.dark %}navbar-dark{% else %}navbar-light{% endif %}{% if include.background %} bg-{{ include.background }}{% endif %}{% endunless %}{% if include.sticky %} sticky-top{% endif %}{% if include.class %} {{ include.class }}{% endif %}"{% if include.background-color %} style="background: {{ include.background-color }}"{% endif %}>
 	<div class="container{% if page.layout-fluid %}-fluid{% else %}-xl{% endif %}">
 		{% include layout/navbar-toggler.html target="navbar-menu" %}
 
diff --git a/pages/_includes/layout/sidebar.html b/pages/_includes/layout/sidebar.html
index eb423d620..d6776feb3 100644
--- a/pages/_includes/layout/sidebar.html
+++ b/pages/_includes/layout/sidebar.html
@@ -2,10 +2,14 @@
 
 <aside class="navbar navbar-vertical{% if include.right %} navbar-right{% endif %} navbar-expand-{{ breakpoint }}{% unless include.transparent %} {% if include.dark %}navbar-dark{% else %}navbar-light{% endif %}{% if include.background %} bg-{{ include.background }}{% endif %}{% endunless %}"{% if include.background-color %} style="background: {{ include.background-color }}"{% endif %}>
 	<div class="container-fluid">
+		{% include layout/navbar-toggler.html target="navbar-menu" %}
+
 		{% unless include.hide-brand %}
 			{% include layout/navbar-logo.html dark=include.dark breakpoint=breakpoint %}
 		{% endunless %}
 
+		{% include layout/navbar-side.html class="d-lg-none" hide-username=include.hide-username person-id=include.person-id %}
+
 		<div class="collapse navbar-collapse" id="navbar-menu">
 			{% include layout/navbar-menu.html %}
 		</div>
diff --git a/pages/_layouts/default.html b/pages/_layouts/default.html
index 888a67ca0..8778544f9 100644
--- a/pages/_layouts/default.html
+++ b/pages/_layouts/default.html
@@ -2,10 +2,10 @@
 layout: base
 ---
 
-{% include layout/sidebar.html dark=true %}
+{% include layout/sidebar.html dark=true breakpoint="lg" %}
 
 <div class="page">
-	{% include layout/navbar.html hide-brand=true hide-menu=true  %}
+	{% include layout/navbar.html hide-brand=true hide-menu=true class="d-none d-lg-flex" %}
 	{% include layout/content.html %}
 </div>
 
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 1c2a5f7db..5b20871b4 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -387,7 +387,7 @@ $navbar-brand-padding-y: $nav-link-padding-y !default;
 $navbar-brand-image-height: 2rem !default;
 $navbar-brand-margin-right: 0 !default;
 $navbar-brand-font-size: $h3-font-size !default;
-$navbar-brand-font-weight: 600 !default;
+$navbar-brand-font-weight: 500 !default;
 
 $navbar-toggler-font-size: 1rem !default;
 $navbar-toggler-padding-x: 0 !default;
diff --git a/scss/layout/_navbar.scss b/scss/layout/_navbar.scss
index fb7f9363e..adf819a4c 100644
--- a/scss/layout/_navbar.scss
+++ b/scss/layout/_navbar.scss
@@ -3,6 +3,7 @@ Navbar
  */
 .navbar {
   min-height: $navbar-height;
+  align-items: stretch;
 
   .navbar-nav {
     min-height: subtract($navbar-height, 2 * $navbar-padding-y);
@@ -148,7 +149,7 @@ Navbar
               position: absolute;
               left: 0;
               right: 0;
-              bottom: subtract(-$navbar-padding-y, 1px);
+              bottom: subtract(-.25rem, 1px);
               border-bottom: 2px solid $primary;
             }
           }
diff --git a/scss/layout/_sidebar.scss b/scss/layout/_sidebar.scss
index f09fd1e8e..fe65ed2dc 100644
--- a/scss/layout/_sidebar.scss
+++ b/scss/layout/_sidebar.scss
@@ -11,7 +11,6 @@
           top: 0;
           left: 0;
           bottom: 0;
-          padding: 0;
           z-index: $zindex-fixed;
           align-items: flex-start;
           transition: .3s transform;